wip

home-manager/home-bat.nix

@@ -3,14 +3,14 @@ pkgs:
         enable = true;
         extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];
         config = {
-            theme = "catppuccin-macchiato";
+            theme = "catppuccin-frappe";
         };
         themes = {
-          catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub {
+          catppuccin-frappe = builtins.readFile (pkgs.fetchFromGitHub {
             owner = "catppuccin";
             repo = "sublime-text"; # Bat uses sublime syntax for its themes
             rev = "3d8625d937d89869476e94bc100192aa220ce44a";
             sha256 = "3ABUsfJpb6RO6AiuuSL5gwDofJIwC5tlEMzBrlY9/s0=";
-          } + "/Macchiato.tmTheme");
+          } + "/Frappe.tmTheme");
         };
     }

home-manager/home-fish.nix

@@ -6,6 +6,7 @@ pkgs:
         du = "dust";
         http = "xh";
         https = "xh";
+        mux = "tmuxinator";
         nsh = "nix-shell --command fish";
       };
 

home-manager/home-starship.nix

@@ -12,7 +12,7 @@ pkgs: {
         nix_shell.symbol = " ";
         nodejs.symbol = " ";
         package.disabled = true;
-        palette = "catppuccin_macchiato";
+        palette = "catppuccin_frappe";
         python.symbol = " ";
         package.symbol = " ";
         rust.symbol = " ";
@@ -24,5 +24,5 @@ pkgs: {
             repo = "starship";
             rev = "3e3e54410c3189053f4da7a7043261361a1ed1bc"; # Replace with the latest commit hash
             sha256 = "soEBVlq3ULeiZFAdQYMRFuswIIhI9bclIU8WXjxd7oY=";
-          } + /palettes/macchiato.toml));
+          } + /palettes/frappe.toml));
 }

home-manager/home-tmux.nix

@@ -1,18 +1,32 @@
 pkgs: {
     baseIndex = 1;
     clock24 = true;
+    customPaneNavigationAndResize = true;
+    historyLimit = 50000;
     enable = true;
     escapeTime = 0;
     keyMode = "vi";
     mouse = true;
-    plugins = [{
-        plugin = pkgs.tmuxPlugins.catppuccin;
-        extraConfig = "set -g @catppuccin_window_tabs_enabled on";
-    }];
+    plugins = [
+        {
+            plugin = pkgs.tmuxPlugins.catppuccin;
+            extraConfig = "set -g @catppuccin_window_tabs_enabled on";
+        }
+        {
+            plugin = pkgs.tmuxPlugins.tmux-thumbs;
+            extraConfig = ''
+set -g @thumbs-unique enabled
+            '';
+        }
+    ];
+    shell = pkgs.fish + "/bin/fish";
     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
+
+bind-key -T launcher g popup -h 100% -w 100% -E lazygit
+bind-key g switch-client -Tlauncher
     '';
 }

home-manager/home.nix

@@ -6,7 +6,7 @@
     home.username = "jfrikker";
     home.homeDirectory = "/Users/jfrikker";
 
-    home.sessionVariables.BAT_THEME = "catppuccin-macchiato";
+    home.sessionVariables.BAT_THEME = "catppuccin-frappe";
     home.sessionVariables.EDITOR = "nvim";
     home.sessionVariables.RUST_SRC_PATH = "${pkgs.rust-bin.stable."1.68.0".rust-src}/lib/rustlib/src/rust/library";
 
@@ -18,7 +18,7 @@
             repo = "k9s";
             rev = "322598e19a4270298b08dc2765f74795e23a1615"; # Replace with the latest commit hash
             sha256 = "GrRCOwCgM8BFhY8TzO3/WDTUnGtqkhvlDWE//ox2GxI=";
-        } + /dist/macchiato.yml;
+        } + /dist/frappe.yml;
     };
 
     xdg.configFile."lazygit/config.yml" = {
@@ -29,17 +29,17 @@
             repo = "lazygit";
             rev = "b2ecb6d41b6f54a82104879573c538e8bdaeb0bf"; # Replace with the latest commit hash
             sha256 = "9BBmWRcjNaJE9T0RKVEJaSnkrbMom0CLYE8PzAT6yFw=";
-        } + /themes/macchiato.yml;
+        } + /themes/frappe.yml;
     };
 
-    xdg.configFile."fish/themes/Catppuccin Macchiato.theme" = {
+    xdg.configFile."fish/themes/Catppuccin Frappe.theme" = {
           enable = true;
           source = pkgs.fetchFromGitHub {
             owner = "catppuccin";
             repo = "fish";
             rev = "91e6d6721362be05a5c62e235ed8517d90c567c9";
             sha256 = "l9V7YMfJWhKDL65dNbxaddhaM6GJ0CFZ6z+4R6MJwBA=";
-          } + "/themes/Catppuccin Macchiato.theme";
+          } + "/themes/Catppuccin Frappe.theme";
     };
 
     home.packages = [

nvim/lua/config/lazy.lua

@@ -45,3 +45,5 @@ require("lazy").setup({
     },
   },
 })
+
+vim.api.nvim_set_hl(0, "@type.qualifier", { link = "Keyword" })

nvim/lua/config/options.lua

@@ -7,5 +7,6 @@ opt.autowriteall = true
 opt.colorcolumn = "100"
 opt.hidden = false
 opt.tabstop = 4
+opt.sidescrolloff = 0
 opt.shiftwidth = 4
 opt.relativenumber = false

nvim/lua/plugins/colors.lua

@@ -2,7 +2,19 @@ return {
   {
     "LazyVim/LazyVim",
     opts = {
-      colorscheme = "catppuccin-macchiato",
+      colorscheme = "catppuccin",
     },
   },
+  { "catppuccin/nvim",
+        name = "catppuccin",
+        opts = {
+            flavour = "frappe",
+        },
+  },
+  { "ellisonleao/gruvbox.nvim" },
+  {"rktjmp/lush.nvim" },
+  {"briones-gabriel/darcula-solid.nvim",
+    depends = {"rktjmp/lush.nvim" },
+  },
+  { "doums/darcula" },
 }

nvim/lua/plugins/plugins.lua

@@ -27,6 +27,13 @@ return {
     "windwp/nvim-spectre",
     enabled = false,
   },
+  {
+    "ggandor/leap-spooky.nvim",
+    enabled = true,
+    opts = {
+        paste_on_remote_yank = true,
+    },
+  },
   {
     "ggandor/flit.nvim",
     enabled = false,
@@ -35,19 +42,25 @@ return {
   --   "rafamadriz/friendly-snippets",
   --   enabled = false,
   -- },
-  -- {
-  --   "folke/noice.nvim",
-  --   enabled = false,
-  --   opts = {
-  --     cmdline = {
-  --       view = "cmdline",
-  --     },
-  --   },
-  -- },
+  {
+    "folke/noice.nvim",
+    enabled = false,
+    opts = {
+      cmdline = {
+        view = "cmdline",
+      },
+    },
+  },
   {
     "echasnovski/mini.pairs",
     enabled = false,
   },
+  { "ellisonleao/gruvbox.nvim" },
+  {"rktjmp/lush.nvim" },
+  {"briones-gabriel/darcula-solid.nvim",
+    depends = {"rktjmp/lush.nvim" },
+  },
+  { "doums/darcula" },
   {
     "echasnovski/mini.indentscope",
     opts = {