diff options
| -rw-r--r-- | bard-emacs-modules/bard-emacs-org.el | 8 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-theme.el | 153 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-ui.el | 19 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-web.el | 12 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-window.el | 4 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-writing.el | 15 |
6 files changed, 116 insertions, 95 deletions
diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el index 589f7a7..47fb6d0 100644 --- a/bard-emacs-modules/bard-emacs-org.el +++ b/bard-emacs-modules/bard-emacs-org.el @@ -38,7 +38,7 @@ (use-package org-cliplink :ensure t :bind - ("C-c p" . org-cliplink)) + ("C-c z" . org-cliplink)) ;; Making org mode look nice (setq org-startup-indented t @@ -100,14 +100,13 @@ (sequence "MEET(m)" "|" "MET(M)"))) ;; Org Agenda Faces -(custom-set-faces '(org-agenda-structure ((t (:inherit bold :height 1.5 :family "Iosevka Comfy Motion"))))) +(custom-set-faces '(org-agenda-structure ((t (:inherit bold :height 1.5))))) (setq org-ellipsis "↲") ;;; Org Agenda ;; clock tables -(setq org-clock-clocktable-default-properties '(:maxlevel 7 - :scope agenda)) +(setq org-clock-clocktable-default-properties '(:maxlevel 7 :scope agenda)) (defun bard/org-clock-report () (interactive) (bard/new-org-buffer) @@ -208,7 +207,6 @@ (org-download-image-dir "~/Notes/denote/Images") (org-download-heading-lvl 0) (org-download-timestamp "org_%Y%m%d-%H%M%S_") - (org-image-actual-width 900) (org-download-screenshot-method "xclip -selection clipboard -t image/png -o > '%s'") :bind ("C-M-y" . org-download-screenshot) diff --git a/bard-emacs-modules/bard-emacs-theme.el b/bard-emacs-modules/bard-emacs-theme.el index 103ece7..eaf7c38 100644 --- a/bard-emacs-modules/bard-emacs-theme.el +++ b/bard-emacs-modules/bard-emacs-theme.el @@ -43,25 +43,25 @@ The exact color values are taken from the active Ef theme." (ef-themes-with-colors (setq hl-todo-keyword-faces - `(("WAIT" . ,yellow) - ("TODO" . ,red) - ("NEXT" . ,blue) - ("THEM" . ,magenta) - ("PROG" . ,cyan-warmer) - ("OKAY" . ,green-warmer) - ("DONT" . ,yellow-warmer) - ("FAIL" . ,red-warmer) - ("BUG" . ,red-warmer) - ("DONE" . ,green) - ("NOTE" . ,blue-warmer) - ("KLUDGE" . ,cyan) - ("HACK" . ,cyan) - ("TEMP" . ,red) - ("FIXME" . ,red-warmer) - ("XXX+" . ,red-warmer) - ("KILLED" . ,cyan) - ("REVIEW" . ,red) - ("DEPRECATED" . ,yellow))))) + `(("WAIT" . ,yellow) + ("TODO" . ,red) + ("NEXT" . ,blue) + ("THEM" . ,magenta) + ("PROG" . ,cyan-warmer) + ("OKAY" . ,green-warmer) + ("DONT" . ,yellow-warmer) + ("FAIL" . ,red-warmer) + ("BUG" . ,red-warmer) + ("DONE" . ,green) + ("NOTE" . ,blue-warmer) + ("KLUDGE" . ,cyan) + ("HACK" . ,cyan) + ("TEMP" . ,red) + ("FIXME" . ,red-warmer) + ("XXX+" . ,red-warmer) + ("KILLED" . ,cyan) + ("REVIEW" . ,red) + ("DEPRECATED" . ,yellow))))) (setq ef-themes-headings '((0 variable-pitch light 2.00) @@ -74,10 +74,10 @@ The exact color values are taken from the active Ef theme." ;; verbatim need higher contrast for org mode (setq ef-elea-dark-palette-overrides - '((prose-verbatim yellow-cooler))) + '((prose-verbatim yellow-cooler))) (setq ef-elea-light-palette-overrides - '((prose-verbatim yellow-cooler))) + '((prose-verbatim yellow-cooler))) (define-key global-map (kbd "M-<f5>") #'ef-themes-select) (setq ef-themes-to-toggle '(ef-winter ef-frost)) @@ -96,25 +96,25 @@ The exact color values are taken from the active Ef theme." The exact color values are taken from the active Modus theme." (modus-themes-with-colors (setq hl-todo-keyword-faces - `(("WAIT" . ,yellow) - ("TODO" . ,red) - ("NEXT" . ,blue) - ("THEM" . ,magenta) - ("PROG" . ,cyan-warmer) - ("OKAY" . ,green-warmer) - ("DONT" . ,yellow-warmer) - ("FAIL" . ,red-warmer) - ("BUG" . ,red-warmer) - ("DONE" . ,green) - ("NOTE" . ,blue-warmer) - ("KLUDGE" . ,cyan) - ("HACK" . ,cyan) - ("TEMP" . ,red) - ("FIXME" . ,red-warmer) - ("XXX+" . ,red-warmer) - ("REVIEW" . ,red) - ("KILLED" . ,cyan) - ("DEPRECATED" . ,yellow))))) + `(("WAIT" . ,yellow) + ("TODO" . ,red) + ("NEXT" . ,blue) + ("THEM" . ,magenta) + ("PROG" . ,cyan-warmer) + ("OKAY" . ,green-warmer) + ("DONT" . ,yellow-warmer) + ("FAIL" . ,red-warmer) + ("BUG" . ,red-warmer) + ("DONE" . ,green) + ("NOTE" . ,blue-warmer) + ("KLUDGE" . ,cyan) + ("HACK" . ,cyan) + ("TEMP" . ,red) + ("FIXME" . ,red-warmer) + ("XXX+" . ,red-warmer) + ("REVIEW" . ,red) + ("KILLED" . ,cyan) + ("DEPRECATED" . ,yellow))))) (setq modus-themes-headings '((0 variable-pitch light 2.00) (1 variable-pitch light 1.5) @@ -163,31 +163,43 @@ The exact color values are taken from the active Modus theme." (setq fontaine-presets '((small :default-height 130 - :default-family "Iosevka Comfy" - :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 130 - :mode-line-inactive-height 130 - ) + :default-family "Iosevka Comfy" + :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 130 + :mode-line-inactive-height 130 + ) (medium - :inherit small - :default-height 150 - :mode-line-active-height 150 - :mode-line-inactive-height 150) + :inherit small + :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 170 - :mode-line-active-height 150 - :mode-line-inactive-height 150 - ) - (essay + :inherit small + :variable-pitch-family "Iosevka Comfy Wide Motion" + :default-height 170 + :mode-line-active-height 150 + :mode-line-inactive-height 150 + ) + (essay :inherit small :variable-pitch-family "Helvetica Neue") + (bit + :default-height 140 + :default-family "Terminus" + :variable-pitch-family "Terminus" + :variable-pitch-height 1.0 + :fixed-pitch-family "Terminus" + :fixed-pitch-height 1.0 + :bold-weight bold + :mode-line-active-family "Terminus" + :mode-line-active-height 140 + :mode-line-inactive-height 140 + ) (t :default-family "Monospace" ))) @@ -221,10 +233,10 @@ The exact color values are taken from the active Modus theme." :blink-cursor-interval 1.0) (bar :cursor-type (bar . 2) - :blink-cursor-interval 1.0) + :blink-cursor-interval 0.8) (bar-global :inherit bar - :cursor-in-non-selected-windows t) + :cursor-in-non-selected-windows hollow) (box-no-blink :blink-cursor-mode -1) (t ; the default values @@ -239,7 +251,20 @@ The exact color values are taken from the active Modus theme." :hook (kill-emacs . cursory-store-latest-preset) :bind - (("C-c p" . cursory-set-preset))) + ("C-c p" . cursory-set-preset) + :config + (define-minor-mode bard/bar-cursor-mode + "Toggle thin bar cursor." + :init-value nil + :light " S=" + :global nil + (when derived-mode-p 'org-mode + (if bard/bar-cursor-mode + (cursory-set-preset 'bar :local) + (cursory-set-preset 'box :local))))) + +(use-package rainbow-mode + :ensure t) ;; Switching themes (defun bard/disable-all-themes () diff --git a/bard-emacs-modules/bard-emacs-ui.el b/bard-emacs-modules/bard-emacs-ui.el index 9ccfa69..f36ebab 100644 --- a/bard-emacs-modules/bard-emacs-ui.el +++ b/bard-emacs-modules/bard-emacs-ui.el @@ -45,18 +45,16 @@ ;; padding for everything (use-package spacious-padding :ensure t - :init - (spacious-padding-mode t) :config (setq spacious-padding-widths - '( :internal-border-width 10 - :header-line-width 4 - :mode-line-width 6 - :tab-width 4 - :right-divider-width 1 - :left-fringe-width 10 - :right-fringe-width 10 - :scroll-bar-width 0))) + '( :internal-border-width 10 + :header-line-width 4 + :mode-line-width 6 + :tab-width 4 + :right-divider-width 1 + :left-fringe-width 10 + :right-fringe-width 10 + :scroll-bar-width 0))) ;; Todo Keywords highlighting, colors defined in bard-emacs-theme.el (use-package hl-todo @@ -66,6 +64,7 @@ ;; Show avaiable key chords (use-package which-key + :ensure t :init (which-key-mode 1)) diff --git a/bard-emacs-modules/bard-emacs-web.el b/bard-emacs-modules/bard-emacs-web.el index d586c83..4c31490 100644 --- a/bard-emacs-modules/bard-emacs-web.el +++ b/bard-emacs-modules/bard-emacs-web.el @@ -38,12 +38,12 @@ (setq rmh-elfeed-org-files (list "~/.emacs.d/feeds.org" "~/.emacs.d/youtube.org"))) -(use-package elfeed-goodies - :ensure t - :init - (elfeed-goodies/setup) - :config - (setq elfeed-goodies/powerline-default-separator 'box)) +;; (use-package elfeed-goodies +;; :ensure t +;; :init +;; (elfeed-goodies/setup) +;; :config +;; (setq elfeed-goodies/powerline-default-separator 'box)) ;;; Web Browsing (EWW and Firefox/Librewolf) diff --git a/bard-emacs-modules/bard-emacs-window.el b/bard-emacs-modules/bard-emacs-window.el index 8f0b7b1..a358517 100644 --- a/bard-emacs-modules/bard-emacs-window.el +++ b/bard-emacs-modules/bard-emacs-window.el @@ -16,8 +16,8 @@ (use-package eyebrowse :ensure t - :init - (eyebrowse-mode) + :config + (eyebrowse-mode t) :bind* (("M-0" . eyebrowse-switch-to-window-config-0) ("M-1" . eyebrowse-switch-to-window-config-1) diff --git a/bard-emacs-modules/bard-emacs-writing.el b/bard-emacs-modules/bard-emacs-writing.el index 694842d..9c9a512 100644 --- a/bard-emacs-modules/bard-emacs-writing.el +++ b/bard-emacs-modules/bard-emacs-writing.el @@ -33,15 +33,14 @@ (setq show-paren-context-when-offscreen 'overlay)) ;; Altcaps -(use-package altcaps - :ensure t - :bind - (("C-x C-a" . altcaps-dwim))) +(use-package captain + :ensure t) ;; snippets (use-package tempel :ensure t + :demand t ;; Require trigger prefix before template name when completing. :bind (("M-i" . tempel-complete) ;; Alternative tempel-expand ("M-S-i" . tempel-insert)) @@ -86,12 +85,12 @@ )) (denote-rename-buffer-mode 1) :hook - ((dired-mode . denote-dired-mode) + (dired-mode . denote-dired-mode) ;; journalling with timer (denote-journal-extras-hook . (lambda () (tmr "10" "Journalling") - (bard/scroll-center-cursor-mode t)))) + (bard/scroll-center-cursor-mode t))) :bind (("C-c n n" . denote-open-or-create) @@ -174,9 +173,10 @@ "Use `recenter' to reposition the view at the top." (unless (derived-mode-p 'prog-mode) (recenter 1))) ; Use 0 for the absolute top - :hook ((logos-page-motion . bard/logos--recenter-top)) + :hook + (org-mode . logos-focus-mode) :bind (("M-]" . logos-forward-page-dwim) ("M-[" . logos-backward-page-dwim) @@ -185,7 +185,6 @@ (use-package pdf-tools :ensure t - :defer t :config (pdf-tools-install)) |