treewide: use matugen for theme generation

fufexan · Sep 16, 2023 · 3b40452 · 3b40452
1 parent 86b3775
commit 3b40452
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 130 deletions.
diff --git a/home/programs/dunst.nix b/home/programs/dunst.nix
@@ -1,10 +1,12 @@
 {
   pkgs,
-  default,
+  theme,
   ...
 }: {
   # notification daemon
-  services.dunst = {
+  services.dunst = let
+    c = theme.xcolors.colors.${theme.variant};
+  in {
     enable = true;
     iconTheme = {
       name = "Papirus-Dark";
@@ -39,19 +41,19 @@
       fullscreen_delay_everything = {fullscreen = "delay";};
 
       urgency_critical = {
-        background = default.xcolors.bg;
-        foreground = default.xcolors.fg;
-        frame_color = default.xcolors.red;
+        background = c.error_container;
+        foreground = c.on_error_container;
+        frame_color = c.error;
       };
       urgency_low = {
-        background = default.xcolors.bg;
-        foreground = default.xcolors.fg;
-        frame_color = default.xcolors.blue;
+        background = c.secondary_container;
+        foreground = c.on_secondary_container;
+        frame_color = c.secondary;
       };
       urgency_normal = {
-        background = default.xcolors.bg;
-        foreground = default.xcolors.fg;
-        frame_color = default.xcolors.green;
+        background = c.primary_container;
+        foreground = c.on_primary_container;
+        frame_color = c.primary;
       };
     };
   };

diff --git a/home/programs/git.nix b/home/programs/git.nix
@@ -1,18 +1,14 @@
 {
   config,
   pkgs,
-  default,
   ...
 }: {
   home.packages = [pkgs.gh];
 
   programs.git = {
     enable = true;
 
-    delta = {
-      enable = true;
-      options.map-styles = "bold purple => syntax ${default.xcolors.mauve}, bold cyan => syntax ${default.xcolors.blue}";
-    };
+    delta.enable = true;
 
     extraConfig = {
       diff.colorMoved = "default";

diff --git a/home/terminals/alacritty.nix b/home/terminals/alacritty.nix
@@ -1,8 +1,11 @@
-{default, ...}:
+{
+  pkgs,
+  default,
+  ...
+}:
 # terminals
 let
   inherit (default.terminal) font size opacity;
-  inherit (default) xcolors;
 in {
   programs.alacritty = {
     enable = true;
@@ -27,26 +30,14 @@ in {
       };
 
       draw_bold_text_with_bright_colors = true;
-      colors = rec {
-        primary = {
-          background = xcolors.crust;
-          foreground = xcolors.fg;
-        };
-        normal = {
-          inherit (xcolors) red green yellow blue;
-          black = xcolors.mantle;
-          magenta = xcolors.mauve;
-          cyan = xcolors.sky;
-          white = xcolors.text;
-        };
-        bright =
-          normal
-          // {
-            black = xcolors.base;
-            white = xcolors.rosewater;
-          };
-      };
       window.opacity = opacity;
+
+      imports = [
+        (pkgs.fetchurl {
+          url = "https://raw.githubusercontent.com/catppuccin/alacritty/3c808cbb4f9c87be43ba5241bc57373c793d2f17/catppuccin-mocha.yml";
+          hash = "sha256-28Tvtf8A/rx40J9PKXH6NL3h/OKfn3TQT1K9G8iWCkM=";
+        })
+      ];
     };
   };
 }
diff --git a/home/terminals/kitty.nix b/home/terminals/kitty.nix
@@ -1,20 +1,18 @@
-{default, ...}: let
-  inherit (default) xcolors;
-in {
+{default, ...}: {
   programs.kitty = {
     enable = true;
     font = {
       inherit (default.terminal) size;
       name = default.terminal.font;
     };
+
     settings = {
       scrollback_lines = 10000;
       placement_strategy = "center";
 
       allow_remote_control = "yes";
       enable_audio_bell = "no";
       visual_bell_duration = "0.1";
-      visual_bell_color = xcolors.rosewater;
 
       copy_on_select = "clipboard";
 
@@ -23,32 +21,8 @@ in {
 
       # colors
       background_opacity = toString default.terminal.opacity;
-      foreground = xcolors.fg;
-      background = xcolors.crust;
-      # black
-      color0 = xcolors.mantle;
-      color8 = xcolors.base;
-      # red
-      color1 = xcolors.red;
-      color9 = xcolors.red;
-      # green
-      color2 = xcolors.green;
-      color10 = xcolors.green;
-      # yellow
-      color3 = xcolors.yellow;
-      color11 = xcolors.yellow;
-      # blue
-      color4 = xcolors.blue;
-      color12 = xcolors.blue;
-      # magenta
-      color5 = xcolors.pink;
-      color13 = xcolors.pink;
-      # cyan
-      color6 = xcolors.sky;
-      color14 = xcolors.sky;
-      # white
-      color7 = xcolors.text;
-      color15 = xcolors.rosewater;
     };
+
+    theme = "Catppuccin-Mocha";
   };
 }
diff --git a/home/wayland/hyprland/config.nix b/home/wayland/hyprland/config.nix
@@ -1,9 +1,10 @@
 {
   config,
   default,
+  theme,
   ...
 }: let
-  inherit (default) colors;
+  c = theme.colors.colors_android.${theme.variant};
 
   pointer = config.home.pointerCursor;
   scriptDir = "${config.home.homeDirectory}/.config/eww/scripts";
@@ -80,8 +81,8 @@ in {
       col.inactive_border = rgba(00000088)
 
       # group borders
-      col.group_border_active = rgba(${colors.pink}88)
-      col.group_border = rgba(${colors.surface0}88)
+      col.group_border_active = rgba(${c.color_accent_primary}88)
+      col.group_border = rgba(${c.color_accent_primary_variant}88)
     }
 
     decoration {

diff --git a/lib/default.nix b/lib/default.nix
@@ -1,14 +1,8 @@
 {lib, ...}:
 # personal lib
-let
-  colorlib = import ./colors.nix lib;
-in {
-  imports = [
-    {
-      # get default across the module system
-      _module.args = {
-        default = import ./theme {inherit colorlib lib;};
-      };
-    }
-  ];
+{
+  # get default across the module system
+  _module.args = {
+    default = import ./theme lib;
+  };
 }
diff --git a/lib/colors.nix → lib/theme/colorlib.nix b/lib/colors.nix → lib/theme/colorlib.nix
diff --git a/lib/theme/colors.nix b/lib/theme/colors.nix
diff --git a/lib/theme/default.nix b/lib/theme/default.nix
@@ -1,15 +1,5 @@
-{
-  colorlib,
-  lib,
-}: rec {
-  colors = import ./colors.nix;
-  # #RRGGBB
-  xcolors = lib.mapAttrs (_: colorlib.x) colors;
-  # rgba(,,,) colors (css)
-  rgbaColors = lib.mapAttrs (_: colorlib.rgba) colors;
-
+lib: {
   browser = "firefox";
-
   launcher = "anyrun";
 
   terminal = {

diff --git a/lib/theme/theme.nix b/lib/theme/theme.nix
@@ -0,0 +1,13 @@
+self: pkgs: let
+  inherit (pkgs) lib;
+  colors = builtins.fromJSON (builtins.readFile self.packages.${pkgs.system}.theme.outPath);
+  colorlib = import "${self}/lib/theme/colorlib.nix" lib;
+in {
+  inherit colors;
+  # #RRGGBB
+  xcolors = lib.mapAttrsRecursive (_: colorlib.x) colors;
+  # rgba(,,,) colors (css)
+  rgbaColors = lib.mapAttrsRecursive (_: colorlib.rgba) colors;
+
+  variant = "dark";
+}
diff --git a/modules/default.nix b/modules/default.nix
@@ -17,7 +17,21 @@ in {
 
         # NixOS modules
         sharedModules = [
-          {home-manager.useGlobalPkgs = true;}
+          ({
+            pkgs,
+            self,
+            ...
+          }: let
+            theme = import "${self}/lib/theme/theme.nix" self pkgs;
+          in {
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users.mihai._module.args = {inherit theme;};
+            };
+            _module.args = {inherit theme;};
+          })
+
           {disabledModules = ["security/pam.nix"];}
           inputs.agenix.nixosModules.default
           inputs.hm.nixosModule