diff --git a/flake.lock b/flake.lock index 1fa603d..42d6284 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1611737567, - "narHash": "sha256-r+Bol0hN5TFlX8cxF7Z6TQOE3EJSFHdDMr84Zm5ZVNs=", + "lastModified": 1611910458, + "narHash": "sha256-//j54S14v9lp3YKizS1WZW3WKwLjGTzvwhHfUAaRBPQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85abeab48b5feda4b163e5bb32f50aad1164e415", + "rev": "6e7f25001fe6874f7ae271891f709bbf50a22c45", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1611883201, - "narHash": "sha256-Hdii6rT+xdfgBLfURBVWRwhrjpDsFRkqLhqcAzSVr04=", + "lastModified": 1612059891, + "narHash": "sha256-ltJop0q6WH0S8st4ZQd7tOVlyDJSIei+CD7tJBbIJlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da8a3c3c2d183106756dace2d249906d81387b65", + "rev": "27da11972d3fd9353f81e94a6549e8a0da40f45d", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 439d09d..da2ced6 100644 --- a/home/default.nix +++ b/home/default.nix @@ -291,34 +291,34 @@ viAlias = true; vimAlias = true; - configure = { - customRC = builtins.readFile ./init.vim; - vam.knownPlugins = pkgs.vimPlugins; - vam.pluginDictionaries = [{ - names = [ - "coc-go" - "coc-json" - "coc-nvim" - "coc-rls" - "fzf-vim" - "fzfWrapper" - "gruvbox" - "nerdtree" - "rust-vim" - "syntastic" - "vim-commentary" - "vim-fugitive" - "vim-gitgutter" - "vim-go" - "vim-javacomplete2" - "vim-markdown" - "vim-nix" - "vim-repeat" - "vim-surround" - "vim-terraform" - ]; - }]; - }; + extraConfig = builtins.readFile ./init.vim; + + plugins = with pkgs.vimPlugins; [ + coc-go + coc-json + coc-nvim + coc-rls + fzf-vim + fzfWrapper + gruvbox + nerdtree + rust-vim + supertab + syntastic + vim-commentary + vim-fugitive + vim-gitgutter + vim-go + vim-javacomplete2 + vim-markdown + vim-nix + vim-repeat + vim-sneak + vim-surround + vim-terraform + vim-pandoc + vim-pandoc-syntax + ]; };