refactor: latte gang

flake.lock

@@ -348,11 +348,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689134369,
-        "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=",
+        "lastModified": 1697838989,
+        "narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c",
+        "rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0",
         "type": "github"
       },
       "original": {

home/apps/fish.nix

@@ -19,17 +19,18 @@ in {
       };
     in {
       enable = true;
-      config.theme = "Catppuccin-mocha";
+      config.theme = "Catppuccin-latte";
       themes = let
-        getTheme = flavour:
-          builtins.readFile (
-            themepkg + "/Catppuccin-${flavour}.tmTheme"
-          );
+        getTheme = flavour: "Catppuccin-${flavour}.tmTheme";
       in {
-        Catppuccin-latte = getTheme "latte";
-        Catppuccin-frappe = getTheme "frappe";
-        Catppuccin-macchiato = getTheme "macchiato";
-        Catppuccin-mocha = getTheme "mocha";
+        Catppuccin-latte = {
+          src = themepkg;
+          file = getTheme "latte";
+        };
+        Catppuccin-mocha = {
+          src = themepkg;
+          file = getTheme "mocha";
+        };
       };
     };
     btop = {
@@ -39,13 +40,26 @@ in {
         vim_keys = true;
       };
     };
-    lsd = {
-      enable = true;
-      enableAliases = true;
-      settings = {
-        no-symlink = false;
-      };
-    };
+    # eza = {
+    #   enable = false;
+    #   enableAliases = false;
+    #   icons = true;
+    #   extraOptions = [
+    #     "--all"
+    #     "--long"
+    #     "--time-style=long-iso"
+    #     "--dereference"
+    #     "--octal-permissions"
+    #     "--group"
+    #   ];
+    # };
+    # lsd = {
+    #   enable = true;
+    #   enableAliases = true;
+    #   settings = {
+    #     no-symlink = false;
+    #   };
+    # };
     tealdeer = {
       enable = true;
       settings = {
@@ -296,7 +310,7 @@ in {
 
         bind -s --user -M insert \e "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f repaint-mode; end"
 
-        yes | fish_config theme save "Catppuccin Mocha"
+        yes | fish_config theme save "Catppuccin Latte"
       '';
 
       plugins = [
@@ -321,5 +335,9 @@ in {
       url = "https://raw.githubusercontent.com/catppuccin/fish/main/themes/Catppuccin%20Mocha.theme";
       sha256 = "sha256-MlI9Bg4z6uGWnuKQcZoSxPEsat9vfi5O1NkeYFaEb2I=";
     });
+    "fish/themes/Catppuccin Latte.theme".text = builtins.readFile (pkgs.fetchurl {
+      url = "https://raw.githubusercontent.com/catppuccin/fish/main/themes/Catppuccin%20Latte.theme";
+      sha256 = "sha256-SL19zcXf+Df1BeH+nfI63t3qpDmRISHGRtaEP36mojE=";
+    });
   };
 }

home/apps/nvim/lua/plugins/colourscheme.lua

@@ -4,6 +4,7 @@ return {
     name = "catppuccin",
     no_italic = true,
     opts = {
+      flavour = "latte",
       -- styles = {
       --   comments = { "italic" },
       -- },

home/apps/starship/config.toml

@@ -1,6 +1,7 @@
 # Get editor completions based on the config schema
 "$schema" = 'https://starship.rs/config-schema.json'
 
+palette = "catppuccin_latte"
 format = """
 ┌ \
 $username\
@@ -84,121 +85,177 @@ error_symbol = "[\\$](bold red)"     # The "success_symbol" segment is being set
 vimcmd_symbol = "[\\$](bold green)"
 
 [hostname]
-style = "#74c7ec"
+style = "sapphire"
 ssh_symbol = "🐴 "
 
 [aws]
-style = "#74c7ec"
+style = "sapphire"
 symbol = "  "
 
 [buf]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [c]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [conda]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [dart]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [directory]
-style = "#cba6f7"
+style = "mauve"
 read_only = " 󰌾"
 
 [docker_context]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [elixir]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [elm]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [git_branch]
 symbol = " "
 
 [golang]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [haskell]
-style = "#74c7ec"
+style = "sapphire"
 symbol = "󰲒 "
 
 [hg_branch]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [java]
-style = "#74c7ec"
+style = "sapphire"
 symbol = "󰬷 "
 
 [julia]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [lua]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [memory_usage]
-style = "#74c7ec"
+style = "sapphire"
 symbol = "󰍛 "
 
 [meson]
-style = "#74c7ec"
+style = "sapphire"
 symbol = "󰔷 "
 
 [nim]
-style = "#74c7ec"
+style = "sapphire"
 symbol = "󰆥 "
 
 [nix_shell]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [nodejs]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [package]
-style = "#fab387"
+style = "peach"
 symbol = ' '
 
 [python]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [rlang]
-style = "#74c7ec"
+style = "sapphire"
 symbol = "󰟔 "
 
 [ruby]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [rust]
-style = "#74c7ec"
+style = "sapphire"
 symbol = "󱘗 "
 
 [scala]
-style = "#74c7ec"
+style = "sapphire"
 symbol = " "
 
 [spack]
-style = "#74c7ec"
+style = "sapphire"
 
 [kubernetes]
-style = "#74c7ec"
+style = "sapphire"
 symbol = "󱃾 "
 format = '[ $symbol($cluster/$namespace) ]($style)'
 disabled = false
+
+[palettes.catppuccin_latte]
+rosewater = "#dc8a78"
+flamingo = "#dd7878"
+pink = "#ea76cb"
+mauve = "#8839ef"
+red = "#d20f39"
+maroon = "#e64553"
+peach = "#fe640b"
+yellow = "#df8e1d"
+green = "#40a02b"
+teal = "#179299"
+sky = "#04a5e5"
+sapphire = "#209fb5"
+blue = "#1e66f5"
+lavender = "#7287fd"
+text = "#4c4f69"
+subtext1 = "#5c5f77"
+subtext0 = "#6c6f85"
+overlay2 = "#7c7f93"
+overlay1 = "#8c8fa1"
+overlay0 = "#9ca0b0"
+surface2 = "#acb0be"
+surface1 = "#bcc0cc"
+surface0 = "#ccd0da"
+base = "#eff1f5"
+mantle = "#e6e9ef"
+crust = "#dce0e8"
+
+[palettes.catppuccin_mocha]
+rosewater = "#f5e0dc"
+flamingo = "#f2cdcd"
+pink = "#f5c2e7"
+mauve = "#cba6f7"
+red = "#f38ba8"
+maroon = "#eba0ac"
+peach = "#fab387"
+yellow = "#f9e2af"
+green = "#a6e3a1"
+teal = "#94e2d5"
+sky = "#89dceb"
+sapphire = "#74c7ec"
+blue = "#89b4fa"
+lavender = "#b4befe"
+text = "#cdd6f4"
+subtext1 = "#bac2de"
+subtext0 = "#a6adc8"
+overlay2 = "#9399b2"
+overlay1 = "#7f849c"
+overlay0 = "#6c7086"
+surface2 = "#585b70"
+surface1 = "#45475a"
+surface0 = "#313244"
+base = "#1e1e2e"
+mantle = "#181825"
+crust = "#11111b"

home/apps/wezterm/wezterm.lua

@@ -63,7 +63,7 @@ c.ssh_domains = {
 }
 
 wezterm.plugin.require("https://github.com/catppuccin/wezterm").apply_to_config(c, {
-  flavor = "mocha",
+  flavor = "latte",
   sync = wezterm.target_triple:find("darwin") ~= nil,
   sync_flavors = { light = "latte", dark = "mocha" },
 })
@@ -90,7 +90,7 @@ wezterm.plugin.require("https://github.com/sgoudham/wezterm-bar").apply_to_confi
   },
 })
 
-local custom = wezterm.color.get_builtin_schemes()["Catppuccin Mocha"]
+local custom = wezterm.color.get_builtin_schemes()["Catppuccin Latte"]
 custom.background = "#000000"
 custom.tab_bar.background = "#040404"
 custom.tab_bar.inactive_tab.bg_color = "#0f0f0f"
@@ -99,6 +99,6 @@ custom.tab_bar.new_tab.bg_color = "#080808"
 c.color_schemes = {
   ["OLEDppuccin"] = custom,
 }
-c.color_scheme = "Catppuccin Mocha"
+c.color_scheme = "Catppuccin Latte"
 
 return c

home/default.nix

@@ -41,7 +41,7 @@
   home.sessionVariables = {
     TERMINAL = "wezterm-gui";
     LIBVA_DRIVER_NAME = "iHD";
-    LS_COLORS = "$(vivid generate catppuccin-mocha)";
+    LS_COLORS = "$(vivid generate catppuccin-latte)";
     JAVA_HOME = "${config.home.homeDirectory}/.sdkman/candidates/java/current";
     GRAALVM_HOME = "${config.home.homeDirectory}/.sdkman/candidates/java/22.3.r17-grl";
   };