Andrew Tropin: 1 Change modules placement, migrate to new elisp service. 9 files changed, 18 insertions(+), 11 deletions(-)
You're a life saver. Thanks so much! I'll try it out now!
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.sr.ht/~abcdw/rde-discuss/patches/32223/mbox | git am -3Learn more about email & git
--- IIRC in scheme, file path should follow the module name. The errors are cryptic indeed and IDK a good solution to it yet. Also, I'm not aware of a good debug techniques for such cases. The patch below allows to build your home environment, at least the build starts without errors, I didn't wait until the end of it. config.scm | 1 + base-features.scm => config/base.scm | 10 ++++++---- {features => config/features}/emacs-xyz.scm | 12 ++++++++---- {features => config/features}/games.scm | 0 {features => config/features}/linux.scm | 0 {features => config/features}/wm.scm | 0 geekcave.scm => config/geekcave.scm | 4 ++-- packages.scm => config/packages.scm | 0 workhorse.scm => config/workhorse.scm | 2 +- 9 files changed, 18 insertions(+), 11 deletions(-) rename base-features.scm => config/base.scm (97%) rename {features => config/features}/emacs-xyz.scm (98%) rename {features => config/features}/games.scm (100%) rename {features => config/features}/linux.scm (100%) rename {features => config/features}/wm.scm (100%) rename geekcave.scm => config/geekcave.scm (97%) rename packages.scm => config/packages.scm (100%) rename workhorse.scm => config/workhorse.scm (97%) diff --git a/config.scm b/config.scm index 26e9e29..c785f0f 100644 --- a/config.scm +++ b/config.scm @@ -1,5 +1,6 @@ (define-module (config) #:use-module (config geekcave) + #:use-module (ice-9 match) #:use-module (rde features)) (define geekcave-os diff --git a/base-features.scm b/config/base.scm similarity index 97% rename from base-features.scm rename to config/base.scm index d27bdaa..ff79c69 100644 --- a/base-features.scm +++ b/config/base.scm @@ -11,8 +11,8 @@ #:use-module (ice-9 match) #:use-module (config features emacs-xyz) #:use-module (config features linux) - #:use-module (config geekcave) - #:use-module (config workhorse) + ;; #:use-module (config geekcave) + ;; #:use-module (config workhorse) #:use-module (rde features base) #:use-module (rde features emacs) #:use-module (rde features fontutils) @@ -30,7 +30,8 @@ #:use-module (rde features xdg) #:use-module (rde features xdisorg) #:use-module (rde features) - #:export ( + #:export (pkgs + %base-system-packages %base-home-packages @@ -126,7 +127,7 @@ ;;; Terminal, shell (feature-zsh) (feature-vterm) - (feature-alacritty #:config-file (local-file "./config/alacritty/alacritty.yml") + (feature-alacritty #:config-file (local-file "./alacritty/alacritty.yml") #:default-terminal? #f) ;;; Emacs @@ -166,6 +167,7 @@ ;;; Fonts (feature-fonts #:font-monospace (font "Iosevka" #:size 15 #:weight 'semi-light)) + (feature-desktop-services) (feature-pipewire) (feature-rofi) (feature-xdg #:xdg-user-directories-configuration diff --git a/features/emacs-xyz.scm b/config/features/emacs-xyz.scm similarity index 98% rename from features/emacs-xyz.scm rename to config/features/emacs-xyz.scm index 3e1a1bb..771dcfd 100644 --- a/features/emacs-xyz.scm +++ b/config/features/emacs-xyz.scm @@ -91,8 +91,9 @@ (define (get-home-services config) (list - (elisp-configuration-service + (rde-elisp-configuration-service emacs-f-name + config `((eval-when-compile (require 'js) (require 'js2-mode) @@ -214,8 +215,9 @@ (define (get-home-services config) (list - (elisp-configuration-service + (rde-elisp-configuration-service emacs-f-name + config `((eval-when-compile (require 'evil) (require 'evil-collection)) @@ -251,8 +253,9 @@ with Emacs as an editor." (define (get-home-services config) (list - (elisp-configuration-service + (rde-elisp-configuration-service emacs-f-name + config `((eval-when-compile (require 'smartparens-config)) (add-hook 'prog-mode-hook 'smartparens-mode) (with-eval-after-load @@ -283,8 +286,9 @@ with Emacs as an editor." (define (get-home-services config) (list - (elisp-configuration-service + (rde-elisp-configuration-service emacs-f-name + config `((require 'tramp) (defun rde-delete-this-file (&optional path force-p) "Delete PATH, kill its buffers and expunge it from vc/magit cache. diff --git a/features/games.scm b/config/features/games.scm similarity index 100% rename from features/games.scm rename to config/features/games.scm diff --git a/features/linux.scm b/config/features/linux.scm similarity index 100% rename from features/linux.scm rename to config/features/linux.scm diff --git a/features/wm.scm b/config/features/wm.scm similarity index 100% rename from features/wm.scm rename to config/features/wm.scm diff --git a/geekcave.scm b/config/geekcave.scm similarity index 97% rename from geekcave.scm rename to config/geekcave.scm index 8d1acb5..50d21be 100644 --- a/geekcave.scm +++ b/config/geekcave.scm @@ -9,8 +9,8 @@ #:use-module (rde features system) #:use-module (rde features fontutils) #:use-module (rde features wm) - #:use-module (personal features games) - #:use-module (personal features wm) + #:use-module (config features games) + #:use-module (config features wm) #:export (geekcave-config)) (define geekcave-sway-config diff --git a/packages.scm b/config/packages.scm similarity index 100% rename from packages.scm rename to config/packages.scm diff --git a/workhorse.scm b/config/workhorse.scm similarity index 97% rename from workhorse.scm rename to config/workhorse.scm index 53e754e..a14afb6 100644 --- a/workhorse.scm +++ b/config/workhorse.scm @@ -1,4 +1,4 @@ -(define-module (personal workhorse) +(define-module (config workhorse) #:use-module (gnu packages) #:use-module (gnu system file-systems) #:use-module (nongnu packages linux) -- 2.36.0
You're a life saver. Thanks so much! I'll try it out now!