migration: kitty

4 files changed, 85 insertions, 74 deletions

diff --git a/roles/home/desktop/default.nix b/roles/home/desktop/default.nix
index 5224afe..5ce2c12 100644
--- a/roles/home/desktop/default.nix
+++ b/roles/home/desktop/default.nix
@@ -61,7 +61,6 @@ let cfg = config.home.roles.desktop; in {
 
     programs = {
       rofi.enable = true;
-      kitty.enable = true;
 
       mpv.enable = cfg.mpv;
       fastfetch.enable = cfg.fetch;
diff --git a/roles/home/desktop/kitty.nix b/roles/home/desktop/kitty.nix
deleted file mode 100644
index 5d66b2e..0000000
--- a/roles/home/desktop/kitty.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ config, ... }:
-
-{
-  programs.kitty = {
-    font = { name = "monospace"; size = 8.0; };
-
-    settings = let c = config.theme.colors; in {
-      foreground = "#${c.fg}";
-      background = "#000000";
-
-      color0  = "#${c.black}";
-      color1  = "#${c.red}";
-      color2  = "#${c.green}";
-      color3  = "#${c.yellow}";
-      color4  = "#${c.blue}";
-      color5  = "#${c.magenta}";
-      color6  = "#${c.cyan}";
-      color7  = "#${c.white}";
-
-      color8  = "#${c.brightBlack}";
-      color9  = "#${c.brightRed}";
-      color10 = "#${c.brightGreen}";
-      color11 = "#${c.brightYellow}";
-      color12 = "#${c.brightBlue}";
-      color13 = "#${c.brightMagenta}";
-      color14 = "#${c.brightCyan}";
-      color15 = "#${c.brightWhite}";
-
-
-      color124 = "#${c.brightRed}";
-      color106 = "#${c.brightGreen}";
-      color172 = "#${c.brightYellow}";
-      color66  = "#${c.brightBlue}";
-      color132 = "#${c.brightMagenta}";
-      color72  = "#${c.brightCyan}";
-
-      color167 = "#${c.red}";
-      color142 = "#${c.green}";
-      color214 = "#${c.yellow}";
-      color109 = "#${c.blue}";
-      color175 = "#${c.magenta}";
-      color108 = "#${c.cyan}";
-
-      color234 = "#${c.bg0}";
-      color237 = "#${c.bg1}";
-      color239 = "#${c.bg2}";
-      color241 = "#${c.bg3}";
-      color243 = "#${c.bg4}";
-      color245 = "#${c.white}";
-
-      color246 = "#${c.fg4}";
-      color248 = "#${c.fg3}";
-      color250 = "#${c.fg2}";
-      color223 = "#${c.fg1}";
-      color229 = "#${c.fg0}";
-
-      color166 = "#${c.orange}";
-      color208 = "#${c.brightOrange}";
-
-      color231 = "#${c.accent}";
-    };
-
-    shellIntegration = {
-      mode = "no-cursor";
-      enableBashIntegration = true;
-    };
-
-    extraConfig = ''
-      background_opacity 0.8
-      confirm_os_window_close 0
-    '';
-  };
-}
diff --git a/snowfall/modules/home/apps/kitty/default.nix b/snowfall/modules/home/apps/kitty/default.nix
new file mode 100644
index 0000000..dd64af6
--- /dev/null
+++ b/snowfall/modules/home/apps/kitty/default.nix
@@ -0,0 +1,84 @@
+{ options, config, lib, namespace, ... }:
+
+with lib; with lib.${namespace}; let
+  cfg = config.${namespace}.apps.kitty;
+  desktop = config.${namespace}.desktop;
+in {
+  options.${namespace}.apps.kitty = with types; {
+    enable = mkEnableOption "kitty";
+  };
+
+  config = mkIf cfg.enable {
+    programs.kitty = {
+      enable = true;
+      
+      font = { name = "monospace"; size = 8.0; };
+
+      settings = let c = desktop.theme.colors; in {
+        foreground = "#${c.fg}";
+        background = "#000000";
+
+        color0  = "#${c.black}";
+        color1  = "#${c.red}";
+        color2  = "#${c.green}";
+        color3  = "#${c.yellow}";
+        color4  = "#${c.blue}";
+        color5  = "#${c.magenta}";
+        color6  = "#${c.cyan}";
+        color7  = "#${c.white}";
+
+        color8  = "#${c.brightBlack}";
+        color9  = "#${c.brightRed}";
+        color10 = "#${c.brightGreen}";
+        color11 = "#${c.brightYellow}";
+        color12 = "#${c.brightBlue}";
+        color13 = "#${c.brightMagenta}";
+        color14 = "#${c.brightCyan}";
+        color15 = "#${c.brightWhite}";
+
+
+        color124 = "#${c.brightRed}";
+        color106 = "#${c.brightGreen}";
+        color172 = "#${c.brightYellow}";
+        color66  = "#${c.brightBlue}";
+        color132 = "#${c.brightMagenta}";
+        color72  = "#${c.brightCyan}";
+
+        color167 = "#${c.red}";
+        color142 = "#${c.green}";
+        color214 = "#${c.yellow}";
+        color109 = "#${c.blue}";
+        color175 = "#${c.magenta}";
+        color108 = "#${c.cyan}";
+
+        color234 = "#${c.bg0}";
+        color237 = "#${c.bg1}";
+        color239 = "#${c.bg2}";
+        color241 = "#${c.bg3}";
+        color243 = "#${c.bg4}";
+        color245 = "#${c.white}";
+
+        color246 = "#${c.fg4}";
+        color248 = "#${c.fg3}";
+        color250 = "#${c.fg2}";
+        color223 = "#${c.fg1}";
+        color229 = "#${c.fg0}";
+
+        color166 = "#${c.orange}";
+        color208 = "#${c.brightOrange}";
+
+        color231 = "#${c.accent}";
+      };
+
+      shellIntegration = {
+        mode = "no-cursor";
+        enableBashIntegration = true;
+      };
+
+      extraConfig = ''
+        background_opacity 0.8
+        confirm_os_window_close 0
+      '';
+    };
+  };
+}
diff --git a/snowfall/modules/home/suites/desktop/default.nix b/snowfall/modules/home/suites/desktop/default.nix
index 4b1b880..a67e481 100644
--- a/snowfall/modules/home/suites/desktop/default.nix
+++ b/snowfall/modules/home/suites/desktop/default.nix
@@ -11,6 +11,7 @@ in {
     cxl = {
       apps = {
         i3.enable = true;
+        kitty.enable = true;
       };
     };
   };