cleanup

formatting, change keybinds, remove unused keybinds

7 files changed, 71 insertions, 61 deletions

diff --git a/bard-emacs-modules/bard-emacs-dired.el b/bard-emacs-modules/bard-emacs-dired.el
index 41f8ee8..7e5a83c 100644
--- a/bard-emacs-modules/bard-emacs-dired.el
+++ b/bard-emacs-modules/bard-emacs-dired.el
@@ -30,14 +30,34 @@
 (use-package image-dired
   :bind
   (:map dired-mode-map
-        ((")" . image-dired-dired-display-external)))
+        ((")" . image-dired-dired-display-external)
+         ("B" . bard/dired-set-background-with-feh)))
+  :bind
+  ("C-x C-d" . image-dired)
+  :bind
+  (:map image-dired-thumbnail-mode-map ("B" . bard/image-dired-set-background-with-feh))
   :config
   (setq image-dired-thumbnail-storage 'standard)
   (setq image-dired-external-viewer "nsxiv")
   (setq image-dired-thumb-size 80)
   (setq image-dired-thumb-margin 2)
   (setq image-dired-thumb-relief 0)
-  (setq image-dired-thumbs-per-row 4))
+  (setq image-dired-thumbs-per-row 4)
+
+  (defun bard/dired-set-background-with-feh ()
+    "Set the selected image as the background using feh."
+    (interactive)
+    (let ((image-file (dired-get-file-for-visit)))
+      (start-process "feh" nil "feh" "--bg-fill" image-file)
+      (message "Background set to %s" image-file)))
+
+  (defun bard/image-dired-set-background-with-feh ()
+    "Set the selected image as the background using feh."
+    (interactive)
+    (let ((image-file (image-dired-original-file-name)))
+      (start-process "feh" nil "feh" "--bg-fill" image-file)
+      (message "Background set to %s" image-file))))
+
 
 ;; Taken from https://superuser.com/a/176629
 (defun bard/dired-do-command (command)
diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el
index e47334e..589f7a7 100644
--- a/bard-emacs-modules/bard-emacs-org.el
+++ b/bard-emacs-modules/bard-emacs-org.el
@@ -18,7 +18,7 @@
 ;; Org Variables
 (setq org-directory "~/Notes/denote/")
 ;; symlinked file to shorten denote file name in agenda buffers
-(setq org-agenda-files (list "~/Notes/denote/todo.org"))
+(setq org-agenda-files (list "~/Notes/denote/todo.org" "~/Notes/denote/khan.org"))
 (setq org-archive-location "~/Notes/denote/20240328T215840--archive__self.org::* Archive")
 (setq org-log-done 'time)
 (setq org-structure-template-alist
diff --git a/bard-emacs-modules/bard-emacs-theme.el b/bard-emacs-modules/bard-emacs-theme.el
index 794ec07..103ece7 100644
--- a/bard-emacs-modules/bard-emacs-theme.el
+++ b/bard-emacs-modules/bard-emacs-theme.el
@@ -64,13 +64,13 @@ The exact color values are taken from the active Ef theme."
 	          ("DEPRECATED" . ,yellow)))))
 
   (setq ef-themes-headings
-	    '((0 variable-pitch light 2.00)
-	      (1 variable-pitch light 1.5)
-	      (2 regular 1.3)
-	      (3 1.1)
+        '((0 variable-pitch light 2.00)
+          (1 variable-pitch light 1.5)
+          (2 regular 1.3)
+          (3 1.1)
           (agenda-date . (variable-pitch regular 1.3))
-	      (agenda-structure . (variable-pitch light 1.9))
-	      (t . 1.1)))
+          (agenda-structure . (variable-pitch light 1.9))
+          (t . 1.1)))
 
   ;; verbatim need higher contrast for org mode
   (setq ef-elea-dark-palette-overrides
@@ -85,6 +85,7 @@ The exact color values are taken from the active Ef theme."
 
 (use-package modus-themes
   :ensure t
+  :demand t
   :bind
   (("<f5>" . modus-themes-select))
   :hook ((modus-themes-post-load . bard/modus-themes-hl-todo-faces)
@@ -115,21 +116,20 @@ The exact color values are taken from the active Modus theme."
 	          ("KILLED" . ,cyan)
 	          ("DEPRECATED" . ,yellow)))))
   (setq modus-themes-headings
-	    '((0 variable-pitch light 2.00)
-	      (1 variable-pitch light 1.5)
-	      (2 regular 1.3)
-	      (3 1.1)
+        '((0 variable-pitch light 2.00)
+          (1 variable-pitch light 1.5)
+          (2 regular 1.3)
+          (3 1.1)
           (agenda-date . (variable-pitch regular 1.3))
-	      (agenda-structure . (variable-pitch light 1.9))
-	      (t . 1.1)))
-
+          (agenda-structure . (variable-pitch light 1.9))
+          (t . 1.1)))
   ;; org customization
   (setq org-priority-faces
         '((?A . (:inherit (bold org-priority)))
           (?B . org-priority)
           (?C . (:inherit (shadow org-priority)))))
