From 7e1c5f4418a629d6f3bae954dd172ca81e476b3e Mon Sep 17 00:00:00 2001 From: Jon Santmyer Date: Fri, 26 Apr 2024 12:48:36 -0400 Subject: update laptop config --- modules/desktop/apps/editors/neovim.nix | 41 ++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) (limited to 'modules/desktop/apps/editors') diff --git a/modules/desktop/apps/editors/neovim.nix b/modules/desktop/apps/editors/neovim.nix index 77857a2..ee6424b 100644 --- a/modules/desktop/apps/editors/neovim.nix +++ b/modules/desktop/apps/editors/neovim.nix @@ -16,11 +16,6 @@ in { }; config = lib.mkIf (nvimConf.enable) { - - home.manager.xdg.configFile."nvim/init.vim".source = "${configDir}/nvim/init.vim"; - home.manager.xdg.configFile."nvim/lua/init.lua".source = "${configDir}/nvim/init.lua"; - home.manager.xdg.configFile."nvim/lua/plugins.lua".source = "${configDir}/nvim/plugins.lua"; - modules.desktop.defaultApplications.apps.editor = rec { package = pkgs.neovim; install = false; @@ -29,7 +24,11 @@ in { }; home.packages = [ - + pkgs.rnix-lsp + pkgs.ccls + pkgs.nodePackages.bash-language-server + pkgs.texlab + pkgs.sumneko-lua-language-server ]; home.manager.programs.neovim = { @@ -37,6 +36,36 @@ in { viAlias = true; vimAlias = true; withNodeJs = true; + + extraConfig = '' + luafile /etc/nixos/config/nvim/lua/settings.lua + luafile /etc/nixos/config/nvim/lua/lsp.lua + ''; + + plugins = with pkgs.vimPlugins; [ + nvim-web-devicons + gitsigns-nvim + nvim-tree-lua + catppuccin-nvim + + nvim-lspconfig + nvim-cmp + cmp-cmdline + cmp-nvim-lsp + cmp-buffer + cmp-path + cmp-vsnip + cmp-treesitter + + vim-nix + vim-vsnip + nvim-treesitter.withAllGrammars + neoformat + + bufferline-nvim + lualine-nvim + alpha-nvim + ]; }; }; } -- cgit v1.2.1