refactor!: with great pain i bring you no whichkey

config/plugin/keybinds.lua

@@ -17,3 +17,24 @@ map("n", "N", "Nzzzv")
 
 -- NvimTree
 map("n", "<C-N>", "<cmd>NvimTreeToggle<CR>")
+
+-- improved clipboard
+map({ "n", "v" }, "<leader>y", '"+y')
+map({ "n", "v" }, "<leader>p", '"+p')
+
+-- open lazygit
+map({ "n", "v" }, "<leader>gg", "<cmd>LazyGit<cr>")
+
+-- quit all
+map({ "n", "v" }, "<leader>q", "<cmd>qall<cr>")
+
+-- telescope
+map("n", "<leader><leader>", "<cmd>Telescope find_files<cr>") -- find files
+map("n", "<leader>fg", "<cmd>Telescope live_grep<cr>") -- grep through all files
+map("n", "<leader>fs", "<cmd>SessionManager load_session<cr>") -- Show nvim sessions
+-- map("n", "<leader>fh", "<cmd>Telescope help_tags<cr>") -- search help tags
+map("n", "<leader>fp", "<cmd>Telescope project<cr>") -- skip to project
+map("n", "<leader>ft", "<cmd>TodoTelescope<cr>") -- live grep but for TODOs and FIXMEs
+
+-- save file
+map("n", "<C-s>", "<cmd>w<cr>")

neovim.nix

