diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/desktop/apps/editors/neovim.nix | 20 | ||||
| -rw-r--r-- | modules/options.nix | 2 |
2 files changed, 19 insertions, 3 deletions
diff --git a/modules/desktop/apps/editors/neovim.nix b/modules/desktop/apps/editors/neovim.nix index e3bb02e..e719565 100644 --- a/modules/desktop/apps/editors/neovim.nix +++ b/modules/desktop/apps/editors/neovim.nix @@ -26,6 +26,7 @@ in { pkgs.texlab pkgs.zls pkgs.wgsl-analyzer + pkgs.clang-tools ]; home.manager.programs.neovim = { @@ -50,7 +51,7 @@ in { "nix.serverPath" = "nil"; "zig.enabled" = true; - "zig.path" = "${pkgs.zls}/bin/zls"; + "zig.path" = "zls"; "languageserver" = { "wgsl" = { @@ -72,9 +73,24 @@ in { plenary-nvim telescope-nvim wgsl-vim + zig-vim nvim-lspconfig - nvim-treesitter nvim-treesitter.withAllGrammars + { + plugin = nvim-treesitter.withAllGrammars; + type = "lua"; + config = '' + require('nvim-treesitter.config').setup { + highlight = { enable = true }, + indent = { enable = true }, + } + vim.api.nvim_create_autocmd('FileType', { + pattern = { 'c', 'h', 'lua', 'nix', 'mk', 'zig' }, + callback = function() vim.treesitter.start() end, + }) + vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" + ''; + } coc-clangd coc-rust-analyzer diff --git a/modules/options.nix b/modules/options.nix index 04566eb..6c8af13 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -89,7 +89,7 @@ home = "/home/${name}"; isNormalUser = true; group = "users"; - extraGroups = ["wheel"]; + extraGroups = ["wheel" "docker"]; uid = 1000; }; |