summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/ai-config.el1
-rw-r--r--modules/custom-functions.el1
-rw-r--r--modules/dashboard-config.el1
-rw-r--r--modules/diff-config.el1
-rw-r--r--modules/dirvish-config.el7
-rw-r--r--modules/epa-config.el1
-rw-r--r--modules/flyspell-config.el1
-rw-r--r--modules/font-config.el3
-rw-r--r--modules/games-config.el1
-rw-r--r--modules/host-environment.el1
-rw-r--r--modules/ledger-config.el1
-rw-r--r--modules/local-repository.el1
-rw-r--r--modules/org-babel-config.el1
-rw-r--r--modules/org-capture-config.el1
-rw-r--r--modules/org-contacts-config.el2
-rw-r--r--modules/org-drill-config.el1
-rw-r--r--modules/org-export-config.el2
-rw-r--r--modules/org-refile-config.el2
-rw-r--r--modules/org-roam-config.el2
-rw-r--r--modules/prog-comments.el2
-rw-r--r--modules/prog-training.el2
-rw-r--r--modules/prog-webdev.el2
-rw-r--r--modules/reconcile-open-repos.el2
-rw-r--r--modules/record-desktop.el2
-rw-r--r--modules/system-utils.el9
-rw-r--r--modules/telegram-config.el2
-rw-r--r--modules/test-code.el1
-rw-r--r--modules/tramp-config.el1
-rw-r--r--modules/treesitter-config.el1
-rw-r--r--modules/ui-theme.el2
-rw-r--r--modules/user-constants.el2
-rw-r--r--modules/vc-config.el2
-rw-r--r--modules/weather-config.el2
33 files changed, 41 insertions, 22 deletions
diff --git a/modules/ai-config.el b/modules/ai-config.el
index 37483847..df943554 100644
--- a/modules/ai-config.el
+++ b/modules/ai-config.el
@@ -1,4 +1,5 @@
;;; ai-config.el --- Configuration for AI Integrations -*- lexical-binding: t; -*-
+;; author Craig Jennings <c@cjennings.net>
;;; Commentary:
diff --git a/modules/custom-functions.el b/modules/custom-functions.el
index 4f9c784b..efc2d4e2 100644
--- a/modules/custom-functions.el
+++ b/modules/custom-functions.el
@@ -1,4 +1,5 @@
;;; custom-functions.el --- My Custom Functions and Keymaps -*- lexical-binding: t; -*-
+;; author Craig Jennings <c@cjennings.net>
;;; Commentary:
;;
diff --git a/modules/dashboard-config.el b/modules/dashboard-config.el
index c17503cf..79656d87 100644
--- a/modules/dashboard-config.el
+++ b/modules/dashboard-config.el
@@ -1,4 +1,5 @@
;;; dashboard-config.el --- Dashboard Configuration -*- lexical-binding: t; -*-
+;; author Craig Jennings <c@cjennings.net>
;;; Commentary:
diff --git a/modules/diff-config.el b/modules/diff-config.el
index aaef8dbf..98729639 100644
--- a/modules/diff-config.el
+++ b/modules/diff-config.el
@@ -1,4 +1,5 @@
;;; ediff-config.el --- diff Configuration -*- lexical-binding: t; -*-
+;; author Craig Jennings <c@cjennings.net>
;;; Commentary:
;; highly useful setup for configuring ediff
diff --git a/modules/dirvish-config.el b/modules/dirvish-config.el
index e68eb72a..96448d68 100644
--- a/modules/dirvish-config.el
+++ b/modules/dirvish-config.el
@@ -1,4 +1,4 @@
-;;; dirvish-config.el --- Configuration for Tramp and the Dired File Manager -*- lexical-binding: t; -*-
+;;; dirvish-config.el --- Configuration for the Dired and Dirvish File Managers -*- lexical-binding: t; -*-
;; author Craig Jennings <c@cjennings.net>
;;; Commentary:
@@ -95,6 +95,7 @@ automatically displayed."
(add-to-list 'load-path (concat user-emacs-directory "elpa/dirvish-2.3.0/extensions"))
(require 'dirvish)
(require 'dirvish-icons)
+ (require 'dirvish-emerge)
(require 'dirvish-quick-access)
(require 'dirvish-yank)
(dirvish-override-dired-mode)
@@ -116,7 +117,8 @@ automatically displayed."
("pw" ,(concat pix-dir "/wallpaper/") "pictures wallpaper")
("px" ,pix-dir "pictures directory")
("rcj" "/sshx:cjennings@cjennings.net:~" "remote cjennings.net")
- ("s" ,sync-dir "sync directory")
+ ("sx" ,sync-dir "sync directory")
+ ("sv" "~/sync/videos/" "sync/videos directory")
("tg" ,(concat sync-dir "/text.games") "text games")
("vr" ,video-recordings-dir "video recordings directory")
("vx" ,videos-dir "videos")
@@ -143,6 +145,7 @@ automatically displayed."
(dired-file-name-at-point) " >>/dev/null 2>&1" ))))
("Z" . (lambda () (interactive) (cj/dired-open-with "zathura")))
("L" . (lambda () (interactive) (cj/dired-open-with "libreoffice")))
+ ("o" . (lambda () (interactive) (cj/dired-open-with "xdg-open")))
("P" . (lambda () (interactive) (cj/dired-open-with "gimp")))
("O" . (lambda () (interactive) (call-interactively 'cj/dired-open-with)))
("<left>" . dired-up-directory)
diff --git a/modules/epa-config.el b/modules/epa-config.el
index 8d902ae4..1b7ae21b 100644
--- a/modules/epa-config.el
+++ b/modules/epa-config.el
@@ -1,4 +1,5 @@
;;; epa-config.el --- EasyPG Configuration -*- lexical-binding: t; -*-
+;; author Craig Jennings <c@cjennings.net>
;;; Commentary:
;;
diff --git a/modules/flyspell-config.el b/modules/flyspell-config.el
index e97350d6..89fd25a1 100644
--- a/modules/flyspell-config.el
+++ b/modules/flyspell-config.el
@@ -1,4 +1,5 @@
;;; flyspell-config.el --- Spell Check Configuration -*- lexical-binding: t; -*-
+;; author Craig Jennings <c@cjennings.net>
;;; Commentary:
diff --git a/modules/font-config.el b/modules/font-config.el
index 3d56d63c..7da2e8af 100644
--- a/modules/font-config.el
+++ b/modules/font-config.el
@@ -31,6 +31,9 @@
(FiraCode-Literata
:default-family "Fira Code Nerd Font"
:variable-pitch-family "Literata")
+ (Merriweather
+ :default-family "Merriweather"
+ :variable-pitch-family "Merriweather")
(24-point-font
:default-height 240)
(20-point-font
diff --git a/modules/games-config.el b/modules/games-config.el
index 030fce93..f7a3b652 100644
--- a/modules/games-config.el
+++ b/modules/games-config.el
@@ -1,4 +1,5 @@
;;; games-config.el --- emacs games -*- lexical-binding: t; -*-
+;; author Craig Jennings <c@cjennings.net>
;;; Commentary:
;; The games menu is the easiest entry. "Shift-Alt-G" will get you there. Enjoy!
diff --git a/modules/host-environment.el b/modules/host-environment.el
index 20986b1a..012794b5 100644
--- a/modules/host-environment.el
+++ b/modules/host-environment.el
@@ -1,4 +1,5 @@
;;; host-environment.el --- Host Environment Convenience Functions -*- lexical-binding: t; -*-
+;; author Craig Jennings <c@cjennings.net>
;;; Commentary:
;; Convenience functions to report about the host environment
diff --git a/modules/ledger-config.el b/modules/ledger-config.el
index 21f7fb81..e2969dd7 100644
--- a/modules/ledger-config.el
+++ b/modules/ledger-config.el
@@ -1,4 +1,5 @@
;;; ledger-config.el --- Ledger Configuration -*- lexical-binding: t; -*-
+;; author Craig Jennings <c@cjennings.net>
;;; Commentary:
diff --git a/modules/local-repository.el b/modules/local-repository.el
index 99e95c83..f99e20a1 100644
--- a/modules/local-repository.el
+++ b/modules/local-repository.el
@@ -1,4 +1,5 @@
;;; local-repository.el --- local repository functionality -*- lexical-binding: t; -*-
+;; author Craig Jennings <c@cjennings.net>
;;; Commentary:
diff --git a/modules/org-babel-config.el b/modules/org-babel-config.el
index 01b1e5a1..8bd7a6ed 100644
--- a/modules/org-babel-config.el
+++ b/modules/org-babel-config.el
@@ -1,4 +1,5 @@
;;; org-babel-config.el --- Org Babel/Tempo Config -*- lexical-binding: t; -*-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; All Org-Babel and Org-Tempo Packages, Settings, and Languages.
diff --git a/modules/org-capture-config.el b/modules/org-capture-config.el
index cc246be7..b035752b 100644
--- a/modules/org-capture-config.el
+++ b/modules/org-capture-config.el
@@ -1,4 +1,5 @@
;;; org-capture-config.el --- Org Capture Configuration -*- lexical-binding: t; -*-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; Customizations related to org-capture and org-refile is here.
diff --git a/modules/org-contacts-config.el b/modules/org-contacts-config.el
index 676b901d..f6f14c80 100644
--- a/modules/org-contacts-config.el
+++ b/modules/org-contacts-config.el
@@ -1,5 +1,5 @@
;;; org-contacts-config.el --- Org Contacts Customizations -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; Configuration for Org Contacts.
diff --git a/modules/org-drill-config.el b/modules/org-drill-config.el
index 1a42cdfa..5b1828db 100644
--- a/modules/org-drill-config.el
+++ b/modules/org-drill-config.el
@@ -1,4 +1,5 @@
;;; org-drill-config.el --- Org Drill Settings -*- lexical-binding: t; -*-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;;
;; Notes: Org-Drill
diff --git a/modules/org-export-config.el b/modules/org-export-config.el
index 4f7db412..b1967170 100644
--- a/modules/org-export-config.el
+++ b/modules/org-export-config.el
@@ -1,5 +1,5 @@
;;; org-export-config.el --- Org Export Configuration -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;;; Code:
diff --git a/modules/org-refile-config.el b/modules/org-refile-config.el
index cc5653f1..10d391bf 100644
--- a/modules/org-refile-config.el
+++ b/modules/org-refile-config.el
@@ -1,5 +1,5 @@
;;; org-refile-config.el --- Org Refile Customizations -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; Configuration and custom functions for org-mode refiling.
diff --git a/modules/org-roam-config.el b/modules/org-roam-config.el
index e7d7b980..be0c0876 100644
--- a/modules/org-roam-config.el
+++ b/modules/org-roam-config.el
@@ -1,5 +1,5 @@
;;; org-roam-config.el --- Org-Roam Config -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; Currently a work in progress. The initial version of this was taken from David Wilson:
;; https://systemcrafters.net/build-a-second-brain-in-emacs/5-org-roam-hacks/
diff --git a/modules/prog-comments.el b/modules/prog-comments.el
index 62193d6f..0e022c4b 100644
--- a/modules/prog-comments.el
+++ b/modules/prog-comments.el
@@ -1,5 +1,5 @@
;;; prog-comments.el --- Comments and Underscores -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; Simple utility functions for creating and managing comments.
diff --git a/modules/prog-training.el b/modules/prog-training.el
index bada3a0b..b12fbaca 100644
--- a/modules/prog-training.el
+++ b/modules/prog-training.el
@@ -1,5 +1,5 @@
;;; prog-training.el --- Training -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;;
diff --git a/modules/prog-webdev.el b/modules/prog-webdev.el
index 2d5fc5da..391edc05 100644
--- a/modules/prog-webdev.el
+++ b/modules/prog-webdev.el
@@ -1,5 +1,5 @@
;;; prog-webdev.el --- Web Development Packages and Settings -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;;
diff --git a/modules/reconcile-open-repos.el b/modules/reconcile-open-repos.el
index ed7c08a6..044ecdee 100644
--- a/modules/reconcile-open-repos.el
+++ b/modules/reconcile-open-repos.el
@@ -1,5 +1,5 @@
;;; reconcile-open-repos.el --- reconcile open repos -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; I have tried to keep this Emacs config as general as possible, and move all
;; config related to my personal workflows here.
diff --git a/modules/record-desktop.el b/modules/record-desktop.el
index 6c5a4fac..8e4c0528 100644
--- a/modules/record-desktop.el
+++ b/modules/record-desktop.el
@@ -1,5 +1,5 @@
;;; record-desktop.el --- Video Record desktop -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; Use ffmpeg to video record your desktop.
;; with audio from mic and audio from default audio sink
diff --git a/modules/system-utils.el b/modules/system-utils.el
index e76cd54c..605a2a1c 100644
--- a/modules/system-utils.el
+++ b/modules/system-utils.el
@@ -130,19 +130,16 @@ Don't automatically display output buffers, but keep them in buffer list."
(setq openwith-associations
(list
(list (openwith-make-extension-regexp
- '("mpg" "mpeg" "mp3" "mp4" "webp"
- "avi" "wmv" "wav" "mov" "flv"
- "ogm" "ogg" "mkv"))
+ '("mpg" "mpeg" "mp3" "mp4" "webm" "avi" "wmv" "wav" "mov" "flv" "ogm" "ogg" "mkv"))
"mpv"
'(file))
;; removed jpg from list below as dashboard was opening nxiv
(list (openwith-make-extension-regexp
- '("xbm" "pbm" "pgm" "ppm" "pnm"
- "png" "gif" "bmp" "tif"))
+ '("xbm" "pbm" "pgm" "ppm" "pnm" "png" "gif" "bmp" "tif"))
"nsxiv"
'(file))
(list (openwith-make-extension-regexp
- '("odt" "odf"))
+ '("odt" "odf" "xls" "xlsx" "doc" "docx"))
"libreoffice"
'(file))
(list (openwith-make-extension-regexp
diff --git a/modules/telegram-config.el b/modules/telegram-config.el
index 6e1da03b..2de395fc 100644
--- a/modules/telegram-config.el
+++ b/modules/telegram-config.el
@@ -1,5 +1,5 @@
;;; telegram-config.el --- Configuration for the Telegram Client -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; Telegram Client Setup Notes
diff --git a/modules/test-code.el b/modules/test-code.el
index 7a6c80e1..f429de8d 100644
--- a/modules/test-code.el
+++ b/modules/test-code.el
@@ -1,4 +1,5 @@
;;; test-code.el --- test code -*- lexical-binding: t; -*-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; This is where you should put config code you want to test.
diff --git a/modules/tramp-config.el b/modules/tramp-config.el
index 0ae52db3..6c3fff5a 100644
--- a/modules/tramp-config.el
+++ b/modules/tramp-config.el
@@ -1,4 +1,5 @@
;;; tramp-config.el --- Tramp Configuration -*- lexical-binding: t; -*-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;;
diff --git a/modules/treesitter-config.el b/modules/treesitter-config.el
index 1ceabb78..341a3a31 100644
--- a/modules/treesitter-config.el
+++ b/modules/treesitter-config.el
@@ -1,4 +1,5 @@
;;; treesitter-config.el --- Treesitter Code Highlighting Configuration -*- lexical-binding: t; -*-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; Tree-sitter's now built into Emacs 29+
diff --git a/modules/ui-theme.el b/modules/ui-theme.el
index 8d83ac50..9ffbcc16 100644
--- a/modules/ui-theme.el
+++ b/modules/ui-theme.el
@@ -1,5 +1,5 @@
;;; ui-theme.el --- UI Theme Configuration and Persistence -*- lexical-binding: t; -*-
-;; Craig Jennings <c@cjennings.net>
+;; author: Craig Jennings <c@cjennings.net>
;;
;;; Commentary:
diff --git a/modules/user-constants.el b/modules/user-constants.el
index a94091ad..9c401775 100644
--- a/modules/user-constants.el
+++ b/modules/user-constants.el
@@ -1,5 +1,5 @@
;;; user-constants.el --- User Constants -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; User file locations are defined here. A file or directory is created if it
diff --git a/modules/vc-config.el b/modules/vc-config.el
index 4205b0e0..0235482b 100644
--- a/modules/vc-config.el
+++ b/modules/vc-config.el
@@ -1,6 +1,6 @@
;;; vc-config.el --- Version Control Configuration -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;; C-x g is my general entry to Magit's version control via the status page.
diff --git a/modules/weather-config.el b/modules/weather-config.el
index 70fda92c..0c4ad0cb 100644
--- a/modules/weather-config.el
+++ b/modules/weather-config.el
@@ -1,5 +1,5 @@
;;; weather-config.el --- -*- lexical-binding: t; -*-
-
+;; author: Craig Jennings <c@cjennings.net>
;;; Commentary:
;;