-
-  (setq modus-themes-mixed-fonts t))
+  (setq modus-themes-mixed-fonts t)
+  (load-theme 'modus-vivendi t))
 
 (use-package theme-buffet
   :ensure t
@@ -151,9 +151,10 @@ The exact color values are taken from the active Modus theme."
           (ef-cyprus ef-arbutus ef-day ef-duo-light ef-kassio ef-melissa-light ef-summer modus-operandi-tinted)
           :evening
           (ef-elea-dark ef-maris-dark ef-melissa-dark ef-symbiosis ef-trio-dark)))
-  (theme-buffet-a-la-carte)
-  (theme-buffet-timer-hours 1)
-  (theme-buffet-mode t))
+  ;; (theme-buffet-a-la-carte)
+  ;; (theme-buffet-timer-hours 1)
+  ;; (theme-buffet-mode t)
+  )
 
 ;;;; Fonts
 (use-package fontaine
@@ -161,35 +162,32 @@ The exact color values are taken from the active Modus theme."
   :config
   (setq fontaine-presets
         '((small
-           :default-height 150
+           :default-height 130
 	       :default-family "Iosevka Comfy"
-	       :variable-pitch-family "Iosevka Comfy Motion Duo"
+	       :variable-pitch-family "Iosevka Comfy Motion"
 	       :variable-pitch-height 1.0
 	       :fixed-pitch-family "Iosevka Comfy"
 	       :fixed-pitch-height 1.0
 	       :bold-weight bold
 	       :mode-line-active-family "Iosevka Comfy"
-	       :mode-line-active-height 150
-	       :mode-line-inactive-height 150
+	       :mode-line-active-height 130
+	       :mode-line-inactive-height 130
 	       )
           (medium
 	       :inherit small
-	       :default-height 180
-	       :mode-line-active-height 180
-	       :mode-line-inactive-height 180)
+	       :default-height 150
+	       :mode-line-active-height 150
+	       :mode-line-inactive-height 150)
           (large
 	       :inherit small
 	       :variable-pitch-family "Iosevka Comfy Wide Motion"
-	       :default-height 200
-	       :mode-line-active-height 180
-	       :mode-line-inactive-height 180
+	       :default-height 170
+	       :mode-line-active-height 150
+	       :mode-line-inactive-height 150
 	       )
 	      (essay
            :inherit small
-           :default-family "Monospace"
-           :fixed-pitch-family "Monospace"
-           :mode-line-active-family "Monospace"
-           :variable-pitch-family "Helvetic Neue")
+           :variable-pitch-family "Helvetica Neue")
           (t
            :default-family "Monospace"
            )))
