diff --git a/.config/emacs/init.org b/.config/emacs/init.org index 642f63a..4e7e40c 100644 --- a/.config/emacs/init.org +++ b/.config/emacs/init.org @@ -1041,6 +1041,7 @@ targets." (ocaml . t) (python . t) (C . t) + (haskell . t) (rust . t) (shell . t))) @@ -1049,6 +1050,7 @@ targets." (add-to-list 'org-structure-template-alist '("ml" . "src ocaml")) (add-to-list 'org-structure-template-alist '("rs" . "src rust")) (add-to-list 'org-structure-template-alist '("py" . "src python")) + (add-to-list 'org-structure-template-alist '("hs" . "src haskell")) (setq org-edit-src-content-indentation 0)) (with-eval-after-load 'org (joe/org-init)) @@ -1334,8 +1336,10 @@ startup. Reason we have to call this is so the vterm fucntion can call `vterm--i *** Python #+begin_src emacs-lisp (straight-use-package 'elpy) -#+end_src> +(define-key inferior-python-mode-map (kbd "C-n") #'comint-next-input) +(define-key inferior-python-mode-map (kbd "C-p") #'comint-previous-input) +#+end_src> *** Rust #+begin_src emacs-lisp (straight-use-package 'rustic) @@ -1399,6 +1403,16 @@ it doesn't close it. (popper-close-latest)))))) (add-hook 'compilation-finish-functions 'joe/close-compilation-if-no-warn-err) +#+end_src +*** Haskell +#+begin_src emacs-lisp +(straight-use-package 'haskell-mode) + +(define-key haskell-interactive-mode-map (kbd "C-n") #'haskell-interactive-mode-history-next) +(define-key haskell-interactive-mode-map (kbd "C-p") #'haskell-interactive-mode-history-previous) +;; (evil-define-key 'insert) + + #+end_src *** OCaml #+begin_src emacs-lisp diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index fa9c5f1..3836a14 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,6 +1,7 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR EDITOR:hx +SETUVAR --export GHCUP_USE_XDG_DIRS:true SETUVAR --export --path GOPATH:/home/joe/\x2elocal/share/go/ SETUVAR --export LC_COLLATE:C SETUVAR --export NNN_FIFO:/tmp/nnn\x2efifo