2024-12-13 21:20 : id 513

home-manager/home.nix

@@ -1,7 +1,7 @@
 {config, pkgs, lib, ... }:
 let
 	# Theme/Mode
-	THEME = "mocha";
+	THEME = "gruvbox";
 	MODE = "dark";
 
 	# Colours
@@ -58,6 +58,7 @@ in
 		fractal
 		fuzzel
 		gimp
+		gnome-feeds
 		hyprland
 		hyprpicker
 		hyprlock
@@ -405,7 +406,7 @@ in
 				width = SCREEN_WIDTH - 10;
 				modules-left = [ "network" ];
 				modules-right = [ "pulseaudio" ];
-				modules-center = ["custom/gruvbox" "custom/nord" "custom/solarized" "custom/dracula" "custom/mocha"];
+				modules-center = ["custom/gruvbox" "custom/nord" "custom/solarized" "custom/dracula" "custom/mocha" "custom/macchiato"];
 				"network" = {
 					interface = "enp42s0";
 					interval = 10;
@@ -433,6 +434,10 @@ in
 					on-click = "$HOME/scripts/theme-switcher.sh mocha ${MODE}";
 					format = "🌿";
 				};
+				"custom/macchiato" = {
+					on-click = "$HOME/scripts/theme-switcher.sh macchiato ${MODE}";
+					format = "🌺";
+				};
 				"pulseaudio" = {
 					format = "{icon} {volume}%";
 					format-muted = "X";
@@ -512,7 +517,8 @@ in
 			#custom-nord,
 			#custom-solarized,
 			#custom-dracula,
-			#custom-mocha {
+			#custom-mocha,
+			#custom-macchiato {
 				color: #${FG};
 				background: #${BG};
 				border: ${BORDER_WIDTH}px solid #${ACCENT};

home-manager/themes/dracula_dark.nix

@@ -24,7 +24,9 @@
 	DARK_CYAN="6cb4c3";
 
 	GTK_THEME = "dracula-theme";
-	GTK_THEME_NAME = "Dracula"; # No light mode :(
+	GTK_THEME_NAME = "Dracula";
 	GTK_ICONS = "dracula-icon-theme";
-	GTK_CURSOR = "capitane-cursors-theme";
+	GTK_ICONS_NAME = "Dracula";
+	GTK_CURSOR = "capitaine-cursors-themed";
+	GTK_CURSOR_NAME = "Capitane Cursors - White";
 }

home-manager/themes/gruvbox_dark.nix

@@ -26,5 +26,7 @@
 	GTK_THEME = "gruvbox-gtk-theme";
 	GTK_THEME_NAME = "Gruvbox-Dark";
 	GTK_ICONS = "gruvbox-plus-icons";
-	GTK_CURSOR = "capitane-cursors-themed";
+	GTK_ICONS_NAME = "Gruvbox Plus Dark";
+	GTK_CURSOR = "capitaine-cursors-themed";
+	GTK_CURSOR_NAME = "Capitaine Cursors (Gruvbox) - White";
 }

home-manager/themes/gruvbox_light.nix

@@ -26,5 +26,7 @@
 	GTK_THEME = "gruvbox-gtk-theme";
 	GTK_THEME_NAME = "Gruvbox-Light";
 	GTK_ICONS = "gruvbox-plus-icons";
-	GTK_CURSOR = "capitane-cursors-themed";
+	GTK_ICONS_NAME = "Gruvbox Plus Light";
+	GTK_CURSOR = "capitaine-cursors-themed";
+	GTK_CURSOR_NAME = "Capitaine Cursors (Gruvbox)";
 }

home-manager/themes/macchiato_dark.nix

@@ -0,0 +1,32 @@
+{
+	BG="24273a";
+	FG="cad3f5";
+
+	GRAY="939ab7";
+	DARK_GRAY="494d64";
+	
+	RED="ee99a0";
+	DARK_RED="ed8796";
+	
+	GREEN="8bd5ca";
+	DARK_GREEN="a6da95";
+
+	YELLOW="eed49f";
+	DARK_YELLOW="f5a97f";
+
+	BLUE="b7bdf8";
+	DARK_BLUE="8aadf4";
+
+	PURPLE="f5bde6";
+	DARK_PURPLE="c6a0f6";
+
+	CYAN="91d7e3";
+	DARK_CYAN="7dc4e4";
+
+	GTK_THEME = "catppuccin-gtk";
+	GTK_THEME_NAME = "catppuccin-frappe-blue-standard";
+	GTK_ICONS = "zafiro-icons";
+	GTK_ICONS_NAME = "Zafiro-icons-Dark";
+	GTK_CURSOR = "nordzy-cursor-theme";
+	GTK_CURSOR_NAME = "Nordzy-catppuccin-macchiato-blue";
+}

home-manager/themes/mocha_dark.nix

@@ -28,5 +28,5 @@
 	GTK_ICONS = "zafiro-icons";
 	GTK_ICONS_NAME = "Zafiro-icons-Dark";
 	GTK_CURSOR = "catppuccin-cursors";
-	GTK_CURSOR_NAME = "mochaGreen";
+	GTK_CURSOR_NAME = "Catppuccin Mocha Blue";
 }

home-manager/themes/nord_dark.nix

@@ -26,5 +26,7 @@
 	GTK_THEME = "nordic";
 	GTK_THEME_NAME = "Nordic";
 	GTK_ICONS = "zafiro-icons";
+	GTK_ICONS_NAME = "Zafiro-icons-Dark";
 	GTK_CURSOR = "nordzy-cursor-theme";
+	GTK_CURSOR_NAME = "Nordzy-cursors-white";
 }

home-manager/themes/solarized_dark.nix

@@ -26,5 +26,7 @@
 	GTK_THEME = "solarc-gtk-theme";
 	GTK_THEME_NAME = "SolArc-Dark";
 	GTK_ICONS = "gruvbox-plus-icons";
-	GTK_CURSOR = "capitane-cursors-themed";
+	GTK_ICONS_NAME = "Gruvbox Plus Dark";
+	GTK_CURSOR = "capitaine-cursors-themed";
+	GTK_CURSOR_NAME = "Capitaine Cursors - White";
 }