Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:fd56f85096df60918c775a03cec11c2402061544
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
..
compare: Toast:2e47069bd16eef0724ecc6c93b82ae0d9fe728a7
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

No commits in common. "fd56f85096df60918c775a03cec11c2402061544" and "2e47069bd16eef0724ecc6c93b82ae0d9fe728a7" have entirely different histories.
fd56f85096 ... 2e47069bd1

2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
roles/common/programs/bat.nix
View file

@ -1,5 +1,17 @@
{ config, pkgs, ... }:
let
# Home manager on 23.05 doesn't understand the new format, so I'll use the old one until 23.11 becomes stable
newformat = {
src = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "bat";
rev = "master";
hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
};
file = "Catppuccin-mocha.tmTheme";
};
oldformat = builtins.readFile (newformat.src + "/${newformat.file}");
in
{
home-manager = {
users.toast.programs.bat = {
@ -8,15 +20,7 @@
theme = "catppuccin-mocha";
};
themes = {
catppuccin-mocha = {
src = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "bat";
rev = "master";
hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
};
file = "Catppuccin-mocha.tmTheme";
};
catppuccin-mocha = oldformat;
};
};
};

2
roles/desktop/configuration.nix
View file

@ -9,7 +9,7 @@
users.users.toast.extraGroups = [ "scanner" ];
# Set up fonts
fonts.packages = [
fonts.fonts = [
( pkgs.nerdfonts.override { fonts = [ "Hack" "JetBrainsMono" ]; } )
];