From 17988ec069d8667d25dad486c2ee804874e993c4 Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Tue, 21 Feb 2023 18:17:56 +0000 Subject: [PATCH] vim: add nvim-go, update nixpkgs --- flake.lock | 6 +++--- home/vim-dev/default.nix | 13 ++----------- home/vim-dev/dev.lua | 3 +++ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 78044b6..2a0bd07 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672844754, - "narHash": "sha256-o26WabuHABQsaHxxmIrR3AQRqDFUEdLckLXkVCpIjSU=", + "lastModified": 1676998680, + "narHash": "sha256-61gxdL3bqHWnRSiYq+sKWbSX6tuwaRnYfPvhpRK011s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9ade2c8240e00a4784fac282a502efff2786bdc", + "rev": "a3d745e701c337e65ef467d5a9400d9336a303a1", "type": "github" }, "original": { diff --git a/home/vim-dev/default.nix b/home/vim-dev/default.nix index 70b5189..73afba8 100644 --- a/home/vim-dev/default.nix +++ b/home/vim-dev/default.nix @@ -3,17 +3,7 @@ lib, system, ... -}: let - vim-vue-plugin = pkgs.vimUtils.buildVimPlugin { - name = "vim-vue-plugin"; - src = pkgs.fetchFromGitHub { - owner = "leafOfTree"; - repo = "vim-vue-plugin"; - rev = "b2bb4dd8f6d97909c48bc33937177d4068921a10"; - sha256 = "eBfMxt5AaSCHzU7PFp7eWZhGY8l3EqeMLrU0ntB6eLA="; - }; - }; -in { +}: { programs.neovim.plugins = with pkgs.vimPlugins; [ # More fancy shit @@ -24,6 +14,7 @@ in { nvim-cmp cmp-nvim-lsp # Language specific + go-nvim rust-vim vim-terraform vim-protobuf diff --git a/home/vim-dev/dev.lua b/home/vim-dev/dev.lua index 0ff652e..6422b7a 100644 --- a/home/vim-dev/dev.lua +++ b/home/vim-dev/dev.lua @@ -97,6 +97,9 @@ require'lspconfig'.tsserver.setup{ } ]]-- +-- Other language plugins +require('go').setup() + -- Diags with Trouble require('trouble').setup { icons = false,