huh, forgot to commit this for a whileHEADmain

2 files changed, 29 insertions, 44 deletions

diff --git a/config.el b/config.el
index 7b41999..deb5fa3 100644
--- a/config.el
+++ b/config.el
@@ -1,42 +1,50 @@
 ;;; -*- lexical-binding: t; -*-
 
+
+;; fish as default confuses some sub processes of emacs
+(setq shell-file-name (executable-find "bash"))
+
 (setq ;; doom-font (font-spec :family "Hasklig" :size 15)
       doom-unicode-font (font-spec :family "Julia Mono"))
 ;; (load-theme 'doom-palenight t)
 (load-theme 'doom-moonlight t)
 
-(when (version<= "26.0.50" emacs-version )
-  (global-display-line-numbers-mode))
+;; icons in the tray
+(setq display-time-24hr-format 1)
+(display-time-mode)
+(display-battery-mode)
 
 ;; company-mode auto-completion, to turn off use :company-complete
 (require 'company)
 (setq company-idle-delay 0.2
       company-minimum-prefix-length 3)
 
-
+;; for some reason these were broken by default
 (setq org-roam-capture-templates
       '(("d" "default" plain "" :target
          (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}")
          :unnarrowed t)))
 
-;; hooks to turn on lsp when entering haskell mode
-(add-hook 'haskell-mode-hook #'lsp)
-(add-hook 'haskell-literate-mode-hook #'lsp)
-
-(setq org-agenda-files '("~/org" "~/org/roam"))
-(setq org-roam-directory "~/org/roam")
-(setq org-roam-v2-ack t)
-
 (after! org
   (setq org-todo-keywords
-        '((sequence "TODO" "IDEA" "IDLE" "DONE")
+        '((sequence "TODO" "PROGRESS" "IDEA" "IDLE" "|" "DONE" "DISCARDED")
           (sequence "[ ](T)" "[X](D)"))
         org-todo-keyword-faces
         '(("[-]"  . +org-todo-active)
           ("[?]"  . +org-todo-onhold)
           ("KILL" . +org-todo-cancel))))
 
+(setq org-agenda-files '("~/org" "~/org/roam"))
+(setq org-roam-directory "~/org/roam")
+(setq org-roam-v2-ack t)
+
+;; hooks to turn on lsp when entering haskell mode
+;; TODO: not sure if necessary?
+(add-hook 'haskell-mode-hook #'lsp)
+(add-hook 'haskell-literate-mode-hook #'lsp)
 
+
+;; mu4e is part of the mu system package, managed by nix
 (add-to-list 'load-path "~/.nix-profile/share/emacs/site-lisp/mu4e/")
 (after! mu4e
   (set-email-account! "hacc"
@@ -127,27 +135,3 @@
 
   (map! :map doom-leader-code-map
         "a" #'helm-lsp-code-actions-custom))
-
-
-(use-package! isar-mode
-  :mode "\\.thy\\'"
-  :config
-  ;; (add-hook 'isar-mode-hook 'turn-on-highlight-indentation-mode)
-  ;; (add-hook 'isar-mode-hook 'flycheck-mode)
-  (add-hook 'isar-mode-hook 'company-mode)
-  (add-hook 'isar-mode-hook
-            (lambda ()
-              (set (make-local-variable 'company-backends)
-                   '((company-dabbrev-code company-yasnippet)))))
-  (add-hook 'isar-mode-hook
-            (lambda ()
-              (set (make-local-variable 'indent-tabs-mode) nil)))
-  (add-hook 'isar-mode-hook
-            (lambda ()
-              (yas-minor-mode))))
-
-
-;; icons in the tray
-(setq display-time-24hr-format 1)
-(display-time-mode)
-(display-battery-mode)
diff --git a/init.el b/init.el
index ddb689f..9322ac8 100644
--- a/init.el
+++ b/init.el
@@ -21,9 +21,10 @@
 
        :completion
        ;;company           ; the ultimate code completion backend
-       helm              ; the *other* search engine for love and life
+       ;; helm              ; the *other* search engine for love and life
        ;;ido               ; the other *other* search engine...
-       ivy               ; a search engine for love and life
+       ;; ivy               ; a search engine for love and life
+       vertico
 
        :ui
        ;;deft              ; notational velocity for Emacs
@@ -79,8 +80,8 @@
 
        :checkers
        syntax              ; tasing you for every semicolon you forget
-       ;; (spell +flyspell +aspell) ; tasing you for misspelling mispelling
-       ;;grammar           ; tasing grammar mistake every you make
+       (spell +flyspell +aspell) ; tasing you for misspelling mispelling
+       ;; grammar           ; tasing grammar mistake every you make
 
        :tools
        ;;ansible
@@ -88,7 +89,7 @@
        ;;debugger          ; FIXME stepping through code, to help you add bugs
        direnv
        docker
-       ;;editorconfig      ; let someone else argue about tabs vs spaces
+       editorconfig      ; let someone else argue about tabs vs spaces
        ;;ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
@@ -150,7 +151,7 @@
        markdown          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
        (nix +treesitter)               ; I hereby declare "nix geht mehr!"
-       ;;ocaml             ; an objective camel
+       (ocaml +lsp)             ; an objective camel
        (org
         +roam2
         +pandoc
@@ -165,9 +166,9 @@
        ;;rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       (rust +lsp)              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       (rust +lsp +tree-sitter)              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
-       (scheme +gauche)            ; a fully conniving family of lisps
+       ;;(scheme +gauche)            ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor
        ;;sml
        ;;solidity          ; do you need a blockchain? No.