diff --git a/bard-emacs-modules/bard-emacs-ui.el b/bard-emacs-modules/bard-emacs-ui.el
index d18b593..9ccfa69 100644
--- a/bard-emacs-modules/bard-emacs-ui.el
+++ b/bard-emacs-modules/bard-emacs-ui.el
@@ -24,6 +24,8 @@
 
 ;; Generic variables for modes
 (use-package emacs
+  :bind
+  (("<f12>" . display-line-numbers-mode))
   :config
   (setq display-line-numbers-type 'relative)
   (setq whitespace-style '(face tabs spaces trailing space-before-tab newline indentation empty space-after-tab space-mark tab-mark)))
diff --git a/bard-emacs-modules/bard-emacs-web.el b/bard-emacs-modules/bard-emacs-web.el
index 62a471e..d586c83 100644
--- a/bard-emacs-modules/bard-emacs-web.el
+++ b/bard-emacs-modules/bard-emacs-web.el
@@ -99,8 +99,8 @@ instead of `browse-url-new-window-flag'."
   (setq url (browse-url-encode-url url))
   (let* ((process-environment (browse-url-process-environment)))
     (apply #'start-process
-           (concat "librewolf " url) nil
-           "librewolf"
+           (concat "librewolf-bin " url) nil
+           "librewolf-bin"
             (list url))))
 
 (provide 'bard-emacs-web)
diff --git a/bard-emacs-modules/bard-emacs-window.el b/bard-emacs-modules/bard-emacs-window.el
index 8ee8d00..8f0b7b1 100644
--- a/bard-emacs-modules/bard-emacs-window.el
+++ b/bard-emacs-modules/bard-emacs-window.el
@@ -14,11 +14,6 @@
   (setq window-min-height 3)
   (setq window-min-width 30))
 
-(use-package emacs
-  :bind
-  (("C-x f" . other-window-prefix)
-   ("C-c TAB" . other-frame-prefix)))
-
 (use-package eyebrowse
   :ensure t
   :init
diff --git a/bard-emacs-modules/bard-emacs-writing.el b/bard-emacs-modules/bard-emacs-writing.el
index 124266b..694842d 100644
--- a/bard-emacs-modules/bard-emacs-writing.el
+++ b/bard-emacs-modules/bard-emacs-writing.el
@@ -1,9 +1,16 @@
-;;; Sentence size
-(setq sentence-end-double-space nil)
+;;; Input related settings
+
+(use-package emacs
+  :ensure t
+  :bind
+  (("C-x i" . insert-char))
+  :config
+  ;;; Sentence size
+  (setq sentence-end-double-space nil)
 
 ;;; Keyboard things
-(setq default-input-method "cyrillic-yawerty")
-(setq default-transient-input-method "cyrillic-yawerty")
+  (setq default-input-method "cyrillic-yawerty")
+  (setq default-transient-input-method "cyrillic-yawerty"))
 
 ;; Tab settings
 (use-package emacs
@@ -36,8 +43,8 @@
 (use-package tempel
   :ensure t
   ;; Require trigger prefix before template name when completing.
-  :bind (("M-+" . tempel-complete) ;; Alternative tempel-expand
-         ("M-*" . tempel-insert))
+  :bind (("M-i" . tempel-complete) ;; Alternative tempel-expand
+         ("M-S-i" . tempel-insert))
 
   :init
 
@@ -95,22 +102,13 @@
    ("C-c n j" . denote-journal-extras-new-entry)
    ("C-c n r" . denote-rename-file)
    ("C-c n r" . denote-rename-file-using-front-matter)
-   ("C-c n k" . denote-keywords-add)
-   ("C-c n K" . denote-keywords-remove)
+   ("C-c n k" . denote-rename-file-keywords)
    ("C-c n i" . denote-link)
    ("C-c n I" . denote-add-links)
    ("C-c n b" . denote-backlinks)
    ("C-c n f" . denote-find-link)
    ("C-c n F" . denote-find-backlink)))
 
-(use-package denote-explore
-  :ensure t)
-
-(use-package denote-menu
-  :ensure t
-  :bind
-  (("C-c n l" . denote-menu-list-notes)))
-
 ;;; Focus mode for writing
 
 ;; Center line scrolling for focused writing
@@ -191,7 +189,4 @@
   :config
   (pdf-tools-install))
 
-(use-package org-noter-pdftools
-  :ensure t)
-
 (provide 'bard-emacs-writing)