diff --git a/home/modules/nvf.nix b/home/modules/nvf.nix index 69b6331..9fdee4b 100644 --- a/home/modules/nvf.nix +++ b/home/modules/nvf.nix @@ -9,185 +9,184 @@ programs.nvf = { enable = true; enableManpages = true; - - lsp = { + + lsp = { + enable = true; + null-ls.enable = true; + formatOnSave = true; + lspkind.enable = true; + lightbulb.enable = true; + lspsaga.enable = true; + trouble.enable = true; + nvim-docs-view.enable = true; + harper-ls.enable = true; + }; + + debugger = { + nvim-dap = { enable = true; - null-ls.enable = true; - formatOnSave = true; - lspkind.enable = true; - lightbulb.enable = true; - lspsaga.enable = true; - trouble.enable = true; - nvim-docs-view.enable = true; - harper-ls.enable = true; + ui.enable = true; }; - - debugger = { - nvim-dap = { + }; + + options = { + tabstop = 2; + autoindent = true; + shiftwidth = 2; + number = true; + relativenumber = true; + }; + + clipboard = { + enable = true; + registers = "unnamedplus"; + providers = { + xclip = { enable = true; - ui.enable = true; + package = pkgs.xclip; }; }; - - options = { - tabstop = 2; - autoindent = true; - shiftwidth = 2; - number = true; - relativenumber = true; - }; - - clipboard = { + }; + + languages = { + enableFormat = true; + enableTreesitter = false; + enableExtraDiagnostics = true; + nix.enable = true; + markdown.enable = true; + bash.enable = true; + nu.enable = true; + css.enable = true; + html = { enable = true; - registers = "unnamedplus"; - providers = { - xclip = { - enable = true; - package = pkgs.xclip; - }; - }; + lsp.servers = [ + "emmet-ls" + "superhtml" + ]; }; - - languages = { - enableFormat = true; - enableTreesitter = false; - enableExtraDiagnostics = true; - nix.enable = true; - markdown.enable = true; - bash.enable = true; - nu.enable = true; - css.enable = true; - html = { - enable = true; - lsp.servers = [ - "emmet-ls" - "superhtml" - ]; - }; - python.enable = true; - rust = { - enable = true; - extensions.crates-nvim.enable = true; - }; - }; - - visuals = { - nvim-web-devicons.enable = true; - nvim-cursorline.enable = true; - cinnamon-nvim.enable = true; - fidget-nvim.enable = true; - highlight-undo.enable = true; - indent-blankline.enable = false; # DISABLED - uses treesitter - }; - - statusline = { - lualine = { - enable = true; - theme = "catppuccin"; - }; - }; - - tabline = { - nvimBufferline.enable = true; - }; - - theme = { + python.enable = true; + rust = { enable = true; - name = "catppuccin"; - style = "mocha"; - transparent = true; + extensions.crates-nvim.enable = true; }; - - autopairs.nvim-autopairs.enable = false; # DISABLED - can use treesitter - snippets.luasnip.enable = true; - telescope.enable = true; - - autocomplete = { - nvim-cmp = { - enable = true; - mappings = { - complete = ""; - confirm = ""; - next = ""; - previous = ""; - close = ""; - scrollDocsUp = ""; - scrollDocsDown = ""; - }; - sources = { - nvim-lsp = "[LSP]"; - luasnip = "[Snippet]"; - buffer = "[Buffer]"; - path = "[Path]"; - crates = "[Crates]"; - }; - }; - }; - - binds = { - whichKey.enable = true; - cheatsheet.enable = true; - }; - - git = { + }; + + visuals = { + nvim-web-devicons.enable = true; + nvim-cursorline.enable = true; + cinnamon-nvim.enable = true; + fidget-nvim.enable = true; + highlight-undo.enable = true; + indent-blankline.enable = false; # DISABLED - uses treesitter + }; + + statusline = { + lualine = { enable = true; - gitsigns.enable = true; - gitsigns.codeActions.enable = false; - neogit.enable = true; + theme = "catppuccin"; }; - - dashboard = { - alpha.enable = true; - }; - - notify = { - nvim-notify.enable = true; - }; - - projects = { - project-nvim.enable = true; - }; - - comments.comment-nvim.enable = true; - - filetree = { - neo-tree.enable = true; - }; - - terminal = { - toggleterm.enable = true; - }; - - utility = { - ccc.enable = true; - diffview-nvim.enable = true; - icon-picker.enable = true; - surround.enable = true; - multicursors.enable = true; - undotree.enable = true; - motion = { - hop.enable = false; - leap.enable = true; - precognition.enable = true; + }; + + tabline = { + nvimBufferline.enable = true; + }; + + theme = { + enable = true; + name = "catppuccin"; + style = "mocha"; + transparent = true; + }; + + autopairs.nvim-autopairs.enable = false; # DISABLED - can use treesitter + snippets.luasnip.enable = true; + telescope.enable = true; + + autocomplete = { + nvim-cmp = { + enable = true; + mappings = { + complete = ""; + confirm = ""; + next = ""; + previous = ""; + close = ""; + scrollDocsUp = ""; + scrollDocsDown = ""; }; - images = { - img-clip.enable = true; + sources = { + nvim-lsp = "[LSP]"; + luasnip = "[Snippet]"; + buffer = "[Buffer]"; + path = "[Path]"; + crates = "[Crates]"; }; }; - - ui = { - borders.enable = true; - colorizer.enable = true; - illuminate.enable = false; # DISABLED - uses treesitter - breadcrumbs = { - enable = false; # DISABLED - uses treesitter - navbuddy.enable = false; # DISABLED - uses treesitter - }; - smartcolumn = { - enable = true; - }; - fastaction.enable = true; + }; + + binds = { + whichKey.enable = true; + cheatsheet.enable = true; + }; + + git = { + enable = true; + gitsigns.enable = true; + gitsigns.codeActions.enable = false; + neogit.enable = true; + }; + + dashboard = { + alpha.enable = true; + }; + + notify = { + nvim-notify.enable = true; + }; + + projects = { + project-nvim.enable = true; + }; + + comments.comment-nvim.enable = true; + + filetree = { + neo-tree.enable = true; + }; + + terminal = { + toggleterm.enable = true; + }; + + utility = { + ccc.enable = true; + diffview-nvim.enable = true; + icon-picker.enable = true; + surround.enable = true; + multicursors.enable = true; + undotree.enable = true; + motion = { + hop.enable = false; + leap.enable = true; + precognition.enable = true; }; + images = { + img-clip.enable = true; + }; + }; + + ui = { + borders.enable = true; + colorizer.enable = true; + illuminate.enable = false; # DISABLED - uses treesitter + breadcrumbs = { + enable = false; # DISABLED - uses treesitter + navbuddy.enable = false; # DISABLED - uses treesitter + }; + smartcolumn = { + enable = true; + }; + fastaction.enable = true; }; }; }