From 8f9f09006da3d04bcb0cd874691467f48b15a7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <es.ensar@gmail.com>
Date: Sat, 16 Oct 2021 18:14:04 +0200
Subject: [PATCH] Use ghcup instead of asdf for haskell

---
 symlinks/config/fish/config.fish         |  1 +
 symlinks/config/nvim/lua/lsp/servers.lua | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/symlinks/config/fish/config.fish b/symlinks/config/fish/config.fish
index 4a797be..bf9a462 100644
--- a/symlinks/config/fish/config.fish
+++ b/symlinks/config/fish/config.fish
@@ -42,3 +42,4 @@ eval (asdf exec direnv hook fish | source)
 function direnv
 	asdf exec direnv "$argv"
 end
+set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; set -gx PATH $HOME/.cabal/bin $PATH /home/ensar/.ghcup/bin # ghcup-env
diff --git a/symlinks/config/nvim/lua/lsp/servers.lua b/symlinks/config/nvim/lua/lsp/servers.lua
index 40ac75e..8a182bb 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", "hls", "jsonls", "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" };