From 4708dee78ade55c326c26fc80ec02ee2c20f000b Mon Sep 17 00:00:00 2001 From: Till Date: Sat, 13 May 2023 17:11:36 +0200 Subject: [PATCH] lsp completion? --- home/default.nix | 1 + home/nvim/config.vim | 1 + home/nvim/default.nix | 34 +++++++++++++++++++++++++++++++--- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/home/default.nix b/home/default.nix index 2d942ef..cf1ddd8 100644 --- a/home/default.nix +++ b/home/default.nix @@ -30,6 +30,7 @@ tmux tree vdirsyncer + tdesktop ]; imports = [ diff --git a/home/nvim/config.vim b/home/nvim/config.vim index 9f8aafa..7d3dac7 100644 --- a/home/nvim/config.vim +++ b/home/nvim/config.vim @@ -17,6 +17,7 @@ set signcolumn=no set smartcase set softtabstop=2 set spelllang=en_us,de_20 +set spellfile=~/.local/share/nvim/site/spell/till.utf-8.add set splitbelow set splitright set tabstop=2 diff --git a/home/nvim/default.nix b/home/nvim/default.nix index 043dec6..489046b 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -5,13 +5,39 @@ extraConfig = builtins.readFile ./config.vim; enable = true; defaultEditor = true; - plugins = with pkgs.vimPlugins; [ + plugins = with pkgs.vimPlugins; + let + woof = pkgs.vimUtils.buildVimPlugin { + name = "woof.vim"; + src = builtins.fetchGit { + url = "ssh://git@ktiu.net/home/git/woof.vim/"; + ref = "main"; + rev = "2857f151fba9dc77842a8bae23005a47f1e0ac51"; + }; + }; + in [ # todo: SNIPPETS pandoc, completion, lsp { - plugin = fzf-vim; + plugin = woof; config = '' let maplocalleader="\\" let mapleader=" " + ''; + } + + cmp-nvim-lsp + cmp-buffer + cmp-path + cmp-cmdline + cmp-nvim-ultisnips + nvim-cmp + { + plugin: nvim-lspconfig; + config = builtins.readfile ./lsp.vim + } + { + plugin = fzf-vim; + config = '' nnoremap :Buffers imap (fzf-complete-path) nnoremap o :Files @@ -63,7 +89,9 @@ { plugin = ultisnips; - config = "nnoremap se :UltiSnipsEdit!"; + config = '' + nnoremap se :UltiSnipsEdit! + ''; } vim-commentary