Merge branch 'master' of gitlab.com:chriscochrun/dotemacs

README.org

@@ -30,6 +30,7 @@
   - [[#sly][Sly]]
   - [[#pdf-tools][PDF-Tools]]
   - [[#epub][EPUB]]
+  - [[#eaf-emacs-application-framework][EAF (Emacs Application Framework)]]
   - [[#elfeed][Elfeed]]
   - [[#bongo][Bongo]]
   - [[#transmission][Transmission]]
@@ -603,7 +604,8 @@ Consult has a lot of nice functions like Ivy's Counsel functions (enhanced searc
     :states 'normal
     :keymaps 'override
     "si" 'consult-imenu
-    "so" 'consult-org-heading))
+    "so" 'consult-org-heading
+    "sm" 'bookmark-jump))
 #+end_src
 
 *** MARGINALIA
@@ -1175,14 +1177,15 @@ Part of this config includes some special capture templates for my work as a you
 
   (setq org-refile-targets '((org-agenda-files . (:maxlevel . 6))))
 
-  (setq org-agenda-window-setup 'other-window)
+  (setq org-agenda-window-setup 'only-window)
 
   (defun chris/org-agenda ()
     "create a window in AwesomeWM that houses my org-agenda"
     (interactive)
-    (make-frame '((name . "org-agenda")
+    (with-selected-frame (make-frame
-                  (width . 100)))
+                          '((name . "org-agenda")
-    (switch-to-buffer "*Org Agenda(a)*"))
+                            (width . 100))) (org-agenda-list)))
+  
 
   :general
   (chris/leader-keys
@@ -1191,7 +1194,7 @@ Part of this config includes some special capture templates for my work as a you
     "c" 'org-capture
     "rr" 'org-refile
     "e" 'org-export-dispatch
-    "oa" 'org-agenda)
+    "oa" 'chris/org-agenda)
   ('normal org-agenda-mode-map
            "q" 'org-agenda-quit
            "r" 'org-agenda-redo
@@ -1207,6 +1210,7 @@ Part of this config includes some special capture templates for my work as a you
            "RET" 'chris/org-dwim-at-point
            "gC" 'chris/org-columns-view
            "ge" 'org-edit-src-code
+           "gr" 'revert-buffer
            "t" 'org-todo)
   ('insert org-mode-map
            "C-i" 'completion-at-point)
@@ -1885,7 +1889,27 @@ Let's use pdf-tools for a lot better interaction with pdfs.
 (use-package nov
   :mode ("\\.epub\\'" . nov-mode)
   :config
-  (add-hook 'nov-mode-hook 'visual-fill-column-mode))
+
+  (defun chris/setup-nov-mode 
+    (interactive)
+    (visual-fill-column-mode)
+    (display-line-numbers-mode -1)
+    (variable-pitch-mode +1)
+    (setq visual-fill-column-width 100
+          visual-fill-column-center-text t))
+
+  (add-hook 'nov-mode-hook 'chris/setup-nov-mode))
+#+end_src
+
+** EAF (Emacs Application Framework)
+
+#+begin_src emacs-lisp
+(use-package eaf
+  :straight (:host github :repo "manateelazycat/emacs-application-framework"
+                   :files ("*"))
+  :defer 1
+  :config
+  (setq eaf-browser-dark-mode t))
 #+end_src
 
 ** Elfeed
@@ -1907,7 +1931,9 @@ interfere with the default `bongo-playlist-buffer'."
            (enclosure (elt (car (elfeed-entry-enclosures entry)) 0))
            (url (if (string-prefix-p "https://thumbnails" enclosure)
                     link
-                  enclosure))
+                  (if (string= enclosure nil)
+                      link
+                    enclosure)))
            (title (elfeed-entry-title entry))
            (bongo-pl chris/elfeed-bongo-playlist)
            (buffer (get-buffer-create bongo-pl)))

init.el

@@ -344,7 +344,8 @@ vertically."
     :states 'normal
     :keymaps 'override
     "si" 'consult-imenu
-    "so" 'consult-org-heading))
+    "so" 'consult-org-heading
+    "sm" 'bookmark-jump))
 
 (use-package marginalia
   :bind (:map minibuffer-local-map
@@ -778,14 +779,15 @@ vertically."
 
   (setq org-refile-targets '((org-agenda-files . (:maxlevel . 6))))
 
-  (setq org-agenda-window-setup 'other-window)
+  (setq org-agenda-window-setup 'only-window)
 
   (defun chris/org-agenda ()
     "create a window in AwesomeWM that houses my org-agenda"
     (interactive)
-    (make-frame '((name . "org-agenda")
+    (with-selected-frame (make-frame
-                  (width . 100)))
+                          '((name . "org-agenda")
-    (switch-to-buffer "*Org Agenda(a)*"))
+                            (width . 100))) (org-agenda-list)))
+  
 
   :general
   (chris/leader-keys
@@ -794,7 +796,7 @@ vertically."
     "c" 'org-capture
     "rr" 'org-refile
     "e" 'org-export-dispatch
-    "oa" 'org-agenda)
+    "oa" 'chris/org-agenda)
   ('normal org-agenda-mode-map
            "q" 'org-agenda-quit
            "r" 'org-agenda-redo
@@ -810,6 +812,7 @@ vertically."
            "RET" 'chris/org-dwim-at-point
            "gC" 'chris/org-columns-view
            "ge" 'org-edit-src-code
+           "gr" 'revert-buffer
            "t" 'org-todo)
   ('insert org-mode-map
            "C-i" 'completion-at-point)
@@ -1413,7 +1416,23 @@ If on a:
 (use-package nov
   :mode ("\\.epub\\'" . nov-mode)
   :config
-  (add-hook 'nov-mode-hook 'visual-fill-column-mode))
+
+  (defun chris/setup-nov-mode 
+    (interactive)
+    (visual-fill-column-mode)
+    (display-line-numbers-mode -1)
+    (variable-pitch-mode +1)
+    (setq visual-fill-column-width 100
+          visual-fill-column-center-text t))
+
+  (add-hook 'nov-mode-hook 'chris/setup-nov-mode))
+
+(use-package eaf
+  :straight (:host github :repo "manateelazycat/emacs-application-framework"
+                   :files ("*"))
+  :defer 1
+  :config
+  (setq eaf-browser-dark-mode t))
 
 (use-package elfeed
   :commands (elfeed)
@@ -1432,7 +1451,9 @@ interfere with the default `bongo-playlist-buffer'."
            (enclosure (elt (car (elfeed-entry-enclosures entry)) 0))
            (url (if (string-prefix-p "https://thumbnails" enclosure)
                     link
-                  enclosure))
+                  (if (string= enclosure nil)
+                      link
+                    enclosure)))
            (title (elfeed-entry-title entry))
            (bongo-pl chris/elfeed-bongo-playlist)
            (buffer (get-buffer-create bongo-pl)))