feat(nix): add `just` & catppuccin `whiskers`

flake.lock

@@ -1,14 +1,34 @@
 {
   "nodes": {
+    "catppuccin-toolbox": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1701205596,
+        "narHash": "sha256-YwUYVKzOWDdOoQKHiPjScCbAogSZOTyr41L68E5yzG8=",
+        "owner": "catppuccin",
+        "repo": "toolbox",
+        "rev": "7800226205d685d4c03435867dc054ec48922462",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "toolbox",
+        "type": "github"
+      }
+    },
     "crane": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "git-view",
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": "rust-overlay_2"
       },
       "locked": {
         "lastModified": 1688082682,
@@ -27,12 +47,12 @@
     "crane_2": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nekowinston-nur",
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_3"
+        "rust-overlay": "rust-overlay_4"
       },
       "locked": {
         "lastModified": 1676846788,
@@ -179,11 +199,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1687709756,
+        "lastModified": 1694529238,
-        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -211,6 +231,24 @@
       }
     },
     "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1687709756,
+        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
       "locked": {
         "lastModified": 1676283394,
         "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
@@ -225,9 +263,9 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
+    "flake-utils_5": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1687709756,
@@ -243,9 +281,9 @@
         "type": "github"
       }
     },
-    "flake-utils_5": {
+    "flake-utils_6": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -264,9 +302,9 @@
     "git-view": {
       "inputs": {
         "crane": "crane",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
-        "rust-overlay": "rust-overlay_2"
+        "rust-overlay": "rust-overlay_3"
       },
       "locked": {
         "lastModified": 1688345409,
@@ -303,7 +341,7 @@
       "inputs": {
         "flake-parts": "flake-parts_3",
         "haskell-flake": "haskell-flake",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1686721748,
@@ -348,11 +386,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697838989,
+        "lastModified": 1702203126,
-        "narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=",
+        "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0",
+        "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883",
         "type": "github"
       },
       "original": {
@@ -390,9 +428,9 @@
       "inputs": {
         "crane": "crane_2",
         "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
         "icat": "icat",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "wezterm-src": "wezterm-src"
       },
       "locked": {
@@ -411,7 +449,7 @@
     },
     "neovim-flake": {
       "inputs": {
-        "flake-utils": "flake-utils_5",
+        "flake-utils": "flake-utils_6",
         "nixpkgs": [
           "neovim-nightly-overlay",
           "nixpkgs"
@@ -439,7 +477,7 @@
         "flake-parts": "flake-parts",
         "hercules-ci-effects": "hercules-ci-effects",
         "neovim-flake": "neovim-flake",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1688601949,
@@ -477,16 +515,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688221086,
+        "lastModified": 1697723726,
-        "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=",
+        "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825",
+        "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -510,6 +548,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1688221086,
+        "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1688646010,
         "narHash": "sha256-kCeza5eKI2NEi8k0EoeZfv3lN1r1Vwx+L/VA6I8tmG4=",
@@ -525,7 +579,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1686501370,
         "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
@@ -541,7 +595,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1688556768,
         "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=",
@@ -557,13 +611,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
-        "lastModified": 1697456312,
+        "lastModified": 1702151865,
-        "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
+        "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
+        "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
         "type": "github"
       },
       "original": {
@@ -590,16 +644,42 @@
     },
     "root": {
       "inputs": {
+        "catppuccin-toolbox": "catppuccin-toolbox",
         "git-view": "git-view",
         "home-manager": "home-manager",
         "nekowinston-nur": "nekowinston-nur",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "nur": "nur"
       }
     },
     "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "catppuccin-toolbox",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "catppuccin-toolbox",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1697940838,
+        "narHash": "sha256-eyk92QqAoRNC0V99KOcKcBZjLPixxNBS0PRc4KlSQVs=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "a3e829c06eadf848f13d109c7648570ce37ebccd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_2": {
       "inputs": {
         "flake-utils": [
           "git-view",
@@ -626,7 +706,7 @@
         "type": "github"
       }
     },
-    "rust-overlay_2": {
+    "rust-overlay_3": {
       "inputs": {
         "flake-utils": [
           "git-view",
@@ -651,7 +731,7 @@
         "type": "github"
       }
     },
-    "rust-overlay_3": {
+    "rust-overlay_4": {
       "inputs": {
         "flake-utils": [
           "nekowinston-nur",
@@ -738,6 +818,21 @@
         "type": "github"
       }
     },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "wezterm-src": {
       "flake": false,
       "locked": {

flake.nix

@@ -14,6 +14,7 @@
 
     git-view.url = "github:sgoudham/git-view/v1.0.0";
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
+    catppuccin-toolbox.url = "github:catppuccin/toolbox";
   };
 
   nixConfig = {
@@ -38,12 +39,14 @@
     nix-index-database,
     neovim-nightly-overlay,
     git-view,
+    catppuccin-toolbox,
     ...
   }: let
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
     overlays = final: prev: {
       git-view = git-view.packages.${system}.default;
+      whiskers = catppuccin-toolbox.packages.${pkgs.system}.whiskers;
       nur = import nur {
         nurpkgs = prev;
         pkgs = prev;

home/apps/deno.nix

@@ -1,5 +1,8 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     deno
+    nodejs_20
+    yarn-berry
+    corepack_20
   ];
 }

home/apps/fish.nix

@@ -73,21 +73,24 @@ in {
         updates.auto_update = true;
       };
     };
+    zoxide = {
+      enable = true;
+    };
     fzf = {
       enable = true;
       colors = {
-        "bg+" = "#040404";
+        "bg+" = "#e6e9ef";
-        "fg+" = "#cdd6f4";
+        "fg+" = "#4c4f69";
-        "hl+" = "#f38ba8";
+        "hl+" = "#d20f39";
-        border = "#74c7ec";
+        border = "#04a5e5";
-        fg = "#cdd6f4";
+        fg = "#4c4f69";
-        header = "#f38ba8";
+        header = "#d20f39";
-        hl = "#f38ba8";
+        hl = "#d20f39";
-        info = "#cba6f7";
+        info = "#8839ef";
-        marker = "#f5e0dc";
+        marker = "#dc8a78";
-        pointer = "#f5e0dc";
+        pointer = "#dc8a78";
-        prompt = "#cba6f7";
+        prompt = "#8839ef";
-        spinner = "#f5e0dc";
+        spinner = "#dc8a78";
       };
       defaultOptions = [
         "--height 40%"

home/apps/ideavim/ideavimrc

@@ -74,10 +74,6 @@ set tm=500
 " Set scrolloff
 set scrolloff=8
 
-"" Mappings
-" 0 -> first non-blank character
-map 0 ^
-
 " Center buffer when navigating
 nmap <C-u> <C-u>zz
 nmap <C-d> <C-d>zz

home/apps/nvim/lazy-lock.json

@@ -15,6 +15,7 @@
   "dressing.nvim": { "branch": "master", "commit": "169877dbcae54b23b464b219e053e92854bbb37f" },
   "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" },
   "gitsigns.nvim": { "branch": "main", "commit": "bae45ef449d8811061cc940459e70e883a3aa83a" },
+  "harpoon": { "branch": "harpoon2", "commit": "95c04787c450357ec738b3d8da4b395c808a7a1e" },
   "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
   "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
   "ltex_extra.nvim": { "branch": "master", "commit": "9bed99b2b8488cc2daf66c76d2e0cf051ee80d13" },
@@ -61,6 +62,7 @@
   "typescript.nvim": { "branch": "main", "commit": "de304087e6e49981fde01af8ccc5b21e8519306f" },
   "venv-selector.nvim": { "branch": "main", "commit": "cc312074371aff5b0d8d481b80c9c4de2a5287d7" },
   "vim-illuminate": { "branch": "master", "commit": "5ed17582a8e97bf0a0c617c3cf762e98f87b9859" },
+  "vim-just": { "branch": "main", "commit": "ee884dc7d45251d92f5972c4556c12fc101419c0" },
   "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
   "vimtex": { "branch": "master", "commit": "877de3ba5de5f766e5bfa1c3fb0d2ecfcd18f868" },
   "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }

home/apps/nvim/lua/config/keymaps.lua

@@ -26,6 +26,7 @@ unmap("n", "<leader>ww")
 unmap("n", "<leader>w-")
 unmap("n", "<leader>w|")
 unmap("n", "<leader>wd")
+unmap("n", "<leader>bb")
 require("which-key").register({
   ["<leader>w"] = "which_key_ignore",
 })

home/apps/nvim/lua/config/lazy.lua

@@ -14,6 +14,7 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.util.project" },
     { import = "lazyvim.plugins.extras.dap.core" },
     { import = "lazyvim.plugins.extras.lang.typescript" },
+    { import = "lazyvim.plugins.extras.lang.elixir" },
     { import = "lazyvim.plugins.extras.lang.json" },
     { import = "lazyvim.plugins.extras.coding.copilot" },
     { import = "lazyvim.plugins.extras.lang.python" },

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

@@ -3,15 +3,13 @@ return {
     "catppuccin/nvim",
     name = "catppuccin",
     no_italic = true,
+    priority = 10000,
     opts = {
       flavour = "latte",
       -- styles = {
       --   comments = { "italic" },
       -- },
       integrations = {
-        navic = {
-          custom_bg = "#181825",
-        },
         telescope = {
           style = "nvchad",
         },

home/apps/nvim/lua/plugins/editor.lua

@@ -89,7 +89,7 @@ return {
     opts = {
       -- TODO: Add in keymaps for <M-hjkl> for toggleterm
       open_mapping = [[<C-/]],
-      direction = "vertical",
+      direction = "float",
       size = vim.o.columns * 0.5,
       shade_filetypes = {},
       autochdir = true,
@@ -110,9 +110,32 @@ return {
       })
     end,
   },
+  {
+    "ThePrimeagen/harpoon",
+    branch = "harpoon2",
+    dependencies = "nvim-lua/plenary.nvim",
+    keys = function()
+      local harpoon = require("harpoon")
+      harpoon:setup()
+      -- stylua: ignore
+      return {
+        { "<leader>bm", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end, desc = "Open Harpoon Menu", },
+        { "<leader>bb", function() harpoon:list():append() end, desc = "Add To Harpoon", },
+        { "<leader>1", function() harpoon:list():select(1) end },
+        { "<leader>2", function() harpoon:list():select(2) end },
+        { "<leader>3", function() harpoon:list():select(3) end },
+        { "<leader>4", function() harpoon:list():select(4) end },
+      }
+    end,
+  },
   {
     "windwp/nvim-autopairs",
     event = "InsertEnter",
-    opts = {}, -- this is equalent to setup({}) function
+    opts = {}, -- this is equivalent to setup({}) function
+  },
+  {
+    "NoahTheDuke/vim-just",
+    event = { "BufReadPre", "BufNewFile" },
+    ft = { "\\cjustfile", "*.just", ".justfile" },
   },
 }

home/apps/nvim/lua/plugins/lsp.lua

@@ -38,7 +38,7 @@ return {
       keys[#keys + 1] = { "gl", vim.diagnostic.open_float, "Line Diagnostics" }
     end,
     opts = {
-      diagnostics = { underline = false },
+      diagnostics = { underline = false, update_in_insert = true },
       inlay_hints = { enabled = true },
       autoformat = false,
       ---@type lspconfig.options
@@ -79,6 +79,7 @@ return {
           "ltex-ls",
           "marksman",
           "yaml-language-server",
+          "elixir-ls",
           -- linter
           "yamllint",
           "jsonlint",
@@ -107,8 +108,8 @@ return {
       opts.mapping = vim.tbl_extend("force", opts.mapping, {
         ["<M-j>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
         ["<M-k>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
-        ["<C-p>"] = cmp.mapping.scroll_docs(-4),
+        ["<M-p>"] = cmp.mapping.scroll_docs(-4),
-        ["<C-n>"] = cmp.mapping.scroll_docs(4),
+        ["<M-n>"] = cmp.mapping.scroll_docs(4),
         ["<Tab>"] = cmp.mapping(function(fallback)
           if cmp.visible() then
             -- You could replace select_next_item() with confirm({ select = true }) to get VS Code autocompletion behavior

home/apps/vscode/settings.json

@@ -21,8 +21,8 @@
   "editor.acceptSuggestionOnEnter": "smart",
   "editor.formatOnSave": false,
   "editor.suggest.preview": true,
-  "errorLens.fontFamily": "Iosevka Term, Symbols Nerd Font, monospace",
+  // Latex
-  "errorLens.fontWeight": "bold",
+  "latex-workshop.latex.autoBuild.run": "onSave",
   // Terminal
   "terminal.integrated.defaultProfile.linux": "fish",
   "terminal.integrated.fontSize": 14,
@@ -306,7 +306,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[json]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "vscode.json-language-features"
   },
   "explorer.confirmDragAndDrop": false,
   "[jsonc]": {
@@ -332,7 +332,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescriptreact]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "vscode.typescript-language-features"
   },
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -345,6 +345,10 @@
   "window.zoomLevel": 1,
   "files.autoSaveDelay": 100,
   "terminal.integrated.smoothScrolling": true,
-  "workbench.iconTheme": "catppuccin-mocha",
+  "explorer.confirmDelete": false,
-  "workbench.colorTheme": "Catppuccin Mocha"
+  "workbench.iconTheme": "catppuccin-latte",
+  "workbench.colorTheme": "Catppuccin Latte",
+  "[mdx]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  }
 }

home/apps/wezterm/binds.lua

@@ -34,6 +34,20 @@ return {
     { key = "n", mods = "ALT|SHIFT", action = act({ SpawnTab = "CurrentPaneDomain" }) },
     { key = "m", mods = "ALT|SHIFT", action = act({ SpawnTab = "DefaultDomain" }) },
 
+    -- Interactively Rename Tab
+    {
+      key = "E",
+      mods = "ALT|SHIFT",
+      action = act.PromptInputLine({
+        description = "New Tab Name",
+        action = wezterm.action_callback(function(window, _, line)
+          if line then
+            window:active_tab():set_title(line)
+          end
+        end),
+      }),
+    },
+
     -- Open Links Via Keyboard
     {
       key = "o",
@@ -60,5 +74,5 @@ return {
       mods = "CTRL",
       action = act.OpenLinkAtMouseCursor,
     },
-  }
+  },
 }

home/apps/wezterm/wezterm.lua

@@ -6,6 +6,7 @@ c.set_environment_variables = {
 }
 
 c.front_end = "OpenGL"
+c.check_for_updates = false
 c.term = "wezterm"
 c.font = wezterm.font_with_fallback({
   {
@@ -15,7 +16,7 @@ c.font = wezterm.font_with_fallback({
   "Symbols Nerd Font",
   "Builtin",
 })
-c.font_size = 15
+c.font_size = 18
 
 c.default_prog = { "fish", "-l" }
 

home/apps/zsh.nix

@@ -4,7 +4,7 @@
   ...
 }: {
   programs.zsh = {
-    enable = true;
+    enable = false;
     enableAutosuggestions = true;
     enableCompletion = true;
     # Idk why the highlighting doesn't work properly now

home/default.nix

@@ -37,6 +37,8 @@
     vivid
     git-view
     nur.repos.nekowinston.icat
+    whiskers
+    just
   ];
   home.sessionVariables = {
     TERMINAL = "wezterm-gui";