diff --git a/home-manager/default.nix b/home-manager/default.nix index d45848f..2ad135b 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -93,6 +93,9 @@ in htop xdg-utils + # for coc + nodejs + ] ++ lib.optionals (config.networking.hostName == "jimbo") [ # Stuff only needed for work networkmanager diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix index f91c967..2826c03 100644 --- a/home-manager/modules/neovim.nix +++ b/home-manager/modules/neovim.nix @@ -1,10 +1,13 @@ { pkgs, ... }: { programs.neovim = { enable = true; - coc = { - enable = true; - }; withPython3 = true; + extraPackages = with pkgs; [ + (python3.withPackages (ps: with ps; [ + black + flake8 + ])) + ]; vimAlias = true; plugins = with pkgs.vimPlugins; [ @@ -29,16 +32,16 @@ # git diff icons on the left sidebar vim-gitgutter - # One languagepack to rule them all - vim-polyglot - # blockcomments tcomment_vim - # Go plugin from fatih - vim-go + # Coc language server support + coc-nvim + coc-go + coc-python ]; extraConfig = '' + set nocompatible set mouse=a set termguicolors set background=dark @@ -79,20 +82,6 @@ set undoreload=1000 endif - " Diasble polyglot for languages with their own plugin - let g:polyglot_disabled = ["go"] - - " vim-go - au FileType go nmap r (go-run) - au FileType go nmap b (go-build) - au FileType go nmap t (go-test) - let g:go_highlight_functions = 1 - let g:go_highlight_methods = 1 - let g:go_highlight_fields = 1 - let g:go_highlight_types = 1 - let g:go_highlight_operators = 1 - let g:go_highlight_build_constraints = 1 - lua << EOF require("bufferline").setup{} require("nvim-tree").setup{}