From 7df5b0e507ba2e1df2288c52d0b3de206ef02104 Mon Sep 17 00:00:00 2001 From: finga Date: Mon, 10 Mar 2025 17:45:24 +0100 Subject: [PATCH 1/3] Move config files to XDG-compatible path Move config files to XDG-compatible path: `$HOME/.config/emacs`. --- {.emacs.d => .config/emacs}/config/backups.el | 2 +- {.emacs.d => .config/emacs}/config/base.el | 0 {.emacs.d => .config/emacs}/config/c.el | 0 {.emacs.d => .config/emacs}/config/calendar.el | 0 {.emacs.d => .config/emacs}/config/dev.el | 0 {.emacs.d => .config/emacs}/config/ediff.el | 0 {.emacs.d => .config/emacs}/config/functions.el | 0 {.emacs.d => .config/emacs}/config/git.el | 0 {.emacs.d => .config/emacs}/config/gpg.el | 0 {.emacs.d => .config/emacs}/config/man.el | 0 {.emacs.d => .config/emacs}/config/multiple-cursors.el | 0 {.emacs.d => .config/emacs}/config/org.el | 0 {.emacs.d => .config/emacs}/config/pass.el | 0 {.emacs.d => .config/emacs}/config/python.el | 0 {.emacs.d => .config/emacs}/config/ripgrep.el | 0 {.emacs.d => .config/emacs}/config/rust.el | 0 {.emacs.d => .config/emacs}/config/tramp.el | 0 {.emacs.d => .config/emacs}/config/yaml.el | 0 {.emacs.d => .config/emacs}/init.el | 4 ++-- 19 files changed, 3 insertions(+), 3 deletions(-) rename {.emacs.d => .config/emacs}/config/backups.el (80%) rename {.emacs.d => .config/emacs}/config/base.el (100%) rename {.emacs.d => .config/emacs}/config/c.el (100%) rename {.emacs.d => .config/emacs}/config/calendar.el (100%) rename {.emacs.d => .config/emacs}/config/dev.el (100%) rename {.emacs.d => .config/emacs}/config/ediff.el (100%) rename {.emacs.d => .config/emacs}/config/functions.el (100%) rename {.emacs.d => .config/emacs}/config/git.el (100%) rename {.emacs.d => .config/emacs}/config/gpg.el (100%) rename {.emacs.d => .config/emacs}/config/man.el (100%) rename {.emacs.d => .config/emacs}/config/multiple-cursors.el (100%) rename {.emacs.d => .config/emacs}/config/org.el (100%) rename {.emacs.d => .config/emacs}/config/pass.el (100%) rename {.emacs.d => .config/emacs}/config/python.el (100%) rename {.emacs.d => .config/emacs}/config/ripgrep.el (100%) rename {.emacs.d => .config/emacs}/config/rust.el (100%) rename {.emacs.d => .config/emacs}/config/tramp.el (100%) rename {.emacs.d => .config/emacs}/config/yaml.el (100%) rename {.emacs.d => .config/emacs}/init.el (96%) diff --git a/.emacs.d/config/backups.el b/.config/emacs/config/backups.el similarity index 80% rename from .emacs.d/config/backups.el rename to .config/emacs/config/backups.el index 0b3e48b..7f5d39e 100644 --- a/.emacs.d/config/backups.el +++ b/.config/emacs/config/backups.el @@ -1,5 +1,5 @@ ;; configure backups -(setq backup-directory-alist '(("." . "~/.emacs.d/backups/") +(setq backup-directory-alist '(("." . "~/.config/emacs/backups/") ("/dev/shm" . "/dev/null")) backup-by-copying t delete-old-versions t diff --git a/.emacs.d/config/base.el b/.config/emacs/config/base.el similarity index 100% rename from .emacs.d/config/base.el rename to .config/emacs/config/base.el diff --git a/.emacs.d/config/c.el b/.config/emacs/config/c.el similarity index 100% rename from .emacs.d/config/c.el rename to .config/emacs/config/c.el diff --git a/.emacs.d/config/calendar.el b/.config/emacs/config/calendar.el similarity index 100% rename from .emacs.d/config/calendar.el rename to .config/emacs/config/calendar.el diff --git a/.emacs.d/config/dev.el b/.config/emacs/config/dev.el similarity index 100% rename from .emacs.d/config/dev.el rename to .config/emacs/config/dev.el diff --git a/.emacs.d/config/ediff.el b/.config/emacs/config/ediff.el similarity index 100% rename from .emacs.d/config/ediff.el rename to .config/emacs/config/ediff.el diff --git a/.emacs.d/config/functions.el b/.config/emacs/config/functions.el similarity index 100% rename from .emacs.d/config/functions.el rename to .config/emacs/config/functions.el diff --git a/.emacs.d/config/git.el b/.config/emacs/config/git.el similarity index 100% rename from .emacs.d/config/git.el rename to .config/emacs/config/git.el diff --git a/.emacs.d/config/gpg.el b/.config/emacs/config/gpg.el similarity index 100% rename from .emacs.d/config/gpg.el rename to .config/emacs/config/gpg.el diff --git a/.emacs.d/config/man.el b/.config/emacs/config/man.el similarity index 100% rename from .emacs.d/config/man.el rename to .config/emacs/config/man.el diff --git a/.emacs.d/config/multiple-cursors.el b/.config/emacs/config/multiple-cursors.el similarity index 100% rename from .emacs.d/config/multiple-cursors.el rename to .config/emacs/config/multiple-cursors.el diff --git a/.emacs.d/config/org.el b/.config/emacs/config/org.el similarity index 100% rename from .emacs.d/config/org.el rename to .config/emacs/config/org.el diff --git a/.emacs.d/config/pass.el b/.config/emacs/config/pass.el similarity index 100% rename from .emacs.d/config/pass.el rename to .config/emacs/config/pass.el diff --git a/.emacs.d/config/python.el b/.config/emacs/config/python.el similarity index 100% rename from .emacs.d/config/python.el rename to .config/emacs/config/python.el diff --git a/.emacs.d/config/ripgrep.el b/.config/emacs/config/ripgrep.el similarity index 100% rename from .emacs.d/config/ripgrep.el rename to .config/emacs/config/ripgrep.el diff --git a/.emacs.d/config/rust.el b/.config/emacs/config/rust.el similarity index 100% rename from .emacs.d/config/rust.el rename to .config/emacs/config/rust.el diff --git a/.emacs.d/config/tramp.el b/.config/emacs/config/tramp.el similarity index 100% rename from .emacs.d/config/tramp.el rename to .config/emacs/config/tramp.el diff --git a/.emacs.d/config/yaml.el b/.config/emacs/config/yaml.el similarity index 100% rename from .emacs.d/config/yaml.el rename to .config/emacs/config/yaml.el diff --git a/.emacs.d/init.el b/.config/emacs/init.el similarity index 96% rename from .emacs.d/init.el rename to .config/emacs/init.el index c1bc485..2d154c2 100644 --- a/.emacs.d/init.el +++ b/.config/emacs/init.el @@ -40,7 +40,7 @@ (require 'use-package) ;; file used for storing customization information -(setq custom-file "~/.emacs.d/custom.el") +(setq custom-file "~/.config/emacs/custom.el") (load custom-file) ;; set auth-sources @@ -61,7 +61,7 @@ symbols, which are converted to strings, and suffixed with \".el\"." :group 'config-snippets :type '(repeat (choice symbol string))) -(defcustom config-snippet-path '("~/.emacs.d/config/") +(defcustom config-snippet-path '("~/.config/emacs/config/") "Specifies the path in which config snippets are searched" :group 'config-snippets :type '(repeat directory)) From e6a1229e83c9c32b4549823317db69c04cbbd1f0 Mon Sep 17 00:00:00 2001 From: finga Date: Mon, 10 Mar 2025 17:46:33 +0100 Subject: [PATCH 2/3] init: Improve logging When generating the log messages when loading config files generate more realistic file names. --- .config/emacs/init.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 2d154c2..b35952e 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -86,9 +86,9 @@ symbols, which are converted to strings, and suffixed with \".el\"." wl yaml)) -(message "Loading\nconfig-snippets: %s\nconfig-snippets-path: %s" config-snippets config-snippet-path) +(message "Loading\nconfig-snippets: %s\nconfig-snippets-path: %s.el" config-snippets config-snippet-path) (dolist (snippet config-snippets) - (message "snippet: %s" snippet) + (message "snippet: %s.el" snippet) (dolist (dir config-snippet-path) (message "dir: %s" dir) (let ((file-name (expand-file-name (concat dir (if (symbolp snippet) @@ -97,4 +97,4 @@ symbols, which are converted to strings, and suffixed with \".el\"." (message "loading file") (if (file-readable-p file-name) (load-file file-name) - (message "Config snippet not found: %s" snippet))))) + (message "Config snippet not found: %s.el" snippet))))) From a4ee1d8885323f3f6593d7ea232bd5fde99c0fdf Mon Sep 17 00:00:00 2001 From: finga Date: Mon, 10 Mar 2025 17:48:02 +0100 Subject: [PATCH 3/3] init: Remove wanderlust config --- .config/emacs/init.el | 1 - 1 file changed, 1 deletion(-) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index b35952e..80ff134 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -83,7 +83,6 @@ symbols, which are converted to strings, and suffixed with \".el\"." ripgrep rust tramp - wl yaml)) (message "Loading\nconfig-snippets: %s\nconfig-snippets-path: %s.el" config-snippets config-snippet-path)