emacs: Update modus-theme configuration & add org-gnosis.HEADmaster

1 files changed, 50 insertions, 44 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 139b5e5..ac4e85c 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -432,18 +432,6 @@
 (unless (file-exists-p "~/Notes")
   (make-directory "~/Notes"))
 
-;; (use-package org-roam
-;;   :vc (:url "https://github.com/org-roam/org-roam"))
-
-;; (use-package org-roam-ui
-;;   :vc (:url "https://github.com/org-roam/org-roam-ui")
-;;   :after org-roam
-;;   :config
-;;   (setq org-roam-ui-sync-theme t
-;;         org-roam-ui-follow t
-;;         org-roam-ui-update-on-save t
-;;         org-roam-ui-open-on-start t))
-
 (unless (or is-phone is-uranus)
   (use-package modus-themes
     :ensure t
@@ -456,15 +444,14 @@
 	  modus-themes-disable-other-themes t
 	  modus-themes-prompts '(italic)
 	  modus-themes-completions '((matches . (underline))
-				     (selection . (semibold italic text-also underline)))
-	  modus-themes-org-blocks 'tinted-background)
+				     (selection . (semibold italic text-also underline))))
     ;; Palette overrides
     (setf modus-themes-common-palette-overrides
 	  '((fg-line-number-active cyan-intense)
 	    ;; (bg-main "#1d2021") ;;grubox-hard
 	    ;; (bg-main "#191919") ;; 1337
 	    ;; (bg-main "#1d1f21") ;; tomorrow night
-	    ;; (bg-main "#151515") ;; jazz
+	    (bg-main "#151515") ;; jazz
 	    ;; (bg-main "#0C0C0C") ;; random black
 	    ;; (bg-main "#171717") ;; badger
 	    ;; (overline-heading-1 gold)
@@ -477,15 +464,15 @@
 	    (underline-err red-intense)
             (underline-warning yellow-faint)
             (underline-note cyan-faint)
-	    ;; (string "#86B187")
+	    (string olive)
 	    (border-mode-line-active unspecified)
             (border-mode-line-inactive unspecified)
 	    (bg-mode-line-active "#433F4f") ;; subtle lavender
 	    (bg-mode-line-inactive "#1D1D1D")
-	    ;; set fg from badger theme
+	    ;; Set fg from badger theme
             (fg-mode-line-active "#F6F3E8")
 	    (bg-hl-line bg-dim)
-	    (cursor slate)
+	    (cursor indigo)
 	    (prose-todo green-intense)
 	    (prose-done bg-term-white)
 	    (fg-prompt yellow-faint)
@@ -494,7 +481,7 @@
     (setf modus-themes-headings
 	  '((1 . (ultrabold  1.35))
             (2 . (semibold  1.2))
-            (agenda-date . (1.3))
+            (agenda-date . (1.2))
             (agenda-structure . (variable-pitch light 1.8))
             (t . (1.15))))
     ;; Load modus
@@ -563,24 +550,22 @@
     "Edit current commit message"
     (interactive)
     (vc-checkin nil 'git nil nil nil "")
-    (vc-git-log-edit-toggle-amend)))
+    (vc-git-log-edit-toggle-amend))
 
-;; (use-package corfu
-;;   :ensure t
-;;   :config
-;;   (global-corfu-mode)
-;;   (corfu-popupinfo-mode)
-;;   (setf corfu-auto t
-;; 	corfu-auto-delay 0.1
-;; 	corfu-auto-prefix 2
-;; 	corfu-cycle t
-;; 	corfu-popupinfo-delay 0.3
-;; 	corfu-quit-at-boundary 'separator
-;; 	corfu-quit-no-match t
-;;         corfu-preselect 'first
-;; 	corfu-preview-current t
-;; 	corfu-echo-mode t)
-;;   (setf indent-tabs-mode nil))
+  (defun thanos/vc-git-branch ()
+    "Select git branch"
+    (let ((branch (completing-read "Select branch: " (vc-git-branches) nil t)))
+      branch))
+
+  (defun vc-git-delete-branch ()
+    "Select & delete git branch."
+    (interactive)
+    (let ((branch (thanos/vc-git-branch)))
+      (vc-git-command nil 0 nil "branch" "-D" branch)
+      (message "Branch `%s' deleted." branch)))
+  :bind (:map
+	 vc-prefix-map
+	 ("b d" . 'vc-git-delete-branch)))
 
 (when (or is-phone is-uranus)
   (use-package corfu-terminal))
@@ -629,7 +614,8 @@
 	eat-term-name "xterm-256color")
   :bind (("C-c v" . eat))
   :hook ((eshell-mode . eat-eshell-mode)
-	 (eshell-mode . eat-eshell-visual-command-mode)))
+	 (eshell-mode . eat-eshell-visual-command-mode)
+	 (eat-mode . (lambda () (visual-line-mode -1)))))
 
 (use-package shell
   :ensure t
@@ -668,10 +654,12 @@
   :bind (("C-c e" . eshell)
 	 :map eshell-mode-map
 	 ("C-l" . 'thanos/eshell-clear)
-	 ("<tab>" . 'thanos/eshell-preview-insert))
+	 ("<tab>" . 'thanos/eshell-preview-insert)
+	 ("C-M-i" . 'completion-at-point))
   :hook ((eshell-mode . (lambda ()
 			  (thanos/set-eshell-aliases thanos/aliases)
-			  (display-line-numbers-mode -1)))))
+			  (display-line-numbers-mode -1)
+			  (eshell-cmpl-mode -1)))))
 
 (use-package eshell-git-prompt
   :vc (:url "https://github.com/xuchunyang/eshell-git-prompt")
@@ -832,7 +820,7 @@
 	  '((:deck "Bulgarian" (:amnesia 0.55 :proto (0 1 3)))
 	    (:deck "Unking" (:amnesia 0.45))
 	    (:tag "vocabulary" (:amnesia 0.65 :proto (0 1 3)))))
