Răsfoiți Sursa

moving to catppuccin frappe theme

Zander Hawke 1 an în urmă
părinte
comite
f106d1d694

+ 32 - 1
home/features/cli/bat.nix

@@ -1,11 +1,42 @@
 { pkgs, ... }:
+
+let
+  catppuccin-src = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "bat";
+    rev = "699f60f";
+    sha256 = "sha256-6fWoCH90IGumAMc4buLRWL0N61op+AuMNN9CAR9/OdI=";
+  };
+in
+
 {
   programs.bat = {
     enable = true;
     config = {
-      theme = "kanagawa";
+      theme = "catppuccin-frappe";
     };
+
     themes = {
+      catppuccin-latte = {
+        src = catppuccin-src;
+        file = "/themes/Catppuccin Latte.tmTheme";
+      };
+
+      catppuccin-frappe = {
+        src = catppuccin-src;
+        file = "/themes/Catppuccin Frappe.tmTheme";
+      };
+
+      catppuccin-macchiato = {
+        src = catppuccin-src;
+        file = "/themes/Catppuccin Macchiato.tmTheme";
+      };
+
+      catppuccin-mocha = {
+        src = catppuccin-src;
+        file = "/themes/Catppuccin Mocha.tmTheme";
+      };
+
       nord = {
         src = pkgs.fetchFromGitHub {
           owner = "crabique";

+ 5 - 5
home/features/cli/fish.nix

@@ -7,12 +7,12 @@
     interactiveShellInit = lib.mkAfter ''
       ${lib.strings.fileContents (
         pkgs.fetchFromGitHub {
-          owner = "rebelot";
-          repo = "kanagawa.nvim";
-          rev = "de7fb5f5de25ab45ec6039e33c80aeecc891dd92";
-          sha256 = "sha256-f/CUR0vhMJ1sZgztmVTPvmsAgp0kjFov843Mabdzvqo=";
+          owner = "catppuccin";
+          repo = "fish";
+          rev = "cc8e4d8";
+          sha256 = "sha256-udiU2TOh0lYL7K7ylbt+BGlSDgCjMpy75vQ98C1kFcc=";
         }
-        + "/extras/kanagawa.fish"
+        + "/themes/Catppuccin Frappe.theme"
       )}
     '';
   };

+ 39 - 1
home/features/cli/starship.nix

@@ -1,3 +1,41 @@
 {
-  programs.starship.enable = true;
+  programs.starship = {
+    enable = true;
+    enableFishIntegration = true;
+    enableNushellIntegration = true;
+    enableTransience = true;
+
+    settings = {
+      palettes.catppuccin_frappe = {
+        rosewater = "#f2d5cf";
+        flamingo = "#eebebe";
+        pink = "#f4b8e4";
+        mauve = "#ca9ee6";
+        red = "#e78284";
+        maroon = "#ea999c";
+        peach = "#ef9f76";
+        yellow = "#e5c890";
+        green = "#a6d189";
+        teal = "#81c8be";
+        sky = "#99d1db";
+        sapphire = "#85c1dc";
+        blue = "#8caaee";
+        lavender = "#babbf1";
+        text = "#c6d0f5";
+        subtext1 = "#b5bfe2";
+        subtext0 = "#a5adce";
+        overlay2 = "#949cbb";
+        overlay1 = "#838ba7";
+        overlay0 = "#737994";
+        surface2 = "#626880";
+        surface1 = "#51576d";
+        surface0 = "#414559";
+        base = "#303446";
+        mantle = "#292c3c";
+        crust = "#232634";
+      };
+
+      palette = "catppuccin_frappe";
+    };
+  };
 }

+ 6 - 1
home/features/cli/tmux.nix

@@ -23,7 +23,12 @@
 
     plugins = with pkgs.tmuxPlugins; [
       pkgs.more-tmux-plugins.tmux-select-pane-no-wrap
-      nord
+      {
+        plugin = catppuccin;
+        extraConfig = ''
+          set -g @catppuccin_flavor 'frappe' # latte, frappe, macchiato or mocha
+        '';
+      }
       vim-tmux-navigator
       {
         plugin = yank;

+ 1 - 0
home/features/cli/yazi.nix

@@ -1,3 +1,4 @@
 {
+  # TODO: add this theme at some point: https://github.com/catppuccin/yazi/tree/main
   programs.yazi.enable = true;
 }

+ 69 - 22
home/features/desktop/alacritty.nix

@@ -32,36 +32,83 @@
 
       colors = {
         primary = {
-          background = "#1f1f28";
-          foreground = "#dcd7ba";
+          background = "#303446";
+          foreground = "#c6d0f5";
+          dim_foreground = "#838ba7";
+          bright_foreground = "#c6d0f5";
         };
 
-        normal = {
-          black = "#090618";
-          red = "#c34043";
-          green = "#76946a";
-          yellow = "#c0a36e";
-          blue = "#7e9cd8";
-          magenta = "#957fb8";
-          cyan = "#6a9589";
-          white = "#c8c093";
+        cursor = {
+          text = "#303446";
+          cursor = "#f2d5cf";
         };
 
-        bright = {
-          black = "#727169";
-          red = "#e82424";
-          green = "#98bb6c";
-          yellow = "#e6c384";
-          blue = "#7fb4ca";
-          magenta = "#938aa9";
-          cyan = "#7aa89f";
-          white = "#dcd7ba";
+        vi_mode_cursor = {
+          text = "#303446";
+          cursor = "#babbf1";
+        };
+
+        search.matches = {
+          foreground = "#303446";
+          background = "#a5adce";
+        };
+
+        search.focused_match = {
+          foreground = "#303446";
+          background = "#a6d189";
+        };
+
+        footer_bar = {
+          foreground = "#303446";
+          background = "#a5adce";
+        };
+
+        hints.start = {
+          foreground = "#303446";
+          background = "#e5c890";
+        };
+
+        hints.end = {
+          foreground = "#303446";
+          background = "#a5adce";
         };
 
         selection = {
-          background = "#2d4f67";
-          foreground = "#c8c093";
+          text = "#303446";
+          background = "#f2d5cf";
+        };
+
+        normal = {
+          black = "#51576d";
+          red = "#e78284";
+          green = "#a6d189";
+          yellow = "#e5c890";
+          blue = "#8caaee";
+          magenta = "#f4b8e4";
+          cyan = "#81c8be";
+          white = "#b5bfe2";
         };
+
+        bright = {
+          black = "#626880";
+          red = "#e78284";
+          green = "#a6d189";
+          yellow = "#e5c890";
+          blue = "#8caaee";
+          magenta = "#f4b8e4";
+          cyan = "#81c8be";
+          white = "#a5adce";
+        };
+
+        # indexed_colors = {
+        #   index = 16;
+        #   color = "#ef9f76";
+        # };
+        #
+        # indexed_colors = {
+        #   index = 17;
+        #   color = "#f2d5cf";
+        # };
       };
 
       bell = {

+ 32 - 2
home/features/desktop/ghostty.nix

@@ -16,6 +16,36 @@
     enableFishIntegration = true;
 
     themes = {
+      catppuccin-frappe = {
+        palette = [
+          "0=#51576d"
+          "1=#e78284"
+          "2=#a6d189"
+          "3=#e5c890"
+          "4=#8caaee"
+          "5=#f4b8e4"
+          "6=#81c8be"
+          "7=#b5bfe2"
+          "8=#626880"
+          "9=#e78284"
+          "10=#a6d189"
+          "11=#e5c890"
+          "12=#8caaee"
+          "13=#f4b8e4"
+          "14=#81c8be"
+          "15=#a5adce"
+        ];
+
+        background = "303446";
+        foreground = "c6d0f5";
+
+        cursor-color = "f2d5cf";
+        cursor-text = "303446";
+
+        selection-background = "44495d";
+        selection-foreground = "c6d0f5";
+      };
+
       iceberg-dark = {
         background = "161821";
         foreground = "c6c8d1";
@@ -57,12 +87,12 @@
     settings = {
       command = "${pkgs.lib.meta.getExe config.programs.fish.package}";
 
-      background-opacity = 0.8;
+      background-opacity = 0.9;
       font-family = "FiraCode Nerd Font";
       font-size = 11.0;
 
       macos-titlebar-style = "hidden";
-      theme = "iceberg-dark";
+      theme = "catppuccin-frappe";
 
       window-padding-x = 12;
       window-padding-y = 12;