hosts/common.nix

@@ -42,5 +42,5 @@ in {
     inherit wrapped-helix fish;
   };
   # helix as the only editor, a reasonable choice.
-  environment.sessionVariables.EDITOR =  "hx";
+  environment.sessionVariables.EDITOR = pkgs.lib.getExe' wrapped-helix "hx";
 }

modules/programs/gui/foot.nix

@@ -8,7 +8,7 @@
 
   inherit (config.meta.mainUser) username;
   cfg = config.modules.system.programs.terminals.foot;
-  theme-colors = config.modules.style.colorScheme.colors;
+  colours = config.modules.style.colorScheme.colors;
 
   foot-config = pkgs.writeText "foot.ini" (lib.generators.toINI {} {
     main = {
@@ -90,39 +90,27 @@
       select-word = "BTN_LEFT-2";
       select-word-whitespace = "Control+BTN_LEFT-2";
     };
-
-    # 16=fab387
-    # 17=f5e0dc
-
     colors = {
-      foreground = theme-colors.base05; # Text
+      background = colours.base00; # base color
-      background = theme-colors.base00; # Base
+      foreground = colours.base05; # text color
-      regular0 = theme-colors.base03; # Surface 1
-      regular1 = theme-colors.base08; # red
-      regular2 = theme-colors.base0B; # green
-      regular3 = theme-colors.base0A; # yellow
-      regular4 = theme-colors.base0D; # blue
-      regular5 = "f5c2e7"; # pink
-      regular6 = "94e2d5"; # teal
-      regular7 = "bac2de"; # Subtext 1
 
-      bright0 = theme-colors.Surface2; # Surface 2
+      regular0 = colours.base03; # black
-      bright1 = theme-colors.base08; # red
+      regular1 = colours.base08; # red
-      bright2 = theme-colors.base0B; # green
+      regular2 = colours.base0B; # green
-      bright3 = theme-colors.yellow; # yellow
+      regular3 = colours.base0A; # yellow
-      bright4 = "89b4fa"; # blue
+      regular4 = colours.base0D; # blue
-      bright5 = "f5c2e7"; # pink
+      regular5 = colours.base0F; #magenta
-      bright6 = "94e2d5"; # teal
+      regular6 = colours.base0C; #cyan
-      bright7 = "a6adc8"; # Subtext 0
+      regular7 = colours.base06; #white
 
-      selection-foreground = "cdd6f4";
+      bright0 = colours.base04; # Surface 2
-      selection-background = "414356";
+      bright1 = colours.base08; # red
-
+      bright2 = colours.base0B; # green
-      search-box-no-match = "11111b f38ba8";
+      bright3 = colours.base0A; # yellow
-      search-box-match = "cdd6f4 313244";
+      bright4 = colours.base0D; # blue
-
+      bright5 = colours.base0F; # pink
-      jump-labels = "11111b fab387";
+      bright6 = colours.base0C; # teal
-      urls = "89b4fa";
+      bright7 = colours.base07; # Subtext 0
 
       alpha = 1.0;
     };

modules/style/palettes/catppuccin-mocha.nix

@@ -14,8 +14,8 @@
       base07 = "#b4befe"; # lavender
       base08 = "#f38ba8"; # red
       base09 = "#fab387"; # peach
-      base0A = "#f9e2af"; # yellow
+      base0A = "#a6e3a1"; # yellow
-      base0B = "#a6e3a1"; # green
+      base0B = "#94e2d5"; # green
       base0C = "#a6e3a1"; # teal
       base0D = "#89b4fa"; # blue
       base0E = "#cba6f7"; # mauve