From f89306dc0ed05fc56de2cfcaecab4558c82ff122 Mon Sep 17 00:00:00 2001
From: Brian Picciano <me@mediocregopher.com>
Date: Mon, 7 Oct 2024 12:27:32 +0200
Subject: Don't include gopls with nvim

---
 nvim/default.nix | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/nvim/default.nix b/nvim/default.nix
index 4e108f0..a1a2aa6 100644
--- a/nvim/default.nix
+++ b/nvim/default.nix
@@ -2,29 +2,6 @@
 
   pkgs = (import ../pkgs.nix).stable {};
 
-  gopls = pkgs.buildGoModule rec {
-    pname = "gopls";
-    version = "0.16.2";
-
-    src = "${pkgs.fetchFromGitHub {
-      owner = "golang";
-      repo = "tools";
-      rev = "gopls/v${version}";
-      sha256 = "sha256-amy00VMUcmyjDoZ4d9/+YswfcZ+1/cGvFsA4sAmc1dA=";
-    }}/gopls";
-
-    subPackages = ["."];
-    vendorHash = "sha256-ta94xPboFtSxFeuMtPX76XiC1O7osNl4oLk64wIyyz4=";
-    doCheck = false;
-  };
-
-  env = pkgs.buildEnv {
-    name = "nvim-env";
-    paths = [
-      gopls
-    ];
-  };
-
   init = pkgs.writeText "nvim-init.lua" ''
     vim.cmd('source ${pkgs.vimPlugins.vim-plug}/plug.vim')
 
@@ -47,9 +24,7 @@
     ${builtins.readFile ./init.lua}
   '';
 
-  nvim = pkgs.writeScriptBin "nvim" ''
-    #!${pkgs.bash}/bin/bash
-    export PATH=${env}/bin:$PATH
+  nvim = pkgs.writeShellScriptBin "nvim" ''
     exec ${pkgs.neovim}/bin/nvim -u ${init} "$@"
   '';
 }
-- 
cgit v1.2.3