diff options
| -rw-r--r-- | common/home/default.nix | 1 | ||||
| -rw-r--r-- | common/home/programs/nixvim/default.nix | 167 |
2 files changed, 87 insertions, 81 deletions
diff --git a/common/home/default.nix b/common/home/default.nix index 404bddb..5bb39b7 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -38,6 +38,7 @@ packages = [ pkgs.bat pkgs.blender pkgs.pinentry-qt + pkgs.ripgrep ]; in { diff --git a/common/home/programs/nixvim/default.nix b/common/home/programs/nixvim/default.nix index 05a27c5..0f2852d 100644 --- a/common/home/programs/nixvim/default.nix +++ b/common/home/programs/nixvim/default.nix @@ -1,96 +1,101 @@ { pkgs, ... }: { - enable = true; - defaultEditor = true; + enable = true; + defaultEditor = true; - enableMan = true; + enableMan = true; - package = pkgs.unstable.neovim-unwrapped; + package = pkgs.unstable.neovim-unwrapped; - extraConfigLua = '' - local signs = { - Error = " ", - Warn = " ", - Hint = " ", - Info = " " - } + extraConfigLua = '' + local signs = { + Error = " ", + Warn = " ", + Hint = " ", + Info = " " + } - for type, icon in pairs(signs) do - local hl = "DiagnosticSign" .. type - vim.fn.sign_define( - hl, - { - text = icon, - texthl = hl, - numhl = hl - } - ) - end + for type, icon in pairs(signs) do + local hl = "DiagnosticSign" .. type + vim.fn.sign_define( + hl, + { + text = icon, + texthl = hl, + numhl = hl + } + ) + end - vim.g.zig_fmt_autosave = 0 - ''; + vim.g.zig_fmt_autosave = 0 + ''; - diagnostics = { - virtual_text = { - prefix = ""; - }; - }; + diagnostics = { + virtual_text = { + prefix = ""; + }; + }; - opts = { - mouse = "a"; - number = true; - softtabstop = 0; - expandtab = false; - tabstop = 2; - shiftwidth = 2; - smartindent = true; - list = true; - listchars = { - tab = "> "; - eol = "¬"; - trail = "·"; - nbsp = "•"; - }; - splitright = true; - splitbelow = true; - showcmd = true; - wildmenu = true; - hlsearch = true; - autoread = true; - swapfile = false; - }; + opts = { + mouse = "a"; + number = true; + softtabstop = 0; + expandtab = false; + tabstop = 2; + shiftwidth = 2; + smartindent = true; + list = true; + listchars = { + tab = "> "; + eol = "¬"; + trail = "·"; + nbsp = "•"; + }; + splitright = true; + splitbelow = true; + showcmd = true; + wildmenu = true; + hlsearch = true; + autoread = true; + swapfile = false; + }; - clipboard = { - register = "unnamedplus"; - providers.wl-copy.enable = true; - }; + clipboard = { + register = "unnamedplus"; + providers.wl-copy.enable = true; + }; - colorschemes.base16 = { - enable = true; - colorscheme = "gruvbox-dark-pale"; - }; + colorschemes.base16 = { + enable = true; + colorscheme = "gruvbox-dark-pale"; + }; - plugins = import ./plugins/default.nix { inherit pkgs; }; + plugins = import ./plugins/default.nix { inherit pkgs; }; - globals = { - mapleader = ","; - }; + globals = { + mapleader = ","; + }; - keymaps = [ - { - key = "<leader>tf"; - action = "<cmd>NvimTreeToggle<cr>"; - mode = "n"; - } - { - key = "<leader>f"; - action = "<cmd>lua require('telescope.builtin').find_files()<cr>"; - mode = "n"; - } - { - key = "<space>d"; - action = "<cmd>lua vim.diagnostic.open_float()<cr>"; - mode = "n"; - } - ]; + keymaps = [ + { + key = "<leader>tf"; + action = "<cmd>NvimTreeToggle<cr>"; + mode = "n"; + } + { + key = "<leader>f"; + action = "<cmd>lua require('telescope.builtin').find_files()<cr>"; + mode = "n"; + } + { + key = "<leader>g"; + action = "<cmd>lua require('telescope.builtin').live_grep()<cr>"; + mode = "n"; + } + { + key = "<space>d"; + action = "<cmd>lua vim.diagnostic.open_float()<cr>"; + mode = "n"; + } + ]; } |