.

3 files changed, 40 insertions, 30 deletions

diff --git a/home/config.scm b/home/config.scm
index e2b3e17..c9beca0 100644
--- a/home/config.scm
+++ b/home/config.scm
@@ -57,6 +57,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages mp3)  
   #:use-module (guix build-system go)          
   #:use-module (gnu home services pm)
   #:use-module (gnu home services xdg)
@@ -87,6 +88,7 @@
 	      man-db
 	      man-pages
 	      mandoc
+	      mp3info
 
 	      steam
 
@@ -110,7 +112,6 @@
 	      emacs-geiser	      
 	      emacs-geiser-guile
 	      emacs-pinentry
-;	      emacs-hyperbole
 	      emacs-pdf-tools
 	      emacs-alsamixer-el
 	      mu
@@ -152,10 +153,6 @@
 
      (service home-startx-command-service-type
 	      (xorg-configuration (keyboard-layout (keyboard-layout "us" "colemak" #:options '("ctrl:nocaps")))))
-     (service home-xmodmap-service-type
-                   (home-xmodmap-configuration
-                    (key-map '(("remove Lock" . "Caps_Lock")
-                               ("keysym Caps_Lock" . "Escape")))))
 
      (simple-service 'additional-fonts-service
                           home-fontconfig-service-type
diff --git a/home/dots/.emacs b/home/dots/.emacs
index 0741c62..34c0180 100644
--- a/home/dots/.emacs
+++ b/home/dots/.emacs
@@ -3,7 +3,6 @@
 (fset 'yes-or-no-p 'y-or-n-p)
 (setq
  default-frame-alist '((font . "Iosevka SS13 Extended")
-		       (bottom-divider-width . 2)
 		       (height . 150)
 		       (line-spacing . 0.5))
  ;; undo
@@ -132,8 +131,6 @@
   (require 'exwm-systemtray)
   (exwm-systemtray-mode)
   (setq exwm-systemtray-height 30)
-
-  (shell-command "xset r rate 200 60 1> /dev/null")
   (shell-command "xrdb ~/.Xresources")
   (shell-command "dbus-update-activation-environment DISPLAY")
   ;; Sticky keys
@@ -184,6 +181,10 @@
 
 (use-package geiser
   :ensure t
+  :demand t
+  :bind
+  (:map geiser-mode-map
+	("C-." . nil))
   :config
   (with-eval-after-load 'geiser-guile
     (add-to-list 'geiser-guile-load-path "~/builds/nonguix")))
@@ -223,8 +224,6 @@
 
 (use-package frame
   :config
-  (setq-default window-divider-default-bottom-width 2
-		window-divider-default-places t)
   (window-divider-mode))
 
 (use-package files
@@ -233,7 +232,8 @@
 	kept-new-versions 6
 	kept-old-versions 2
 	version-control t
-	auto-save-default nil))
+	auto-save-default nil)
+  (auto-save-visited-mode -1))
 
 (use-package minibuffer
   :defer t
@@ -281,7 +281,13 @@
   :init
   (ednc-mode))
 
+(use-package scheme
+  :bind
+  (:map scheme-mode-map
+	("C-." . nil)))
+
 (use-package org-remark
+  :diminish org-remark-mode
   :diminish org-remark-global-tracking-mode
   :bind (;; :bind keyword also implicitly defers org-remark itself.
          ;; Keybindings before :map is set for global-map.
@@ -302,6 +308,13 @@
   ;; `after-init-hook' as in the comment above
   (org-remark-global-tracking-mode +1)
   :config
+  (defun mccd/store-remarks ()
+      (concat "~/personal-db/notes/"
+	      (file-name-base (org-remark-notes-file-name-function))
+	      "-remark.org"))
+  (setq org-remark-icon-notes nil
+	org-remark-use-org-id t
+	org-remark-notes-file-name #'mccd/store-remarks)
   (use-package org-remark-info :after info :config (org-remark-info-mode +1))
   (use-package org-remark-eww  :after eww  :config (org-remark-eww-mode +1))
   (use-package org-remark-nov  :after nov  :config (org-remark-nov-mode +1)))
@@ -976,7 +989,7 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(default ((t (:inherit nil :extend nil :stipple nil :background "#fffff8" :foreground "black" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight regular :height 150 :width expanded :foundry "UKWN" :family "Iosevka SS13 Extended"))))
+ '(default ((t (:inherit nil :extend nil :stipple nil :background "#fffff8" :foreground "#111111" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight regular :height 150 :width expanded :foundry "UKWN" :family "Iosevka SS13 Extended"))))
  '(avy-lead-face ((t (:inherit fixed-pitch :background "dark red" :foreground "white"))))
  '(calendar-weekend-header ((t (:inherit nil))))
  '(comint-highlight-prompt ((t ()))) 
@@ -986,31 +999,32 @@
  '(eglot-mode-line ((t (:weight regular))))
  '(erc-timestamp-face ((t (:foreground "blue" :weight bold))))
  '(eshell-prompt ((t (:weight bold))))
- '(eww-valid-certificate ((t (:foreground "black" :weight bold))))
+ '(eww-valid-certificate ((t (:foreground "#111111" :weight bold))))
  '(fixed-pitch ((t (:family "Iosevka SS13 Extended"))))
  '(font-lock-builtin-face ((t (:weight regular))))
  '(font-lock-comment-face ((t (:foreground "gray40"))))
  '(font-lock-constant-face ((t (:slant italic :weight regular))))
  '(font-lock-function-name-face ((t (:weight regular))))
  '(font-lock-keyword-face ((t (:weight regular))))
- '(font-lock-string-face ((t (:foreground "black" :slant italic))))
- '(font-lock-type-face ((t (:foreground "black"))))
+ '(font-lock-string-face ((t (:foreground "#111111" :slant italic))))
+ '(font-lock-type-face ((t (:foreground "#111111"))))
  '(magit-section-heading ((t (:foreground "royalblue")))) 
- '(font-lock-variable-name-face ((t (:foreground "black"))))
+ '(font-lock-variable-name-face ((t (:foreground "#111111"))))
  '(fringe ((t ())))
  '(header-line ((t (:inherit default :foreground "grey20" :box (:line-width (12 . 12) :color "#fffff8") :underline (:color "#e0e0e0" :style line :position 0) :family "Iosevka Aile"))))
  '(highlight ((t (:background "azure2"))))
  '(info-header-xref ((t (:inherit info-xref :underline (:color "RoyalBlue3" :style line :position t)))))
  '(info-node ((t (:foreground "brown" :box (:line-width (4 . 4) :color "#fffff8") :slant italic :weight bold))))
  '(enwc-connected ((t (:foreground "dark green" :weight bold))))
- '(link ((t (:foreground "black" :underline t))))
+ '(link ((t (:foreground "#111111" :underline t))))
  '(magit-branch-remote ((t (:foreground "royalblue"))))
  '(markdown-inline-code-face ((t (:inherit markdown-code-face))))
  '(markdown-pre-face ((t (:inherit markdown-code-face))))
  '(mastodon-display-name-face ((t (:inherit nil :weight bold))))
- '(minibuffer-prompt ((t (:foreground "black" )))) 
- '(mode-line ((t (:background "#EEEEE8" :foreground "black" :box (:line-width (8 . 8) :style flat-button) :overline "white" :underline (:color "#fffff8" :style line :position t) :family "Iosevka Aile"))))
+ '(minibuffer-prompt ((t ()))) 
+ '(mode-line ((t (:background "#EEEEE8" :foreground "#111111" :box (:line-width (8 . 8) :style flat-button) :overline "white" :underline (:color "#fffff8" :style line :position t) :family "Iosevka Aile"))))
  '(mode-line-emphasis ((t (:weight regular))))
+ '(mode-line-buffer-id ((t ()))) 
  '(magit-section-highlight ((t (:background "#EEEEE8"))))
  '(mode-line-inactive ((t (:inherit mode-line :background "#f9f9f3" :foreground "grey60" :overline "#f9f9f9" :underline (:color "#f9f9f9" :style line :position 0) :weight light))))
  '(mu4e-header-highlight-face ((t (:inherit hl-line :extend t :weight bold))))
@@ -1021,7 +1035,7 @@
  '(org-agenda-date-today ((t (:weight bold))))
  '(org-agenda-date-weekend ((t ())))
  '(help-key-binding ((t (:weight semibold :background "#EEEEE8" :box (:line-width (1 . -1) :color "#AAAAA8"))))) 
- '(org-agenda-done ((t (:strike-through "on" :inherit org-time-grid :extend nil))))
+ '(org-agenda-done ((t (:strike-through t :inherit org-time-grid :extend nil))))
  '(org-agenda-structure-filter ((t (:slant italic)))) 
  '(org-done ((t (:strike-through "on" :weight bold :inherit org-agenda-dimmed-todo-face :extend nil))))
  '(org-todo ((t (:weight bold))))      
@@ -1032,13 +1046,14 @@
  '(org-quote ((t (:inherit org-block :slant italic)))) 
  '(outline-4 ((t (:inherit outline-2))))
  '(tab-bar ((t (:box (:line-width (12 . 24) :style flat-button) :weight semi-light :family "Iosevka Aile"))))
- '(tab-bar-tab ((t (:inherit tab-bar :foreground "black" :box (:line-width (20 . 1) :color "#fffff8") :weight semi-bold))))
+ '(tab-bar-tab ((t (:inherit tab-bar :foreground "#111111" :box (:line-width (20 . 1) :color "#fffff8") :weight semi-bold))))
  '(tab-bar-tab-inactive ((t (:inherit tab-bar-tab :background "#fffff8" :foreground "#999999" :weight semi-light))))
- '(tldr-code-block ((t (:background "cornsilk" :foreground "black"))))
- '(tldr-command-argument ((t (:background "cornsilk" :foreground "black"))))
- '(tldr-command-itself ((t (:background "khaki" :foreground "black" :weight bold))))
- '(tldr-introduction ((t (:foreground "black" :slant italic))))
- '(tldr-title ((t (:inherit variable-pitch :foreground "black" :weight bold :height 1.2))))
+ '(tldr-code-block ((t (:background "cornsilk" :foreground "#111111"))))
+ '(tldr-description ((t ()))) 
+ '(tldr-command-argument ((t (:background "cornsilk" :foreground "#111111"))))
+ '(tldr-command-itself ((t (:background "khaki" :foreground "#111111" :weight bold))))
+ '(tldr-introduction ((t (:foreground "#111111" :slant italic))))
+ '(tldr-title ((t (:inherit variable-pitch :foreground "#111111" :weight bold :height 1.2))))
  '(variable-pitch ((t (:family "Iosevka Aile"))))
  '(window-divider ((t (:foreground "gray90")))))
 (custom-set-variables
diff --git a/home/dots/.xinitrc b/home/dots/.xinitrc
index 6407dd7..af5b122 100755
--- a/home/dots/.xinitrc
+++ b/home/dots/.xinitrc
@@ -14,15 +14,13 @@ export GDK_DPI_SCALE="1.5"
 export GDK_SCALE="1.5"
 export XCURSOR_SIZE="32"
 #autocutsel &
-xsetroot -solid '#FFFFFF' &
-#ulimit -c 0 &
-#xclock -digital -geometry +5+1402 -face "Iosevka Aile:pixelsize=18:style=regular" -bg \#282C34 -fg \#B8BCC4 -strftime "Bogo (%Y/%m/%d) %H:%M" &
+xsetroot -solid '#000000' &
 gsettings set org.gnome.desktop.interface document-font-name 'Iosevka Aile' &
 gsettings set org.gnome.desktop.interface font-name 'Iosevka Aile' &
 gsettings set org.gnome.desktop.interface cursor-size 32 &
 gsettings set org.gnome.desktop.interface cursor-theme Adwaita &
 # xkbcomp $HOME/.config/keymap_locked_modifier.xkb $DISPLAY &
-#setxkbmap -layout us -variant colemak -option "caps:nocaps" & 
+setxkbmap -layout us -variant colemak -option "caps:nocaps" & 
 xsetroot -cursor_name left_ptr &
 xset r rate 200 60 &
 emacs --daemon --eval "(require 'exwm)" -f exwm-enable