read diff fag

1 files changed, 36 insertions, 8 deletions

diff --git a/config.el b/config.el
index a176fc9..44121ed 100644
--- a/config.el
+++ b/config.el
@@ -1,9 +1,25 @@
 ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
+(add-to-list 'custom-theme-load-path
+             "~/.config/doom/extra-themes/")
 (remove-hook 'doom-first-input-hook #'evil-snipe-mode)
+;; eglot stuff (filed bug #60570)
+(after! eglot
+  (cl-defmethod eglot-register-capability
+    (server (method (eql workspace/didChangeWatchedFiles)) id &key watchers)
+    "see eglot#1258"
+    nil))
+(setq eglot-sync-connect nil
+      eglot-connect-timeout 60)
+
+;;themes and stuff
 (setq doom-font (font-spec :family "Berkeley Mono" :size 12.0))
+;; (setq doom-theme 'doom-flatwhite)
+;; (setq doom-theme 'fortune-gold)
 (setq doom-theme 'doom-badger)
 (setq display-line-numbers-type t)
 (setq org-directory "~/notes/")
+
+;; emms (unused for now)
 (use-package! emms
   :config
   (require 'emms-setup)
@@ -23,15 +39,12 @@
 
 ;; mood-line
 (use-package mood-line
-
-  ;; Enable mood-line
   :config
   (mood-line-mode)
-
-  ;; Use pretty Fira Code-compatible glyphs
   :custom
   (mood-line-glyph-alist mood-line-glyphs-fira-code))
 
+;; xmpp(jabber)
 (use-package! jabber
   :config
   (setq jabber-account-list
@@ -43,10 +56,11 @@
       :desc "Jabber connect"     "c" #'jabber-connect-all
       :desc "Jabber disconnect"  "q" #'jabber-disconnect
       :desc "Jabber roster"      "r" #'jabber-switch-to-roster-buffer
-      :desc "Jabber new chat"    "C" #'jabber-chat-with
+      :desc "Jabber new chat"    "n" #'jabber-chat-with
       :desc "Jabber groupchat"   "g" #'jabber-groupchat-join
       :desc "Jabber set status"  "s" #'jabber-send-presence)
-;; zk4e setup
+
+;; zk4e
 (use-package! zk4e
   :commands (zk4e-list zk4e-edit zk4e-new zk4e-tag-list zk4e-index zk4e-select-notebook
                        zk4e-goto-error)
@@ -56,6 +70,7 @@
   (zk4e-select-notebook "notes")
   (add-hook 'zk4e-edit-hook #'zk4e-maybe-name-buffer))
 
+;; Gnus
 ;; Authentication
 (setq auth-sources '("~/.authinfo.gpg")
       auth-source-cache-expiry nil)
@@ -97,14 +112,13 @@
 (setq message-signature
       "\n--\nMagdalena Szweda\nhttps://roughlynamed.net\nPGP: 3258 B28C 124A B089 1D6C  9E92 9B72 909E EF00 CBD0")
 
-
+;; vterm (just in case)
 (setq-default vterm-shell "/usr/bin/fish")
 (setq-default explicit-shell-file-name "/usr/bin/fish")
 
 (setq-default vterm-shell "/usr/bin/fish")
 (setq-default explicit-shell-file-name "/usr/bin/fish")
 
-(remove-hook 'doom-first-input-hook #'evil-snipe-mode)
 
 (map! :leader
       (:prefix ("n z" . "zk")
@@ -116,6 +130,8 @@
        :desc "Switch notebook" "s" #'zk4e-select-notebook
        :desc "Error log"      "!" #'zk4e-goto-error))
 
+
+;; lotta eVIl stuff
 (evil-define-key '(normal visual operator) 'global
   "n" 'evil-backward-char
   "e" 'evil-next-line
@@ -193,6 +209,18 @@
   (kbd "C-w e") 'evil-window-down
   (kbd "C-w i") 'evil-window-up
   (kbd "C-w o") 'evil-window-right)
+
+(defun my/hs-eval ()
+  (interactive)
+  (let* ((src (buffer-file-name))
+         (out (file-name-sans-extension src)))
+    (when (zerop (call-process-shell-command
+                  (format "runghc %s" src) nil "*runghc-output*"))
+      (let ((buf (make-comint "hs-run" out)))
+        (display-buffer buf)))))
+(add-hook 'haskell-mode-hook
+          (lambda ()
+            (local-set-key (kbd "<f5>") #'my/hs-eval)))
 ;; Whenever you reconfigure a package, make sure to wrap your config in an
 ;; `with-eval-after-load' block, otherwise Doom's defaults may override your
 ;; settings. E.g.