diff options
| author |  Tom Willemse | 2026-09-12 02:43:01 -0700 |
|---|---|---|
| committer | Tom Willemse | 2026-09-12 02:43:01 -0700 |
| commit | 7a1f7faaa371bb7be6309fcf4e4c5f89c5bbf0e7 (patch) | |
| tree | 08544ed7c8bab8d7fc700ecd3d6a37898ebe8ca7 | |
| parent | f8b1af8d5869a463a6925c5d9f2ebadfacfbe440 (diff) | |
| download | new-dotfiles-7a1f7faaa371bb7be6309fcf4e4c5f89c5bbf0e7.tar.gz new-dotfiles-7a1f7faaa371bb7be6309fcf4e4c5f89c5bbf0e7.zip | |
emacs: Fix warnings about resolving relative files
This was taken from the ‘(gnu home services dotfiles)’ module, which does the
same thing for dotfiles.
| -rw-r--r-- | oni/home/config/rincewind.scm | 2 | ||||
| -rw-r--r-- | oni/home/services/emacs.scm | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm index 1f58442..4185a7a 100644 --- a/oni/home/config/rincewind.scm +++ b/oni/home/config/rincewind.scm @@ -242,7 +242,7 @@ (yasnippet-capf (home-emacs-yasnippet-capf-configuration)) (yasnippet-snippet-directories - '("emacs/.emacs.d/snippets")) + '("../../../emacs/.emacs.d/snippets")) (envrc (home-emacs-envrc-configuration)) (configurations diff --git a/oni/home/services/emacs.scm b/oni/home/services/emacs.scm index 4e142c1..0e20a5b 100644 --- a/oni/home/services/emacs.scm +++ b/oni/home/services/emacs.scm @@ -40,6 +40,7 @@ mixed-text-file)) #:use-module ((guix packages) #:select (package?)) + #:use-module (guix utils) #:use-module (oni packages emacs) #:use-module ((rosenthal packages binaries) #:select (wakatime-cli-bin)) @@ -261,9 +262,15 @@ (stop #~(make-kill-destructor))))) (define (home-emacs-configuration-collect-snippets config) + (define (resolve directory) + (if (string-prefix? "/" directory) + directory + (in-vicinity (current-source-directory) directory))) + (define (collect-snippets-from-dir dir) - (let* ((snippets (file-system-tree dir)) - (base-prefix (string-drop-right dir (string-length (car snippets))))) + (let* ((absolute-dir (resolve dir)) + (snippets (file-system-tree absolute-dir)) + (base-prefix (string-drop-right absolute-dir (string-length (car snippets))))) (apply append (let loop ((prefix (car snippets)) (current-file (car snippets)) (files (cddr snippets))) |