nix-colors phaseout

Flameopathic · Dec 5, 2024 · 6287dbc · 6287dbc
1 parent 4b2d120
commit 6287dbc
Show file tree

Hide file tree

Showing 10 changed files with 146 additions and 383 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -33,7 +33,6 @@
       url = "github:nix-community/nixos-vscode-server";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix-colors.url = "github:Misterio77/nix-colors";
     stylix = {
       url = "github:danth/stylix/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/mod-hm/hypridle.nix b/mod-hm/hypridle.nix
@@ -1,4 +1,4 @@
-{ config, inputs, ... }:
+{ ... }:
 {
   config = {
     services.hypridle = {
@@ -28,7 +28,6 @@
             no_fade_in = true;
           };
           background = {
-            color = "rgba(${inputs.nix-colors.lib.conversions.hexToRGBString ", " config.colorScheme.palette.base03}, 1.0)";
             path = "/etc/nixos/resources/bay.png";
           };
 

diff --git a/mod-hm/nord.nix b/mod-hm/nord.nix
diff --git a/mod-hm/rose-pine.nix b/mod-hm/rose-pine.nix
@@ -2,43 +2,44 @@
   config,
   pkgs,
   lib,
-  inputs,
   ...
 }:
 {
-  imports = [ inputs.nix-colors.homeManagerModules.default ];
+  imports = [
+    ./theme.nix
+  ];
   config = {
-    colorScheme = lib.mkDefault inputs.nix-colors.colorSchemes.rose-pine-moon;
-
-    home.packages = with pkgs; [
-      (writeShellApplication {
-        # credit: Janik-Haag
-        name = "toggle-theme";
-        runtimeInputs = with pkgs; [
-          home-manager
-          coreutils
-          ripgrep
-        ];
-        text = ''
-          "$(home-manager generations | head -1 | rg -o '/[^ ]*')"/specialisation/light/activate && hyprctl reload
-        '';
-      })
-    ];
+    stylix = {
+      polarity = lib.mkDefault "dark";
+      image = lib.mkDefault ../resources/leafy-moon.png;
+      base16Scheme = lib.mkDefault {
+        base00 = "#232136";
+        base01 = "#2A273F";
+        base02 = "#393552";
+        base03 = "#6E6A86";
+        base04 = "#908CAA";
+        base05 = "#E0DEF4";
+        base06 = "#E0DEF4";
+        base07 = "#56526E";
+        base08 = "#EB6F92";
+        base09 = "#F6C177";
+        base0A = "#EA9A97";
+        base0B = "#3E8FB0";
+        base0C = "#9CCFD8";
+        base0D = "#C4A7E7";
+        base0E = "#F6C177";
+        base0F = "#56526E";
+      };
+    };
 
     gtk = {
-      enable = true;
-      cursorTheme = {
-        name = "Bibata_Ghost";
-        package = pkgs.bibata-cursors-translucent;
-        size = config.flame.ui.cursorSize;
-      };
       iconTheme = {
         name = config.gtk.theme.name;
         package = pkgs.rose-pine-icon-theme;
       };
       theme = {
-        name = lib.mkDefault "rose-pine-moon";
-        package = pkgs.rose-pine-gtk-theme;
+        name = lib.mkForce "rose-pine-moon";
+        package = lib.mkForce pkgs.rose-pine-gtk-theme;
       };
     };
 
@@ -191,7 +192,7 @@
       '';
     };
 
-    flame.vscode.theme = config.colorScheme.name + " (no italics)";
+    flame.vscode.theme = lib.mkDefault "Rosé Pine Moon (no italics)";
 
     xdg.desktopEntries.theme-switch = {
       name = "Toggle theme";
@@ -200,32 +201,32 @@
     };
 
     specialisation.light.configuration = {
-      colorScheme = inputs.nix-colors.colorSchemes.rose-pine-dawn;
-
       stylix = {
         image = ../resources/lwp.png;
         polarity = "light";
         base16Scheme = {
-          base00 = "#faf4ed";
-          base01 = "#fffaf3";
-          base02 = "#f2e9de";
-          base03 = "#9893a5";
+          base00 = "#FAF4ED";
+          base01 = "#FFFAF3";
+          base02 = "#F2E9DE";
+          base03 = "#9893A5";
           base04 = "#797593";
           base05 = "#575279";
           base06 = "#575279";
-          base07 = "#cecacd";
-          base08 = "#b4637a";
-          base09 = "#ea9d34";
-          base0A = "#d7827e";
+          base07 = "#CECACD";
+          base08 = "#B4637A";
+          base09 = "#EA9D34";
+          base0A = "#D7827E";
           base0B = "#286983";
-          base0C = "#56949f";
-          base0D = "#907aa9";
-          base0E = "#ea9d34";
-          base0F = "#cecacd";
+          base0C = "#56949F";
+          base0D = "#907AA9";
+          base0E = "#EA9D34";
+          base0F = "#CECACD";
         };
       };
 
-      gtk.theme.name = "rose-pine-dawn";
+      gtk.theme.name = lib.mkOverride 10 "rose-pine-dawn";
+
+      flame.vscode.theme = "Rosé Pine Dawn (no italics)";
 
       programs.bash.shellAliases.snrbs = "sudo nixos-rebuild switch && toggle-theme";
 

diff --git a/mod-hm/theme.nix b/mod-hm/theme.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+{
+  config = {
+    stylix = {
+      enable = true;
+      cursor = {
+        package = pkgs.bibata-cursors-translucent;
+        name = "Bibata_Ghost";
+        size = 24;
+      };
+      fonts = {
+        monospace = {
+          name = "Maple Mono NF";
+          package = pkgs.maple-mono-NF;
+        };
+        sansSerif = config.stylix.fonts.monospace;
+        serif = config.stylix.fonts.monospace;
+        sizes = {
+          # applications = 13;
+          # desktop = ;
+          # popups = ;
+          terminal = 11;
+        };
+      };
+      targets = {
+        waybar.enable = false;
+        hyprpaper.enable = lib.mkForce false;
+      };
+    };
+
+    home.packages = with pkgs; [
+      (writeShellApplication {
+        # credit: Janik-Haag
+        name = "toggle-theme";
+        runtimeInputs = with pkgs; [
+          home-manager
+          coreutils
+          ripgrep
+        ];
+        text = ''
+          "$(home-manager generations | head -1 | rg -o '/[^ ]*')"/specialisation/light/activate && hyprctl reload
+        '';
+      })
+    ];
+  };
+}
diff --git a/mod-hm/ui-apps.nix b/mod-hm/ui-apps.nix
@@ -2,7 +2,6 @@
   pkgs,
   lib,
   inputs,
-  config,
   ...
 }:
 {
@@ -34,54 +33,6 @@
       freetube
     ];
 
-    stylix = {
-      enable = true;
-      polarity = lib.mkDefault "dark";
-      image = lib.mkDefault ../resources/leafy-moon.png;
-      base16Scheme = lib.mkDefault {
-        base00 = "#232136";
-        base01 = "#2a273f";
-        base02 = "#393552";
-        base03 = "#6e6a86";
-        base04 = "#908caa";
-        base05 = "#e0def4";
-        base06 = "#e0def4";
-        base07 = "#56526e";
-        base08 = "#eb6f92";
-        base09 = "#f6c177";
-        base0A = "#ea9a97";
-        base0B = "#3e8fb0";
-        base0C = "#9ccfd8";
-        base0D = "#c4a7e7";
-        base0E = "#f6c177";
-        base0F = "#56526e";
-      };
-      cursor = {
-        package = pkgs.bibata-cursors-translucent;
-        name = "Bibata_Ghost";
-        size = 24;
-      };
-      fonts = {
-        monospace = {
-          name = "Maple Mono NF";
-          package = pkgs.maple-mono-NF;
-        };
-        sansSerif = config.stylix.fonts.monospace;
-        serif = config.stylix.fonts.monospace;
-        sizes = {
-          # applications = ;
-          # desktop = ;
-          # popups = ;
-          terminal = 11;
-        };
-      };
-      targets = {
-        gtk.enable = false;
-        waybar.enable = false;
-        hyprpaper.enable = lib.mkForce false;
-      };
-    };
-
     programs = {
       kitty = {
         enable = true;