Haskelling

4 files changed, 46 insertions, 27 deletions

diff --git a/.emacs.d/config.org b/.emacs.d/config.org
index 6133c35..796e32c 100644
--- a/.emacs.d/config.org
+++ b/.emacs.d/config.org
@@ -754,13 +754,13 @@ The Classic.
 
   (add-hook 'find-file-hook 'insert-header-guards)
 #+end_src
-*** D
+*** COMMENT D
 C Interop with a GC.
 #+begin_src emacs-lisp
     (use-package d-mode
       :hook (d-mode . lsp))
 #+end_src
-*** Go
+*** COMMENT Go
 A simple C-like language with a GC.
 #+begin_src emacs-lisp
   (use-package go-mode
@@ -780,7 +780,22 @@ A simple C-like language with a GC.
     :hook
     (go-mode . lsp))
 #+end_src
-*** LISP
+*** Haskell
+Functionally Scottish.
+#+begin_src emacs-lisp
+  (use-package haskell-mode
+    :config
+    (setenv "PATH" (concat (concat
+                            (concat (expand-file-name "~/.ghcup/bin") ":")
+                            (getenv "PATH"))))
+
+    (setq exec-path (append exec-path (list (expand-file-name "~/.ghcup/bin")))))
+
+  (use-package lsp-haskell
+    :hook
+    (haskell-mode . lsp))
+#+end_src
+*** COMMENT LISP
 Programming for Programmers.
 #+begin_src emacs-lisp
   ;; (use-package slime
@@ -803,7 +818,7 @@ Programming for Programmers.
   ;; (with-eval-after-load 'sly
   ;;  (load (expand-file-name "~/.roswell/helper.el")))
 #+end_src
-*** Lua
+*** COMMENT Lua
 A simple Python-like language with many implementations.
 #+begin_src emacs-lisp
   (straight-use-package
@@ -826,7 +841,7 @@ A simple Python-like language with many implementations.
   (add-hook 'lua-mode-hook 'lua-abbrev-mode-off)
   (setq save-abbrevs nil)   ;; is this still needed?
 #+end_src
-*** Vala
+*** COMMENT Vala
 An OOP Language for C & GLib interop.
 #+begin_src emacs-lisp
   (use-package vala-mode)
@@ -923,36 +938,36 @@ Use Icons from Nerd Font to add a little modern spice to Emacs.
 *** Set Font
 Set font for both Monospace and Proportional text.
 #+begin_src emacs-lisp
-  ;; (defvar fontconf
-  ;;     '((font . "Aporetic Sans Mono")
-  ;;       (size . 13)))
+  (defvar fontconf
+      '((font . "Aporetic Sans Mono")
+        (size . 13)))
 
-  ;;   (set-face-attribute 'variable-pitch nil
-  ;;           :font (cdr (assoc 'font fontconf))
-  ;;           :height (* (cdr (assoc 'size fontconf)) 10)
-  ;;           :weight 'regular)
+    (set-face-attribute 'variable-pitch nil
+            :font (cdr (assoc 'font fontconf))
+            :height (* (cdr (assoc 'size fontconf)) 10)
+            :weight 'regular)
 
-  ;;   (set-face-attribute 'fixed-pitch nil
-  ;;           :font (cdr (assoc 'font fontconf))
-  ;;           :height (* (cdr (assoc 'size fontconf)) 10)
-  ;;           :weight 'regular)
+    (set-face-attribute 'fixed-pitch nil
+            :font (cdr (assoc 'font fontconf))
+            :height (* (cdr (assoc 'size fontconf)) 10)
+            :weight 'regular)
 
-  ;;   (set-face-attribute 'default nil
-  ;;           :font (cdr (assoc 'font fontconf))
-  ;;           :height (* (cdr (assoc 'size fontconf)) 10)
-  ;;           :weight 'regular)
+    (set-face-attribute 'default nil
+            :font (cdr (assoc 'font fontconf))
+            :height (* (cdr (assoc 'size fontconf)) 10)
+            :weight 'regular)
 
 
-  ;;   (add-to-list 'default-frame-alist
-  ;;          `(font . ,(concat (cdr (assoc 'font fontconf)) "-" (number-to-string (cdr (assoc 'size fontconf))))))
+    (add-to-list 'default-frame-alist
+           `(font . ,(concat (cdr (assoc 'font fontconf)) "-" (number-to-string (cdr (assoc 'size fontconf))))))
 
-  ;;   (set-face-attribute 'font-lock-comment-face nil
-  ;;           :slant 'italic)
+    (set-face-attribute 'font-lock-comment-face nil
+            :slant 'italic)
 
-  ;;   (set-face-attribute 'font-lock-keyword-face nil
-  ;;           :slant 'italic)
+    (set-face-attribute 'font-lock-keyword-face nil
+            :slant 'italic)
 
-  (set-frame-font "-misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1" t t)
+  ;;(set-frame-font "-misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1" t t)
 #+end_src
 *** Ligatures
 Make ligature symbols out of common function symbols.
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index ff20d92..e11d303 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,3 +1,4 @@
+(setq vc-follow-symlinks t)
 (org-babel-load-file
  (expand-file-name
   "config.org"
diff --git a/.ghci b/.ghci
new file mode 100644
index 0000000..31f559e
--- /dev/null
+++ b/.ghci
@@ -0,0 +1 @@
+:set prompt "λ "
diff --git a/.zshrc b/.zshrc
index 32221d7..cf9fbf0 100644
--- a/.zshrc
+++ b/.zshrc
@@ -78,3 +78,5 @@ add-zsh-hook precmd set_prompt
 
 # plugins
 source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+[ -f "/home/venomade/.ghcup/env" ] && . "/home/venomade/.ghcup/env" # ghcup-env
\ No newline at end of file