From ddf526713d0f82f001d8d59c5af8876d0c1753fe Mon Sep 17 00:00:00 2001 From: Stefan Weigl-Bosker Date: Thu, 10 Apr 2025 03:04:54 -0400 Subject: update --- modules/neovim/default.nix | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'modules/neovim/default.nix') diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index e09866d..14665dd 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -22,12 +22,21 @@ in programs.neovim = { enable = true; defaultEditor = true; - viAlias = true; - vimAlias = true; + viAlias = false; + vimAlias = false; vimdiffAlias = true; plugins = with pkgs.vimPlugins; [ + nvim-treesitter (nvim-treesitter.withPlugins (p: with p; [ tree-sitter-nix + tree-sitter-make + tree-sitter-verilog + tree-sitter-scheme + tree-sitter-llvm + tree-sitter-html + tree-sitter-glsl + tree-sitter-devicetree + tree-sitter-cuda tree-sitter-c tree-sitter-cpp tree-sitter-lua @@ -55,13 +64,17 @@ in # extraLuaPackages = ps: with ps; [ # ]; extraLuaConfig = '' - vim.cmd[[colorscheme ${scheme.name}]] - ${builtins.readFile ./nvim/init.lua} - vim.cmd[[${scheme.extraVimConfig}]] vim.cmd[[ - hi StatusLineNC guibg=none guifg=#4c4c4c - hi StatusLine guibg=none guifg=#8f8aac + colorscheme ${scheme.name} + hi PmenuSel guifg=${scheme.base05} guibg=${scheme.base03} + hi StatusLine guibg=fg guifg=bg cterm=reverse gui=bold + hi FloatBorder guifg=${scheme.base01} + hi WinSeparator guifg=${scheme.base01} + hi WinBar guifg=${scheme.base03} ]] + + ${builtins.readFile ./nvim/init.lua} + vim.cmd[[${scheme.extraVimConfig}]] ''; }; }; -- cgit v1.2.3