more colors

home-manager/home-fish.nix

@@ -3,6 +3,7 @@ pkgs:
     enable = true;
     shellAliases = {
         nsh = "nix-shell --command fish";
+        cd = "z";
       };
 #    interactiveShellInit = ''
 #      function fish_prompt

home-manager/home-k9s.nix

@@ -0,0 +1,3 @@
+pkgs: {
+    enable = true;
+}

home-manager/home-starship.nix

@@ -1,4 +1,4 @@
-{
+pkgs: {
     enable = true;
     settings = {
         add_newline = false;
@@ -12,9 +12,17 @@
         nix_shell.symbol = " ";
         nodejs.symbol = " ";
         package.disabled = true;
+        palette = "catppuccin_macchiato";
         python.symbol = " ";
         package.symbol = " ";
         rust.symbol = " ";
         shell.disabled = false;
-    };
+    } // builtins.fromTOML (builtins.readFile
+        (pkgs.fetchFromGitHub
+          {
+            owner = "catppuccin";
+            repo = "starship";
+            rev = "3e3e54410c3189053f4da7a7043261361a1ed1bc"; # Replace with the latest commit hash
+            sha256 = "soEBVlq3ULeiZFAdQYMRFuswIIhI9bclIU8WXjxd7oY=";
+          } + /palettes/macchiato.toml));
 }

home-manager/home-tmux.nix

@@ -1,11 +1,13 @@
-{
+pkgs: {
     baseIndex = 1;
     clock24 = true;
     enable = true;
     escapeTime = 0;
     keyMode = "vi";
     mouse = true;
+    plugins = [pkgs.tmuxPlugins.catppuccin];
     shortcut = "Space";
+    tmuxinator.enable = true;
     extraConfig = ''
 bind-key -T copy-mode-vi 'v' send -X begin-selection
 bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel

home-manager/home.nix

@@ -6,9 +6,31 @@
     home.username = "jfrikker";
     home.homeDirectory = "/Users/jfrikker";
 
-  home.sessionVariables.TEST = "foo";
-  home.sessionVariables.RUST_SRC_PATH = "${pkgs.rust-bin.stable."1.68.0".rust-src}/lib/rustlib/src/rust/library";
     home.sessionVariables.BAT_THEME = "catppuccin-macchiato";
+    home.sessionVariables.EDITOR = "nvim";
+    home.sessionVariables.RUST_SRC_PATH = "${pkgs.rust-bin.stable."1.68.0".rust-src}/lib/rustlib/src/rust/library";
+
+    xdg.enable = true;
+    xdg.configFile."k9s/skin.yml" = {
+        enable = true;
+        source = pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "k9s";
+            rev = "322598e19a4270298b08dc2765f74795e23a1615"; # Replace with the latest commit hash
+            sha256 = "GrRCOwCgM8BFhY8TzO3/WDTUnGtqkhvlDWE//ox2GxI=";
+        } + /dist/macchiato.yml;
+    };
+
+    xdg.configFile."lazygit/config.yml" = {
+        enable = true;
+        source = pkgs.fetchFromGitHub
+        {
+            owner = "catppuccin";
+            repo = "lazygit";
+            rev = "b2ecb6d41b6f54a82104879573c538e8bdaeb0bf"; # Replace with the latest commit hash
+            sha256 = "9BBmWRcjNaJE9T0RKVEJaSnkrbMom0CLYE8PzAT6yFw=";
+        } + /themes/macchiato.yml;
+    };
 
     home.packages = [
         # pkgs.apacheKafka
@@ -79,8 +101,8 @@
     programs.jq.enable = true;
     programs.k9s.enable = true;
     programs.lazygit.enable = true;
-  programs.starship = import ./home-starship.nix;
-  programs.tmux = import ./home-tmux.nix;
+    programs.starship = import ./home-starship.nix pkgs;
+    programs.tmux = import ./home-tmux.nix pkgs;
     programs.zoxide.enable = true;
 
     # programs.neovim = import ./home-neovim.nix pkgs;