diff options
| -rw-r--r-- | dot_config/nvim/lua/plugins/lsp.lua | 1 | ||||
| -rw-r--r-- | justfile | 4 | ||||
| -rw-r--r-- | nix/common.nix | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/dot_config/nvim/lua/plugins/lsp.lua b/dot_config/nvim/lua/plugins/lsp.lua index 5039d04..98f0f66 100644 --- a/dot_config/nvim/lua/plugins/lsp.lua +++ b/dot_config/nvim/lua/plugins/lsp.lua @@ -21,7 +21,6 @@ vim.lsp.enable({ "cssls", "dockerls", "eslint", - "gh_actions_ls", "html", "jsonls", "lua_ls", @@ -30,6 +30,10 @@ nix-switch: echo "nix not installed; skipping home-manager switch" >&2 exit 0 fi + # home-manager's activation script references $USER unconditionally; + # just runs recipes with a sanitized env that may drop it. + export USER="${USER:-$(id -un)}" + export HOME="${HOME:-$(getent passwd "$USER" | cut -d: -f6)}" profile=host [ -f /etc/os-release ] && . /etc/os-release || true case "${ID:-}" in diff --git a/nix/common.nix b/nix/common.nix index 46fa369..55e2d21 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -145,7 +145,6 @@ in basedpyright bash-language-server dockerfile-language-server-nodejs - gh-actions-language-server just-lsp lua-language-server neocmakelsp |