From 46d03f9b135b795fa7342f495947ca39c98bc862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <es.ensar@gmail.com>
Date: Mon, 18 Oct 2021 09:26:17 +0200
Subject: [PATCH] Make haskell language servers part of PATH

---
 symlinks/bin/lspinstall                  |  1 +
 symlinks/config/fish/conf.d/haskell.fish |  1 +
 symlinks/config/nvim/lua/lsp/servers.lua | 10 +---------
 3 files changed, 3 insertions(+), 9 deletions(-)
 create mode 100644 symlinks/config/fish/conf.d/haskell.fish

diff --git a/symlinks/bin/lspinstall b/symlinks/bin/lspinstall
index 0cb2d72..81bde8c 100755
--- a/symlinks/bin/lspinstall
+++ b/symlinks/bin/lspinstall
@@ -49,5 +49,6 @@ case $SERVER in
 		wget -O - https://github.com/haskell/haskell-language-server/releases/download/$VERSION/$FILE_NAME > /tmp/hls.tar.gz
 		mkdir -p $HOME/lsp/haskell/hls
 		tar -xf /tmp/hls.tar.gz -C $HOME/lsp/haskell/hls
+		chmod +x $HOME/lsp/haskell/hls/*
 		;;
 esac
diff --git a/symlinks/config/fish/conf.d/haskell.fish b/symlinks/config/fish/conf.d/haskell.fish
new file mode 100644
index 0000000..2a92cb2
--- /dev/null
+++ b/symlinks/config/fish/conf.d/haskell.fish
@@ -0,0 +1 @@
+set -gx PATH $PATH $HOME/lsp/haskell/hls
diff --git a/symlinks/config/nvim/lua/lsp/servers.lua b/symlinks/config/nvim/lua/lsp/servers.lua
index 40ac75e..7833d6b 100644
--- a/symlinks/config/nvim/lua/lsp/servers.lua
+++ b/symlinks/config/nvim/lua/lsp/servers.lua
@@ -8,7 +8,7 @@ local common_config = require("lsp.server_config")
 local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
 
 -- Lsp default language servers
-local servers = { "bashls", "clangd", "cucumber_language_server", "crystalline", "dockerls", "jsonls", "pyright", "rust_analyzer", "kotlin_language_server", "mint", "vimls", "clojure_lsp", "gopls", "gdscript", "terraformls", "tsserver" }
+local servers = { "bashls", "clangd", "cucumber_language_server", "crystalline", "dockerls", "jsonls", "hls", "pyright", "rust_analyzer", "kotlin_language_server", "mint", "vimls", "clojure_lsp", "gopls", "gdscript", "terraformls", "tsserver" }
 for _, lsp in ipairs(servers) do
 	lspconfig[lsp].setup { 
 		on_attach = common_config.on_attach,
@@ -42,14 +42,6 @@ lspconfig.omnisharp.setup {
 	capabilities = capabilities
 }
 
--- Haskell LS
-local hls_bin = vim.fn.glob('$HOME') .. "/lsp/haskell/hls/haskell-language-server-wrapper"
-lspconfig.hls.setup {
-	cmd = { hls_bin, "--lsp" };
-	on_attach = common_config.on_attach;
-	capabilities = capabilities
-}
-
 -- Leminx (XML Language server)
 lspconfig.lemminx.setup {
 	cmd = { "lemminx" };