@@ -1,6 +1,6 @@
 {
   config.perSystem =
-    { pkgs, ... }:
+    { lib, pkgs, ... }:
     {
       neovim = {
         package = pkgs.neovim-unwrapped;
@@ -55,6 +55,28 @@
           nushell
         ];
 
+        build =
+          let
+            env = pkgs.buildEnv {
+              name = "neovim-host-prog";
+              paths = [ pkgs.nodePackages.neovim ] ++ [ (pkgs.python3.withPackages (ps: with ps; [ pynvim ])) ];
+            };
+          in
+          lib.mkForce {
+            before = pkgs.writeTextFile {
+              name = "before.lua";
+              text = ''
+                -- set space as leader
+                vim.g.mapleader = " "
+                vim.g.maplocalleader = " "
+
+                -- this defaults to this and we want to keep it that way
+                vim.g.node_host_prog = "${env}/bin/neovim-node-host"
+                vim.g.python3_host_prog = "${env}/bin/python"
+              '';
+            };
+          };
+
         lazy = {
           settings.install.colorscheme = [ "catppuccin" ];
           plugins = import ./plugins { inherit pkgs; };

nvfetcher.toml

@@ -228,7 +228,3 @@ src.git = "https://github.com/tpope/vim-fugitive"
 [vim-just]
 fetch.github = "NoahTheDuke/vim-just"
 src.git = "https://github.com/NoahTheDuke/vim-just"
-
-[which-key]
-fetch.github = "folke/which-key.nvim"
-src.git = "https://github.com/folke/which-key.nvim"

plugins/catppuccin.lua

@@ -36,7 +36,7 @@ return function()
         enabled = true,
         transparent_panel = true,
       },
-      which_key = true,
+      which_key = false,
       indent_blankline = {
         enabled = true,
         colored_indent_levels = true,

plugins/default.nix

@@ -9,12 +9,6 @@ rec {
     priority = 1000;
   };
 
-  # what was that button again
-  which-key = {
-    src = srcs.which-key;
-    config = ./which-key.lua;
-  };
-
   # tree view
   nvim-tree = {
     src = srcs.nvim-tree-lua;
@@ -169,7 +163,7 @@ rec {
     src = srcs.telescope;
     config = ./telescope.lua;
     dependencies = {
-      inherit plenary nvim-web-devicons which-key;
+      inherit plenary nvim-web-devicons;
       telescope-fzf-native.package = pkgs.vimPlugins.telescope-fzf-native-nvim;
       telescope-project.src = srcs.telescope-project;
       telescope-ui-select.src = srcs.telescope-ui-select;
@@ -258,9 +252,6 @@ rec {
     src = srcs.rustaceanvim;
     config = ./rust.lua;
     ft = "rust";
-    dependencies = {
-      inherit which-key;
-    };
   };
   rust-vim = {
     src = srcs.rust-vim;
@@ -334,8 +325,12 @@ rec {
   };
 
   # misc
-  undotree.src = srcs.undotree; # undo tree
-  vim-just.src = srcs.vim-just; # justfile support
+  undotree = {
+    src = srcs.undotree;
+    config = ''
+      vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
+    '';
+  };
 
   # track my time coding
   wakatime = {
@@ -377,7 +372,7 @@ rec {
   freeze = {
     src = srcs.freeze-nvim;
     paths = [ pkgs.charm-freeze ];
-    lazy = true;
+    event = "VeryLazy";
     config = ./freeze.lua;
   };
 

plugins/freeze.lua

@@ -1,9 +1,5 @@
 return function()
-  local wk = require("which-key")
-
-  wk.register({
-    ["<leader>sc"] = { ":Freeze<cr>", "Snapshot code" },
-  }, { mode = "v" })
+  vim.keymap.set("v", "<leader>sc", "<cmd>Freeze<cr>")
 
   require("freeze").setup({
     output = function()

plugins/rust.lua

@@ -1,21 +1,11 @@
 vim.g.rustaceanvim = {
   on_attach = function(client, bufnr)
-    -- register which-key mappings
-    local wk = require("which-key")
-    wk.register({
-      ["<leader>cR"] = {
-        function()
-          vim.cmd.RustLsp("codeAction")
-        end,
-        "Code Action",
-      },
-      ["<leader>dr"] = {
-        function()
-          vim.cmd.RustLsp("debuggables")
-        end,
-        "Rust debuggables",
-      },
-    }, { mode = "n", buffer = bufnr })
+    vim.keymap.set("n", "<leader>cR", function()
+      vim.cmd.RustLsp("codeAction")
+    end)
+    vim.keymap.set("n", "<leader>dr", function()
+      vim.cmd.RustLsp("debuggables")
+    end, { buffer = bufnr })
   end,
   settings = {
     -- rust-analyzer language server configuration

plugins/which-key.lua

@@ -1,62 +0,0 @@
-return function()
-  local wk = require("which-key")
-
-  wk.setup({
-    key_labels = {
-      ["<space>"] = "󱁐 ",
-      ["<leader>"] = "󱁐 ",
-      ["<bs>"] = "󰌍 ",
-      ["<cr>"] = "󰌑 ",
-      ["<esc>"] = "󱊷 ",
-      ["<tab>"] = "󰌒 ",
-    },
-    window = {
-      border = vim.g.bc.style,
-      margin = { 0, 0, 0, 0 },
-    },
-  })
-
-  wk.register({
-    ["<leader>"] = {
-      y = { '"+y', "Copy to clipboard" },
-      p = { '"+p', "Paste from clipboard" },
-      gg = { "<cmd>LazyGit<cr>", "LazyGit" },
-      q = { "<cmd>qall<cr>", "Quit all" },
-    },
-  }, { mode = { "n", "v" } })
-
-  wk.register({
-    -- telescope
-    ["<leader><leader>"] = {
-      "<cmd>Telescope find_files<cr>",
-      "Find file",
-    },
-    ["<leader>f"] = {
-      name = "+Telescope",
-      g = { "<cmd>Telescope live_grep<cr>", "Live grep" },
-      s = { "<cmd>SessionManager load_session<cr>", "Show sessions" },
-      -- h = { "<cmd>Telescope help_tags<cr>", "Help tags" },
-      p = { "<cmd>Telescope project<cr>", "Project" },
-      t = { "<cmd>TodoTelescope<cr>", "Todo list" },
-    },
-
-    ["<leader>u"] = {
-      vim.cmd.UndotreeToggle,
-      "Undo Tree",
-    },
-
-    -- save file
-    ["<C-s>"] = {
-      "<cmd>w<cr>",
-      "Save File",
-    },
-
-    -- reduce clutter
-    ["<leader>"] = {
-      ["1"] = "which_key_ignore",
-      ["2"] = "which_key_ignore",
-      ["3"] = "which_key_ignore",
-      ["4"] = "which_key_ignore",
-    },
-  })
-end