huh, forgot to commit this for a whileHEADmain

1 files changed, 20 insertions, 36 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)