From f88babd70b02618f842006fd3c2dc09a4ec19f2a Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Fri, 16 Feb 2024 23:57:00 +0900
Subject: [PATCH] use ghcup

---
 .emacs.d/bin/cabal                           | 1 +
 .emacs.d/bin/ghc                             | 1 +
 .emacs.d/bin/haskell-language-server         | 3 ---
 .emacs.d/bin/haskell-language-server-wrapper | 4 +---
 .emacs.d/bin/stack                           | 1 +
 .emacs.d/el-get.lock                         | 2 +-
 .emacs.d/init.el                             | 2 ++
 .zsh/.zshrc                                  | 2 ++
 8 files changed, 9 insertions(+), 7 deletions(-)
 create mode 120000 .emacs.d/bin/cabal
 create mode 120000 .emacs.d/bin/ghc
 delete mode 100755 .emacs.d/bin/haskell-language-server
 mode change 100755 => 120000 .emacs.d/bin/haskell-language-server-wrapper
 create mode 120000 .emacs.d/bin/stack

diff --git a/.emacs.d/bin/cabal b/.emacs.d/bin/cabal
new file mode 120000
index 00000000..10998b12
--- /dev/null
+++ b/.emacs.d/bin/cabal
@@ -0,0 +1 @@
+/home/nanasess/.ghcup/bin/cabal
\ No newline at end of file
diff --git a/.emacs.d/bin/ghc b/.emacs.d/bin/ghc
new file mode 120000
index 00000000..3bff459b
--- /dev/null
+++ b/.emacs.d/bin/ghc
@@ -0,0 +1 @@
+/home/nanasess/.ghcup/bin/ghc
\ No newline at end of file
diff --git a/.emacs.d/bin/haskell-language-server b/.emacs.d/bin/haskell-language-server
deleted file mode 100755
index f66a5ddb..00000000
--- a/.emacs.d/bin/haskell-language-server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-## see https://github.com/haskell/haskell-language-server#visual-studio-code
-~/Library/Application\ Support/Code/User/globalStorage/haskell.haskell/haskell-language-server-1.2.0-darwin-8.10.4 "$@"
diff --git a/.emacs.d/bin/haskell-language-server-wrapper b/.emacs.d/bin/haskell-language-server-wrapper
deleted file mode 100755
index 949ce1ae..00000000
--- a/.emacs.d/bin/haskell-language-server-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-## see https://github.com/haskell/haskell-language-server#visual-studio-code
-~/Library/Application\ Support/Code/User/globalStorage/haskell.haskell/haskell-language-server-wrapper-1.2.0-darwin "$@"
diff --git a/.emacs.d/bin/haskell-language-server-wrapper b/.emacs.d/bin/haskell-language-server-wrapper
new file mode 120000
index 00000000..595be698
--- /dev/null
+++ b/.emacs.d/bin/haskell-language-server-wrapper
@@ -0,0 +1 @@
+/home/nanasess/.ghcup/bin/haskell-language-server-wrapper
\ No newline at end of file
diff --git a/.emacs.d/bin/stack b/.emacs.d/bin/stack
new file mode 120000
index 00000000..5c672c2d
--- /dev/null
+++ b/.emacs.d/bin/stack
@@ -0,0 +1 @@
+/home/nanasess/.ghcup/bin/stack
\ No newline at end of file
diff --git a/.emacs.d/el-get.lock b/.emacs.d/el-get.lock
index 24569142..27cf94bb 100644
--- a/.emacs.d/el-get.lock
+++ b/.emacs.d/el-get.lock
@@ -58,7 +58,7 @@
         (mew :checksum "97e21004fedf303b74f42aacd7f33a1820ea9ad7")
         (dockerfile-mode :checksum "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c")
         (lsp-haskell :checksum "485c1148ce4d27030bb95b21c7289809294e7d31")
-        (haskell-mode :checksum "20d4e2300302a9af673e82d0185d3f489bfb0f59")
+        (haskell-mode :checksum "43b4036bf02b02de75643a1a2a31e28efac1c50b")
         (csharp-mode :checksum "02c61c219b2c22491eff9b7315fed661fab423d4")
         (csv-mode :checksum "db8a3e3aef31d35ce5bd1fd09127a3bbfdd0c340")
         (groovy-mode :checksum "c612ac1e9f742856914ad6e8eb9e9dc169f489ab")
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index d1835f33..b14e21f1 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -82,6 +82,8 @@
 (dolist (dir (list "/sbin" "/usr/sbin" "/bin" "/usr/bin" "/usr/local/bin"
                    "/opt/local/sbin" "/opt/local/bin" "/usr/gnu/bin"
                    ;; (expand-file-name "~/Applications/Emacs.app/Contents/Resources/bin")
+                   (expand-file-name "~/.ghcup/bin")
+                   (expand-file-name "~/.cabal/bin")
                    (expand-file-name "~/bin")
                    (expand-file-name "~/.emacs.d/bin")
                    (expand-file-name "~/.emacs.d/el-get/mew/bin")
diff --git a/.zsh/.zshrc b/.zsh/.zshrc
index 3e2cab32..770cb4f3 100644
--- a/.zsh/.zshrc
+++ b/.zsh/.zshrc
@@ -69,3 +69,5 @@ fi
 # if [[ ! -n $TMUX ]]; then
 #     tmux new-session
 # fi
+
+[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env