-    :bind (("C-M-r" . 'thanos/gnosis-map)
+    :bind (("C-c SPC" . 'thanos/gnosis-map)
 	   :map thanos/gnosis-map
 	   ("a" . 'gnosis-add-note)
 	   ("d" . 'gnosis-dashboard)))
@@ -841,9 +829,7 @@
   (gnosis-vc-pull)
 
   (use-package org-gnosis
-    :vc t
     :load-path "~/Dev/emacs-lisp/org-gnosis"
-    :ensure t
     :init
     (define-prefix-command 'thanos/notes-map)
     (define-prefix-command 'thanos/journal-map)
@@ -859,11 +845,13 @@
       (interactive)
       (let ((org-link-frame-setup '((file . find-file))))
 	(org-open-at-point)))
+    
     :bind (("C-c n" . thanos/notes-map)
 	   ("C-c j" . thanos/journal-map)
 	   :map thanos/notes-map
            ("f" . org-gnosis-find)
 	   ("i" . org-gnosis-insert)
+	   ("t" . org-gnosis-find-by-tag)
 	   :map thanos/journal-map
 	   ("j" . org-gnosis-journal)
 	   ("f" . org-gnosis-journal-find)
@@ -873,6 +861,24 @@
 	   ("C-c i" . org-id-get-create)
 	   ("C-c C-o" . thanos/org-open-at-point)))
 
+  (use-package org-gnosis-ui
+    :load-path "~/Dev/emacs-lisp/org-roam-ui/"
+    :after org-gnosis
+    :config
+    (setf org-gnosis-ui-custom-theme
+	  '((bg . "#1e1e1e")
+	    (bg-alt . "#282a36")
+	    (fg . "#ffffff")
+	    (fg-alt . "#c6daff")
+	    (red . "#ff5f5f")
+	    (orange . "#f1fa8c")
+	    (yellow . "#efef00")
+	    (green . "#44df44")
+	    (cyan . "#00eff0")
+	    (blue . "#338fff")
+	    (violet . "#9099d9") ;; indigo
+	    (magenta . "#ff66ff"))))
+
   (use-package pcmpl-tailscale
     :vc t
     :load-path "~/Dev/emacs-lisp/pcmpl-tailscale"
@@ -1158,8 +1164,8 @@ rss.xml" anna piracy)
                     (shell-command-to-string
                      "echo $(guix build ovmf-x86-64)/share/firmware/ovmf_x64.bin"))))
     (async-shell-command
-     (format "qemu-system-x86_64 -enable-kvm -m %s -smp %s -hda %s -bios %s -vga virtio -device virtio-serial-pci -netdev user,id=vmnic,hostfwd=tcp::2222-:22 -device e1000,netdev=vmnic %s"
-             memory cores image ovmf-path (if iso (concat "-cdrom " iso) "")))))
+     (format "qemu-system-x86_64 -enable-kvm -m %s -smp %s -hda %s -vga virtio -device virtio-serial-pci -netdev user,id=vmnic,hostfwd=tcp::2222-:22 -device e1000,netdev=vmnic %s"
+             memory cores image (if iso (concat "-cdrom " iso) "")))))
 
 (use-package 0x0
   :ensure nil)