From dd829bbad56e53a35d86e8e43165a92268339929 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 29 Oct 2020 20:15:18 +0100 Subject: neovim: configure smart completion --- user/settings/base.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'user/settings') diff --git a/user/settings/base.nix b/user/settings/base.nix index b5031dc7..823aa5f3 100644 --- a/user/settings/base.nix +++ b/user/settings/base.nix @@ -9,20 +9,22 @@ programs.neovim = { enable = true; vimAlias = true; + vimdiffAlias = true; + package = pkgs.unstable.neovim-unwrapped; configure = { - customRC = '' - set autoindent - - set background=light - set shiftwidth=2 - set tabstop=2 - set noexpandtab - set relativenumber - set smartcase - ''; - packages.myVimPackage = with pkgs.vimPlugins; { + customRC = builtins.readFile ../nvim/init.vim; + packages.myVimPackage = with pkgs.unstable.vimPlugins; { start = [ commentary + coc-css + coc-eslint + coc-git + coc-html + coc-json + coc-nvim + coc-prettier + coc-tabnine + coc-yaml vim-surround vim-nix ]; @@ -30,6 +32,7 @@ }; }; }; + xdg.configFile."nvim/coc-settings.json".source = ../nvim/coc-settings.json; home.sessionVariables = { EMAIL = "alan@alanpearce.eu"; XDG_CACHE_HOME = if pkgs.stdenv.isDarwin then "$HOME/Library/Caches/XDG" else "$HOME/.cache"; -- cgit 1.4.1