various catppuccin changes

home/hosts/peach/default.nix

@@ -1,11 +1,7 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   catppuccin = {
-    accent = "peach";
-    flavor = "mocha";
+    accent = "lavender";
+    flavor = "macchiato";
   };
 
   home.packages = with pkgs; [
@@ -15,7 +11,6 @@
     asahi-wifisync
 
     moonlight-qt
-    # spotify-webapp
   ];
 
   # https://github.com/YaLTeR/niri/issues/2330#issuecomment-3256864777
@@ -44,7 +39,7 @@
     ];
 
     shortcuts = {
-      # this is really annoying on asahi laptops
+      # this is really annoying on apple laptops
       org_kde_powerdevil.Sleep = [];
     };
 

home/terminal/fish/default.nix

@@ -41,9 +41,11 @@
     text = let
       flavor = config.catppuccin.flavor;
       palette = pkgs.catppuccin.bare.${flavor};
+      accent = config.catppuccin.accent;
     in
       lib.concatStringsSep "\n" (
-        lib.mapAttrsToList (name: value: "set -g color_${name} ${value}") palette
+        (lib.mapAttrsToList (name: value: "set -g color_${name} ${value}") palette)
+        ++ ["set -g color_accent ${palette.${accent}}"]
       );
     force = true;
   };

home/terminal/fish/functions/fish-prompt.fish

@@ -11,11 +11,11 @@ set -g color_cwd $color_green
 
 # Set host color based on hostname
 if test (hostname) = peach
-    set -g color_host $color_peach
+    set -g color_host $color_accent
 else if test (hostname) = alien
-    set -g color_host $color_blue
+    set -g color_host $color_accent
 else if test (hostname) = vm
-    set -g color_host $color_green
+    set -g color_host $color_accent
     set -g color_cwd normal
 else if test (uname) = Darwin
     set -g color_host $color_yellow

system/default.nix

@@ -43,7 +43,6 @@
 
   catppuccin = {
     enable = true;
-    flavor = "mocha";
     cache.enable = true;
   };
 

system/hosts/alien/default.nix

@@ -23,7 +23,10 @@
   '';
   hardware.i2c.enable = true;
 
-  catppuccin.accent = "blue";
+  catppuccin = {
+    accent = "blue";
+    flavor = "mocha";
+  };
 
   boot.loader.systemd-boot.consoleMode = "max";
   boot.kernelPackages = pkgs.linuxPackages;

system/hosts/peach/default.nix

@@ -3,7 +3,11 @@
 
   boot.kernelParams = ["apple_dcp.show_notch=1"];
 
-  catppuccin.accent = "peach";
+  catppuccin = {
+    accent = "lavender";
+    flavor = "macchiato";
+  };
+
   services.displayManager.gdm.enable = true;
 
   hardware.asahi = {

system/hosts/vm-generic/default.nix

@@ -1,7 +1,10 @@
 {catppuccin, ...}: {
   networking.hostName = "vm";
 
-  catppuccin.accent = "green";
+  catppuccin = {
+    accent = "green";
+    flavor = "mocha";
+  };
 
   home-manager.users.sckova = {
     imports = [catppuccin.homeModules.catppuccin];