.

6 files changed, 78 insertions, 57 deletions

diff --git a/home/config.scm b/home/config.scm
index abbe70a..e68a5b1 100644
--- a/home/config.scm
+++ b/home/config.scm
@@ -60,6 +60,7 @@
   #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (sops packages sops)
   #:use-module (gnu packages video)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages haskell-xyz)
@@ -81,7 +82,7 @@
 	      font-iosevka-etoile
 	      font-liberation
 
-	      
+	      sops
 	      isync
 	      direnv
 	      zoxide
@@ -91,6 +92,8 @@
 	      fd
 	      age
 	      recutils
+	      mupdf
+
 	      unzip
 	      inxi
 	      alsa-utils
diff --git a/home/dots/.config/guix/channels.scm b/home/dots/.config/guix/channels.scm
index b097635..5363fb8 100644
--- a/home/dots/.config/guix/channels.scm
+++ b/home/dots/.config/guix/channels.scm
@@ -1,10 +1,21 @@
-(cons* (channel
-          (name 'nonguix)
-          (url "https://gitlab.com/nonguix/nonguix")
-          ;; Enable signature verification:
-          (introduction
-           (make-channel-introduction
-            "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
-            (openpgp-fingerprint
-             "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
-         %default-channels)
+(cons*
+ (channel
+  (name 'sops-guix)
+  (url "https://github.com/fishinthecalculator/sops-guix")
+  (branch "main")
+  ;; Enable signature verification:
+  (introduction
+   (make-channel-introduction
+    "0bbaf1fdd25266c7df790f65640aaa01e6d2dbc9"
+    (openpgp-fingerprint
+     "8D10 60B9 6BB8 292E 829B  7249 AED4 1CC1 93B7 01E2"))))
+ (channel
+  (name 'nonguix)
+  (url "https://gitlab.com/nonguix/nonguix")
+  ;; Enable signature verification:
+  (introduction
+   (make-channel-introduction
+    "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
+    (openpgp-fingerprint
+     "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
+ %default-channels)
diff --git a/home/dots/.config/kmonad.config b/home/dots/.config/kmonad.config
index d040c75..36ae331 100644
--- a/home/dots/.config/kmonad.config
+++ b/home/dots/.config/kmonad.config
@@ -9,7 +9,7 @@
   allow-cmd true
   )
 
-(defsrc caps lalt rmet)
+(defsrc caps lalt rmet ralt)
 
 ;; (defalias
 ;;  ctl-lck (stepped
@@ -20,10 +20,12 @@
    slc (sticky-key 700 lctl)
    slm (sticky-key 700 lmet)
    sla (sticky-key 700 lalt)
+   sra (sticky-key 700 ralt)
    slf (sticky-key 700 lsft)
    srf (sticky-key 700 rsft))
 
 (deflayer mine
   @slc
   @sla
-  (sticky-key 700 rmet))
+  (sticky-key 700 rmet)
+  @sra)
diff --git a/home/dots/.emacs b/home/dots/.emacs
index bb6e6d3..a6222a4 100644
--- a/home/dots/.emacs
+++ b/home/dots/.emacs
@@ -19,6 +19,7 @@
 	geiser-guile
 	git-gutter
 	git-gutter-fringe
+	org-roam
 	go-mode
 	guix
 	pdf-tools
@@ -251,10 +252,10 @@
 
 (use-package geiser
   :ensure t
-  :init
-  (with-eval-after-load 'geiser-guile
-    (add-to-list 'geiser-guile-load-path "~/dev/nonguix")))
-    ;;(keymap-set geiser-mode-map "C-." nil)))
+  :hook
+  (geiser-mode . (lambda ()
+		   (keymap-set geiser-mode-map "C-." nil))))
+
 
 (use-package corfu
   :defer t
@@ -339,7 +340,20 @@
   :custom
   (uniquify-buffer-name-style 'forward))
 
-
+(use-package org-roam
+  :ensure t
+  :config
+  (org-roam-db-autosync-mode)
+  :bind
+  (("C-c n n" . org-roam-node-find)
+   ("C-c n i" . org-roam-node-insert)
+   ("C-c n c" . org-roam-capture))
+  :custom
+  (org-roam-directory "~/org-roam")
+  (org-roam-capture-templates '(("d" "default" plain "%?"
+				 :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org"
+						    "* ${title}\n%U\n")
+				 :unnarrowed t))))
 
 
 (use-package direnv
@@ -680,6 +694,7 @@
   ("C-." . er/expand-region)
   ("C--" . er/contract-region))
 
+
 (use-package devdocs
   :ensure t
   :defer t
@@ -776,39 +791,8 @@
   ("M-<" . insert-pair)
   ("M-[" . insert-pair))
 
-(use-package dbus
-  :demand t
-  :config
-  (defun ctrl-lock-on ()
-    (set-cursor-color "red")
-    (setq ctrl-lock-state t)
-    (force-mode-line-update t))
-  (defun ctrl-lock-off ()
-    (set-cursor-color "black")
-    (setq ctrl-lock-state nil)
-    (force-mode-line-update t))
-  :bind
-  (("C-x C-2" . split-window-below)
-   ("C-x C-0" . delete-window)
-   ("C-<return>" . newline)
-   ("C-x C-3" . split-window-right))
-  :init
-  (setq ctrl-lock-state nil)
-  (push '(ctrl-lock-state " [CTRL] " "") global-mode-string)
-  (dbus-register-method
-   :session
-   "org.emacs.ctrl"
-   "/on"
-   dbus-interface-introspectable
-   "Introspect"
-   #'ctrl-lock-on)
-  (dbus-register-method
-   :session
-   "org.emacs.ctrl"
-   "/off"
-   dbus-interface-introspectable
-   "Introspect"
-   #'ctrl-lock-off))
+(use-package dbus)
+
 
 (use-package ido
   :defer t
@@ -899,6 +883,7 @@
       "#oldcomputerchallenge"
       "#go-nuts"
       "#netbsd"
+      "#guile"
       "#nonguix"
       "#guix")))
   :bind
@@ -928,6 +913,8 @@
     (interactive)
     (async-shell-command "org-sync"))
   :custom
+  (org-complete-tags-always-offer-all-agenda-tags nil)
+  (org-use-fast-tag-selection (quote auto))
   (org-refile-targets
    '((nil :maxlevel . 4)
      (org-agenda-files :maxlevel . 4)))
@@ -985,6 +972,8 @@
    (org-mode . visual-line-mode)
    (org-mode . variable-pitch-mode)))
 
+
+
 (use-package org-id
   :after org
   :init
@@ -1041,6 +1030,9 @@
   (org-link-set-parameters
    "kbd"
    :follow (lambda (kmacro) (kmacro-call-macro nil t nil (kbd kmacro))))
+  (org-link-set-parameters
+   "goto"
+   :follow (lambda (keyword) (lgrep keyword "*.org" "~/personal-db/notes" nil)))
   :bind
   (("C-c l" . org-store-link)))
 
@@ -1073,8 +1065,8 @@
       "* %?\n:PROPERTIES:\n:DIRECTOR:\n:STATE: unwatched\n:END:\n "
       :empty-lines 1)
      ("g" "Log Coffee"
-      entry (file+headline "~/personal-db/notes/log.org" "Log")
-      "* Brewed pour-over :coffee:cyprus:paramytha:\n:PROPERTIES:\n:WATER: 320g\n:COFFEE: 25g\n:TYPE: [[id:ad50bd15-85fe-4efb-84f8-a4cf3113bcf9][Zigzag]] | [[id:815450d3-d772-4207-9eb4-e1e185fd8356][La Pastora]]  | [[id:9d136656-2965-4be9-87cf-4ecafcf62707][Alemayehu]] | [[id:73a92627-f076-4090-a78c-ef8204191611][Los Chorros]]\n:TEMP: 90\n:RATING:\n:PREHEAT: YES\n:TOTALBREWTIME:\n:CLICKS:\n:END:\n%T\n*** Observations "
+      entry (file+datetree "~/personal-db/notes/log.org")
+      "* Brewed pour-over :coffee:cyprus:paramytha:\n:PROPERTIES:\n:WATER: 320g\n:COFFEE: 25g\n:TYPE: [[id:504d708d-b90f-410e-af7f-ac8c6896ee0d][Orange County]]\n:TEMP: 90\n:RATING:\n:PREHEAT: YES\n:TOTALBREWTIME:\n:CLICKS:\n:END:\n%T\n*** Observations "
       :empty-lines 0
       :prepend t)
      ("r" "Reference"
@@ -1090,13 +1082,13 @@
       "* %?\n:PROPERTIES:\n:author:\n:END:\n "
       :empty-lines 1)
      ("l" "Log"
-      entry (file+headline "~/personal-db/notes/log.org" "Log")
+      entry (file+datetree "~/personal-db/notes/log.org")
       "** %? :cyprus:paramytha:\n%T"
       :prepend t
       :empty-lines 0)
      ("n" "Inbox"
       entry (file+headline "~/personal-db/notes/inbox.org" "Inbox")
-      "* %?\n%U\n"
+      "* %?\n%U\n%a\n"
       :empty-lines 1)))
   :bind
   (("C-c c" . org-capture)))
@@ -1116,6 +1108,7 @@
      "/home/mccd/system/guix.org"
      "/home/mccd/personal-db/notes/agenda.org"
      "/home/mccd/personal-db/notes/log.org"
+     "/home/mccd/personal-db/notes/log.old.org"
      "/home/mccd/personal-db/notes/inbox.org"
      "/home/mccd/personal-db/notes/lore.org"))
   (org-agenda-remove-tags t)  
@@ -1270,7 +1263,8 @@
   :diminish flyspell-mode
   :bind
   (:map flyspell-mode-map
-   ("C-." . nil))
+	("C-." . nil)
+	("M-<TAB>" . nil))
   :defer t)
 
 (use-package face-remap
@@ -1306,6 +1300,7 @@
   (message-sendmail-extra-arguments '("--read-envelope-from"))
   (message-send-mail-function 'message-send-mail-with-sendmail)
   (message-sendmail-envelope-from 'header)
+  (message-mail-user-agent t)
   (mail-user-agent 'message-user-agent)
   (message-kill-buffer-on-exit t))
 
@@ -1354,7 +1349,8 @@
 	(rmail-output-as-seen path nil t)
 	(rmail-process-file-through-pipe path cmd))))
   :hook
-  ((rmail-quit . rmail-expunge-and-save))
+  ((rmail-mode . variable-pitch-mode)
+   (rmail-quit . rmail-expunge-and-save))
   :bind
   (("C-c m" . rmail-open)
    ("C-c M" . rmail-open-no-check)
@@ -1387,6 +1383,7 @@
      rmail-secondary-file-regexp "~/personal-db/mail/home/archives/*.mbox"
      rmail-output-file-alist '(("\\[PATCH.*\\]" . "patch.mbox")
 			       ("[rR]eceipt"        . "receipt.mbox")
+			       ("[pP]ayment"        . "receipt.mbox")
 			       ("[oO]rder"        . "receipt.mbox")
                                (".*"        . "archive.mbox"))
      rmail-file-name "~/personal-db/mail/home/RMAIL"
diff --git a/home/dots/.emacs.d/BOGO-dark-theme.el b/home/dots/.emacs.d/BOGO-dark-theme.el
index adafa0f..b486d60 100644
--- a/home/dots/.emacs.d/BOGO-dark-theme.el
+++ b/home/dots/.emacs.d/BOGO-dark-theme.el
@@ -22,6 +22,10 @@
  '(font-lock-builtin-face ((t (:weight regular))))
  '(font-lock-comment-face ((t (:foreground "gray40"))))
  '(font-lock-constant-face ((t (:slant italic))))
+ '(ansi-color-bold ((t (:weight bold))))
+ '(info-title-2 ((t (:weight bold))))
+ '(info-title-3 ((t (:weight bold))))
+ '(info-title-4 ((t (:weight bold))))
  '(git-gutter:added ((t nil)))
  '(git-gutter:modified ((t nil)))
  '(git-gutter:deleted ((t (:foreground "red"))))
diff --git a/home/dots/.emacs.d/BOGO-theme.el b/home/dots/.emacs.d/BOGO-theme.el
index 42bacb9..6dcf222 100644
--- a/home/dots/.emacs.d/BOGO-theme.el
+++ b/home/dots/.emacs.d/BOGO-theme.el
@@ -23,6 +23,7 @@
  '(howm-reminder-todo-face ((t ())))
  '(howm-reminder-today-face ((t ())))
  '(howm-mode-ref-face ((t ())))
+ '(ansi-color-bold ((t (:weight bold))))
  '(howm-mode-keyword-face ((t ())))
  '(message-header-xheader ((t ())))     
  '(git-gutter:added ((t nil)))
@@ -30,6 +31,9 @@
  '(git-gutter:deleted ((t (:foreground "red"))))
  '(font-lock-function-name-face ((t nil)))
  '(font-lock-keyword-face ((t nil)))
+ '(info-title-2 ((t (:weight bold))))
+ '(info-title-3 ((t (:weight bold))))
+ '(info-title-4 ((t (:weight bold))))
  '(font-lock-string-face ((t (:foreground "#111111" :slant italic))))
  '(font-lock-type-face ((t (:foreground "#111111"))))
  '(magit-section-heading ((t (:weight bold))))