From 7b9825858bc139c95b71bca6bbca48706b6f0b18 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Sun, 10 Nov 2024 18:38:00 -0500 Subject: [PATCH] Remove which-key because lmao --- nix/home-manager/modules/packages/neovim.nix | 151 +++++++++---------- 1 file changed, 74 insertions(+), 77 deletions(-) diff --git a/nix/home-manager/modules/packages/neovim.nix b/nix/home-manager/modules/packages/neovim.nix index 0bea736..228bd10 100644 --- a/nix/home-manager/modules/packages/neovim.nix +++ b/nix/home-manager/modules/packages/neovim.nix @@ -19,43 +19,45 @@ lualine = { enable = true; # theme = "bubbles_theme"; # Currently doesn't work - componentSeparators = { - left = ""; - right = ""; - }; - sectionSeparators = { - left = ""; - right = ""; - }; - sections = { - lualine_a = [ - { - name = "mode"; - separator = { - left = ""; - }; - padding = { - right = 2; - left = 0; - }; - } - ]; - lualine_b = ["filename" "branch"]; - lualine_c = ["%="]; - lualine_x = []; - lualine_y = ["filetype" "progress"]; - lualine_z = [ - { - name = "location"; - separator = { - right = ""; - }; - padding = { - right = 0; - left = 2; - }; - } - ]; + settings = { + componentSeparators = { + left = ""; + right = ""; + }; + sectionSeparators = { + left = ""; + right = ""; + }; + sections = { + lualine_a = [ + { + __unkeyed-1 = "mode"; + separator = { + left = ""; + }; + padding = { + right = 2; + left = 0; + }; + } + ]; + lualine_b = ["filename" "branch"]; + lualine_c = ["%="]; + lualine_x = []; + lualine_y = ["filetype" "progress"]; + lualine_z = [ + { + __unkeyed-1 = "location"; + separator = { + right = ""; + }; + padding = { + right = 0; + left = 2; + }; + } + ]; + }; }; }; lsp-lines = { @@ -70,8 +72,8 @@ gopls.enable = true; jsonls.enable = true; pyright.enable = true; # In preference to attempting to use pylyzer - nil-ls.enable = true; - rust-analyzer = let + nil_ls.enable = true; + rust_analyzer = let fenix = fenix.latest.withComponents ["cargo" "rustc"]; in { enable = true; @@ -110,6 +112,26 @@ splitjoin.enable = true; surround.enable = true; tabline.enable = true; + clue = { + triggers = [ + { + mode = "n"; + keys = ""; + } + { + mode = "n"; + keys = "z"; + } + ]; + clues = [ + {__raw = "require('mini.clue').gen_clues.builtin_completion()";} + {__raw = "require('mini.clue').gen_clues.g()";} + {__raw = "require('mini.clue').gen_clues.marks()";} + {__raw = "require('mini.clue').gen_clues.registers()";} + {__raw = "require('mini.clue').gen_clues.windows()";} + {__raw = "require('mini.clue').gen_clues.z()";} + ]; + }; }; }; cmp = { @@ -178,7 +200,7 @@ project-nvim = { enable = true; enableTelescope = true; - detectionMethods = ["lsp" "pattern"]; + settings.detection_methods = ["lsp" "pattern"]; }; telescope = { enable = true; @@ -270,25 +292,10 @@ # }) # ''; # }; - # undotree = { - # enable = true; - # }; vim-bbye = { enable = true; }; - which-key = { - enable = true; - settings.spec = [ - { - __unkeyed-1 = "f"; - group = "Telescope - Find"; - } - { - __unkeyed-1 = "p"; - group = "Telescope - LSP"; - } - ]; - }; + web-devicons.enable = true; }; extraPlugins = ( @@ -312,12 +319,12 @@ telescope-egrepify-nvim ]); keymaps = [ - { - action = "vim.cmd.UndotreeToggle"; - key = "u"; - options.desc = "Toggle undotree"; - mode = "n"; - } + # { + # action = "vim.cmd.UndotreeToggle"; + # key = "u"; + # options.desc = "Toggle undotree"; + # mode = "n"; + # } { action = "function() vim.api.nvim_command('wincmd h') end"; key = "h"; @@ -344,13 +351,13 @@ } { key = ""; - action = "''"; - mode = "n"; + action = ""; + mode = ["n" "v"]; } { key = ""; - action = "''"; - mode = "n"; + action = ""; + mode = ["n" "v"]; } { key = "n"; @@ -359,21 +366,11 @@ mode = "n"; } { - action = "'Telescope'"; + action = "Telescope"; key = "t"; options.desc = "Open Telescope"; mode = "n"; } - { - action = "''"; - key = ""; - mode = "v"; - } - { - key = ""; - action = "''"; - mode = "v"; - } ]; }; }