summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TODO.org11
-rw-r--r--assets/abbrev_defs9
-rw-r--r--early-init.el9
-rw-r--r--modules/calibredb-epub-config.el2
-rw-r--r--modules/custom-functions.el51
-rw-r--r--modules/eww-config.el9
-rw-r--r--modules/font-config.el5
-rw-r--r--modules/help-utils.el2
-rw-r--r--modules/org-capture-config.el10
-rw-r--r--modules/pdf-config.el2
-rw-r--r--modules/test-code.el59
-rw-r--r--modules/user-constants.el4
12 files changed, 106 insertions, 67 deletions
diff --git a/TODO.org b/TODO.org
index 299d5e73..d1eaa1ce 100644
--- a/TODO.org
+++ b/TODO.org
@@ -2,6 +2,9 @@
=== Emacs Config Tasks ===
* Emacs Config Inbox
+** TODO Consider uses for shrface Emacs web browsing package
+[[https://github.com/chenyanming/shrface][chenyanming/shrface: Extend eww/nov with org-mode features, archive web pages to org files with shr.]]
+Captured On: [2024-04-11 Thu 15:57]
* DOING Emacs Config v0.7 [2/4]
** DONE Supplement Existing Functionality [9/9]
*** DONE [#B] Make sure eshell has same path as other shells
@@ -140,8 +143,9 @@ This is the result of overriding that function in cj/invincible-buffers in syste
*** DONE [#C] Bookmark-save-flag Replaces Bookmark-set-and-save
CLOSED: [2024-04-03 Wed 15:00]
remove cj/bookmark-set-and-save if setting bookmark-save-flat to 1 saves when adding/modifying a bookmark
-** DOING Open v0.7 Fit and Finish (ends 2024.04.18) [0/7]
-*** TODO [#B] Get Org Gcal Working
+** DOING Open v0.7 Fit and Finish (ends 2024.04.18) [0/6]
+*** TODO [#B] Test Emacs in a Terminal
+The number and complexity of bugs will tell me whether terminal Emacs is supported in this tag.
*** TODO [#B] Neither Feebleline nor Moodline Displays on Archsetup Fresh Install
*** TODO [#B] Move org-todo items into org-config use-package statement
*** TODO [#B] Separate org-agenda items into use-package statement
@@ -196,7 +200,6 @@ ripgrep on "~/ to find the following.
./modules/calibredb-epub-config.el:28: (setq calibredb-library-alist '(("~/sync/books/")))
./modules/elfeed-config.el:129: (let ((default-directory "~/videos"))
*** TODO [#C] Theme Doesn't Fallback on Wombat Correctly if No Theme Persist File
-*** TODO [#C] Check if Including Dired Buffers in Autorevert-mode Slows Tramp
*** [#D] Resolved v0.7 Fit and Finish Work [16/16]
**** DONE [#A] Remove Keys
CLOSED: [2024-04-07 Sun 13:46]
@@ -440,6 +443,7 @@ While completing, mu4e-view-completion-minor-mode is active, which offers mu4e-v
Not all email workflows are working (attachments, for instance).
There are also some major longstanding bugs (not-yet-sent messages location)
** TODO Calendaring Solution
+*** TODO [#B] Get Org Gcal Working
*** 2024-04-04 Thu @ 16:51:25 -0500 Current Requirements
I'm starting from scratch, but here are my (currently simple) requirements
- Download events from online calendar and include them in my agenda.
@@ -476,6 +480,7 @@ Captured On: [2024-04-05 Fri 13:49]
[[https://github.com/manateelazycat/awesome-tray?tab=readme-ov-file][manateelazycat/awesome-tray: Hide mode-line, display necessary information at right of minibuffer.]]
Captured On: [2024-04-06 Sat 11:09]
** TODO Emacs Config v0.8 Bug Fixes
+*** TODO [#C] Check if Including Dired Buffers in Autorevert-mode Slows Tramp
** TODO Emacs Config v0.8 Release Checklist
(add latest release checklist here)
* Emacs Config v0.9
diff --git a/assets/abbrev_defs b/assets/abbrev_defs
index d87348b5..6ed02cf7 100644
--- a/assets/abbrev_defs
+++ b/assets/abbrev_defs
@@ -19,6 +19,7 @@
("acquantiances" "acquaintances" nil :count 0)
("acrage" "acreage" nil :count 0)
("acticity" "activity" nil :count 0)
+ ("actualy" "actually" nil :count 0)
("additionsl" "additional" nil :count 0)
("adquire" "acquire" nil :count 0)
("adress" "address" nil :count 0)
@@ -64,7 +65,7 @@
("bouyant" "buoyant" nil :count 0)
("buisness" "business" nil :count 0)
("cafe" "café" nil :count 0)
- ("cafes" "cafés" nil :count 0)
+ ("cafes" "cafés" nil :count 1)
("calender" "calendar" nil :count 0)
("camoflage" "camouflage" nil :count 0)
("camoflague" "camouflage" nil :count 0)
@@ -131,6 +132,7 @@
("fiirst" "profile" nil :count 0)
("finshed" "finished" nil :count 0)
("firey" "fiery" nil :count 0)
+ ("flekey" "is" nil :count 0)
("foriegn" "foreign" nil :count 0)
("francsico" "francisco" nil :count 0)
("freind" "friend" nil :count 0)
@@ -165,6 +167,7 @@
("inspoection" "the" nil :count 0)
("inteligence" "intelligence" nil :count 0)
("intelligance" "intelligence" nil :count 0)
+ ("jsut" "just" nil :count 0)
("judgement" "value" nil :count 0)
("kernal" "kernel" nil :count 0)
("knwoing" "knowing" nil :count 0)
@@ -215,7 +218,7 @@
("outragous" "outrageous" nil :count 0)
("palestinean" "palestinian" nil :count 0)
("parliment" "parliament" nil :count 0)
- ("peopel" "people" nil :count 2)
+ ("peopel" "people" nil :count 3)
("percieve" "perceive" nil :count 0)
("perfored" "performed" nil :count 0)
("perseverence" "perseverance" nil :count 0)
@@ -293,7 +296,7 @@
("thansk" "thanks" nil :count 2)
("thickeness" "adjust" nil :count 0)
("tiem" "time" nil :count 0)
- ("togehter" "together" nil :count 0)
+ ("togehter" "together" nil :count 1)
("tomatos" "tomatoes" nil :count 0)
("tranaction" "transaction" nil :count 0)
("ture" "true" nil :count 0)
diff --git a/early-init.el b/early-init.el
index 69ba1b7d..ae12365f 100644
--- a/early-init.el
+++ b/early-init.el
@@ -52,6 +52,9 @@
;; log warnings, but don't popup the warnings buffer
(setq native-comp-async-report-warnings-errors 'silent)
+;; skip warnings but notify me about errors
+(setq warning-minimum-level :error)
+
;; --------------------------- Use Online Repos Flag ---------------------------
;; set to nil to only use localrepo or the local elpa-mirrors
@@ -102,8 +105,10 @@
(defconst user-home-dir (getenv "HOME")
"The user's home directory per the environment variable.")
-(defconst elpa-mirror-location (concat user-emacs-directory ".elpa-mirrors/")
- "The path to the elpa mirror location.")
+(defconst elpa-mirror-location "~/.elpa-mirrors/"
+"The path to the elpa mirror location.")
+
+(setq package-archives nil) ;; package-archives will be added below
;; LOCAL REPOSITORY (packages in version control)
(if (file-accessible-directory-p (concat user-emacs-directory "localrepo"))
diff --git a/modules/calibredb-epub-config.el b/modules/calibredb-epub-config.el
index 4b794cd3..11aca93d 100644
--- a/modules/calibredb-epub-config.el
+++ b/modules/calibredb-epub-config.el
@@ -44,7 +44,7 @@
;; :hook (nov-mode . cj/nov-apply-preferences)
:bind
(:map nov-mode-map
- ("m" . cj/bookmark-set-and-save)
+ ("m" . bookmark-set)
("b" . bookmark-bmenu-list)
("r" . nov-render-document)
("l" . recenter-top-bottom)
diff --git a/modules/custom-functions.el b/modules/custom-functions.el
index 414d3108..345ebd08 100644
--- a/modules/custom-functions.el
+++ b/modules/custom-functions.el
@@ -238,7 +238,54 @@ User is prompted for the optional descriptor."
(unless (bolp) (insert "\n"))
(insert "```\n")
(goto-char start)
- (insert (concat "```" lang "\n")))))
+ (insert (concat "```" lang "\n")))))
+
+;; ------------------------ Insert Around Word Or Region -----------------------
+
+(defun cj/insert-around-word-or-region ()
+ "Prompt for a string, insert it before and after the word at point or selected region."
+ (interactive)
+ (let ((str (read-string "Enter a string: "))
+ (regionp (use-region-p)))
+ (save-excursion
+ (if regionp
+ (let ((beg (region-beginning))
+ (end (region-end)))
+ (goto-char end)
+ (insert str)
+ (goto-char beg)
+ (insert str))
+ (if (thing-at-point 'word)
+ (let ((bounds (bounds-of-thing-at-point 'word)))
+ (goto-char (cdr bounds))
+ (insert str)
+ (goto-char (car bounds))
+ (insert str))
+ (message "Can't insert around. No word at point and no region selected."))))))
+
+(global-set-key (kbd "C-; i a") 'cj/insert-around-word-or-region)
+;; ------------------------ Insert Around Word Or Region -----------------------
+
+(defun cj/insert-around-word-or-region ()
+ "Prompt for a string, insert it before and after the word at point or selected region."
+ (interactive)
+ (let ((str (read-string "Enter a string: "))
+ (regionp (use-region-p)))
+ (save-excursion
+ (if regionp
+ (let ((beg (region-beginning))
+ (end (region-end)))
+ (goto-char end)
+ (insert str)
+ (goto-char beg)
+ (insert str))
+ (if (thing-at-point 'word)
+ (let ((bounds (bounds-of-thing-at-point 'word)))
+ (goto-char (cdr bounds))
+ (insert str)
+ (goto-char (car bounds))
+ (insert str))
+ (message "Can't insert around. No word at point and no region selected."))))))
;; -------------------- Append To Lines In Region Or Buffer --------------------
;; append characters to the end of all lines in the region or the whole buffer.
@@ -536,6 +583,8 @@ Uses `sortable-time-format' for the formatting the date/time."
(global-set-key (kbd "C-; b m") 'cj/move-buffer-and-file)
;; copy link to source file
(global-set-key (kbd "C-; b l") 'cj/copy-link-to-source-file)
+;; insert around
+(global-set-key (kbd "C-; i a") 'cj/insert-around-word-or-region)
(provide 'custom-functions)
;;; custom-functions.el ends here.
diff --git a/modules/eww-config.el b/modules/eww-config.el
index f0ee51a6..3476d068 100644
--- a/modules/eww-config.el
+++ b/modules/eww-config.el
@@ -17,12 +17,13 @@
("i" . eww-toggle-images)
("o" . eww-open-in-new-buffer))
:config
- (setq shr-use-colors nil) ;; respect colors in the html
- (setq shr-bullet "• ") ;; unordered lists use bullet glyph
+ (setq shr-use-colors nil) ;; respect colors in the html
+ (setq shr-bullet "• ") ;; unordered lists use bullet glyph
(setq shr-folding-mode t)
- (setq eww-search-prefix "https://duckduckgo.com/html?q=") ;; use Duck Duck Go as search engine
+ (setq eww-search-prefix "http://frogfind.com/?q=") ;; use Frog Find as search engine
+ ;; (setq eww-search-prefix "https://duckduckgo.com/html?q=") ;; use Duck Duck Go as search engine
(setq url-cookie-file "~/.local/share/cookies.txt")
- (setq url-privacy-level '(email agent lastloc))) ;; don't send any info listed here
+ (setq url-privacy-level '(email agent lastloc))) ;; don't send any info listed here
(provide 'eww-config)
;;; eww-config.el ends here
diff --git a/modules/font-config.el b/modules/font-config.el
index fc9d8b18..9df45c48 100644
--- a/modules/font-config.el
+++ b/modules/font-config.el
@@ -24,7 +24,8 @@
:variable-pitch-family "Hack Nerd Font Mono")
(Berkeley-Only
:default-family "Berkeley Mono"
- :variable-pitch-family "Berkeley Mono")
+ :default-height 120
+ :variable-pitch-family "Berkeley Mono")
(Merriweather-Only
:default-family "Merriweather"
:variable-pitch-family "Merriweather")
@@ -58,7 +59,7 @@
(t ;; shared fallback properties go here
:default-family "Berkeley Mono"
:default-weight regular
- :default-height 110
+ :default-height 120
:fixed-pitch-family nil ;; falls back to :default-family
:fixed-pitch-weight nil ;; falls back to :default-weight
:fixed-pitch-height 1.0
diff --git a/modules/help-utils.el b/modules/help-utils.el
index 199e6815..d6301782 100644
--- a/modules/help-utils.el
+++ b/modules/help-utils.el
@@ -42,7 +42,7 @@
:ensure nil ;; built-in
:bind
(:map Info-mode-map
- ("m" . cj/bookmark-set-and-save) ;; note:overrides menu selection
+ ("m" . bookmark-set) ;; note:overrides menu selection
("M" . Info-menu)) ;; so menu selection goes here
:preface
(defun open-with-info-mode ()
diff --git a/modules/org-capture-config.el b/modules/org-capture-config.el
index 3cdb45fd..8feab2bf 100644
--- a/modules/org-capture-config.el
+++ b/modules/org-capture-config.el
@@ -2,7 +2,7 @@
;;; Commentary:
;; Customizations related to org-capture and org-refile is here.
-;; This includes 'org-webpage-clipper' functionality.
+;; This includes 'cj/org-webpage-clipper' functionality.
;; To ensure the code below is only loaded after org-mode, all code is wrapped in an
;; eval-after-load function.
@@ -17,7 +17,7 @@
;; Saves a copy of the page eww is visiting in the 'articles'-file for offline
;; reading. In other words, it's a "Poor Man's Pocket/Instapaper"
- (defun org-webpage-clipper ()
+ (defun cj/org-webpage-clipper ()
"Capture a web page for later viewing in an org-file.
Encodes all links and marks that may interfere with org mode
display, then inserts the content into a file for later offline use.
@@ -26,7 +26,7 @@ This is meant to be used in coordination with an org-capture-template.
Example Template:
,@
-(\"w\" \"Website\" plain (function org-webpage-clipper)
+(\"w\" \"Website\" plain (function cj/org-webpage-clipper)
\"* %a\\nArticle Link: %L\\nCaptured On: %U\\n\\n\" :immediate-finish t)
'@"
(interactive)
@@ -98,8 +98,8 @@ Intended to be called within an org capture template."
"* TODO %?%(if (string= \"%i\" \"\") \"\" \"\n#+BEGIN_QUOTE\n%i\n#+END_QUOTE\")\n[[%:link][%:description]]\nCaptured On: %U"
:prepend t)
- ("w" "Website" plain
- (function org-webpage-clipper)
+ ("w" "Web Page Clipper" plain
+ (function cj/org-webpage-clipper)
"* %a\nArticle Link: %L\nCaptured On: %U\n\n" :immediate-finish t)))
) ;; end with-eval-after-load 'org
diff --git a/modules/pdf-config.el b/modules/pdf-config.el
index 518f3883..911140f2 100644
--- a/modules/pdf-config.el
+++ b/modules/pdf-config.el
@@ -18,7 +18,7 @@
:bind
(:map pdf-view-mode-map
("M" . pdf-view-midnight-minor-mode)
- ("m" . cj/bookmark-set-and-save)
+ ("m" . bookmark-set)
("z" . (lambda () (interactive) (cj/open-file-with-command "zathura")))
("e" . (lambda () (interactive) (cj/open-file-with-command "evince")))
("j" . pdf-view-next-line-or-next-page)
diff --git a/modules/test-code.el b/modules/test-code.el
index 85e7bce6..6c4fadcd 100644
--- a/modules/test-code.el
+++ b/modules/test-code.el
@@ -29,6 +29,23 @@
:config
(setf yeetube-mpv-disable-video nil))
+;; --------------------------------- Easy Hugo ---------------------------------
+
+(use-package easy-hugo
+ :defer .5
+ :init
+ (setq easy-hugo-basedir "~/code/cjennings.net/")
+ (setq easy-hugo-url "https://cjennings.net")
+ (setq easy-hugo-sshdomain "cjennings.net")
+ (setq easy-hugo-root "/var/www/cjennings/")
+ (setq easy-hugo-previewtime "300")
+ (setq easy-hugo-postdir "content")
+ (setq easy-hugo-server-flags "-D")
+ (setq easy-hugo-default-ext ".md")
+ :bind ("C-c H" . easy-hugo)
+ :config
+ (easy-hugo-enable-menu))
+
;; --------------------------------- Recording ---------------------------------
@@ -78,51 +95,9 @@ otherwise use the default location in `cj/recording-location'."
(setq cj/ffmpeg-process nil)
(message "Stopped recording process.")))
-;; ------------------------ Insert Around Word Or Region -----------------------
-
-(defun cj/insert-around-word-or-region ()
- "Prompt for a string, insert it before and after the word at point or selected region."
- (interactive)
- (let ((str (read-string "Enter a string: "))
- (regionp (use-region-p)))
- (save-excursion
- (if regionp
- (let ((beg (region-beginning))
- (end (region-end)))
- (goto-char end)
- (insert str)
- (goto-char beg)
- (insert str))
- (if (thing-at-point 'word)
- (let ((bounds (bounds-of-thing-at-point 'word)))
- (goto-char (cdr bounds))
- (insert str)
- (goto-char (car bounds))
- (insert str))
- (message "Can't insert around. No word at point and no region selected."))))))
-
-(global-set-key (kbd "C-; i a") 'cj/insert-around-word-or-region)
-
-;; --------------------------------- Easy Hugo ---------------------------------
-
-(use-package easy-hugo
- :defer .5
- :init
- (setq easy-hugo-basedir "~/code/cjennings.net/")
- (setq easy-hugo-url "https://cjennings.net")
- (setq easy-hugo-sshdomain "cjennings.net")
- (setq easy-hugo-root "/var/www/cjennings/")
- (setq easy-hugo-previewtime "300")
- (setq easy-hugo-postdir "content")
- (setq easy-hugo-server-flags "-D")
- (setq easy-hugo-default-ext ".md")
- :bind ("C-c H" . easy-hugo)
- :config
- (easy-hugo-enable-menu))
;; -------------------------------- Google This --------------------------------
-;; BUG: Fix warnings and errors thrown
(use-package google-this
:load-path "~/code/emacs-google-this/"
:defer 1
diff --git a/modules/user-constants.el b/modules/user-constants.el
index f42389d5..269ea540 100644
--- a/modules/user-constants.el
+++ b/modules/user-constants.el
@@ -9,7 +9,7 @@
;; ------------------------ Directory And File Constants -----------------------
-## DIRECTORIES
+;; DIRECTORIES
(defconst emacs-init-file (concat user-emacs-directory "init.el")
"The location of Emacs's main init file.")
@@ -34,7 +34,7 @@
(defconst snippets-dir (concat sync-dir "snippets/")
"The location of ya-snippet snippets.")
-### FILES
+;; FILES
(defvar schedule-file (concat sync-dir "schedule.org")
"The location of the org file containing scheduled events.")
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-26 23:00:14 +0000