diff --git a/shared/home/default.nix b/shared/home/default.nix index 4acdc10..c9e90d3 100644 --- a/shared/home/default.nix +++ b/shared/home/default.nix @@ -150,7 +150,6 @@ in { (lib.mkIf devTools [ pkgs.pkgs-unstable.vimPlugins.vim-go pkgs.vimPlugins.zig-vim - pkgs.vimPlugins.nvim-lspconfig ]) ]; extraConfig = builtins.readFile ./vimrc; diff --git a/shared/home/dev.lua b/shared/home/dev.lua index 5eab857..eab64d0 100644 --- a/shared/home/dev.lua +++ b/shared/home/dev.lua @@ -2,15 +2,3 @@ vim.api.nvim_exec([[ set grepprg=@ripgrep@/bin/rg\ --vimgrep grepformat^=%f:%l:%c:%m "au FileType go let g:go_fmt_command = "@gotools@/bin/goimports" ]], false) - - --- trying https://github.com/neovim/nvim-lspconfig/issues/888 -local lspconfig = require("lspconfig") -lspconfig.gopls.setup({ - cmd = {"@gopls@/bin/gopls"}, - settings = { - gopls = { - buildFlags = {"-tags=integration"}, - }, - }, -}) diff --git a/shared/work/default.nix b/shared/work/default.nix index 620d41a..8f12378 100644 --- a/shared/work/default.nix +++ b/shared/work/default.nix @@ -61,6 +61,7 @@ home-manager.users.${config.mj.username} = { home.sessionVariables = { + GOFLAGS = "-tags=cluster_integration"; GOPRIVATE = "github.com/chronosphereio"; BUILDKIT_COLORS = "run=123,20,245:error=yellow:cancel=blue:warning=white"; };