From 36c789fcb8dc0f6087d04bf7ebb6574da184033b Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Thu, 12 Feb 2026 22:29:20 +0800 Subject: [PATCH] examples: Change directory layout. * Add directories dot-cache and dot-config. * Follow the layout used for %rosenthal-skeletons. --- .../noctalia}/shell-state.json | 0 .../autostart}/shepherd.desktop | 0 .../{niri.kdl => dot-config/niri/config.kdl} | 0 .../noctalia}/settings.json | 0 .../{ => dot-config/wezterm}/wezterm.lua | 0 .../examples/dot-config/xfce4/helpers.rc | 1 + modules/rosenthal/services/desktop.scm | 52 +++++++++---------- 7 files changed, 26 insertions(+), 27 deletions(-) rename modules/rosenthal/examples/{noctalia-shell => dot-cache/noctalia}/shell-state.json (100%) rename modules/rosenthal/examples/{ => dot-config/autostart}/shepherd.desktop (100%) rename modules/rosenthal/examples/{niri.kdl => dot-config/niri/config.kdl} (100%) rename modules/rosenthal/examples/{noctalia-shell => dot-config/noctalia}/settings.json (100%) rename modules/rosenthal/examples/{ => dot-config/wezterm}/wezterm.lua (100%) create mode 100644 modules/rosenthal/examples/dot-config/xfce4/helpers.rc diff --git a/modules/rosenthal/examples/noctalia-shell/shell-state.json b/modules/rosenthal/examples/dot-cache/noctalia/shell-state.json similarity index 100% rename from modules/rosenthal/examples/noctalia-shell/shell-state.json rename to modules/rosenthal/examples/dot-cache/noctalia/shell-state.json diff --git a/modules/rosenthal/examples/shepherd.desktop b/modules/rosenthal/examples/dot-config/autostart/shepherd.desktop similarity index 100% rename from modules/rosenthal/examples/shepherd.desktop rename to modules/rosenthal/examples/dot-config/autostart/shepherd.desktop diff --git a/modules/rosenthal/examples/niri.kdl b/modules/rosenthal/examples/dot-config/niri/config.kdl similarity index 100% rename from modules/rosenthal/examples/niri.kdl rename to modules/rosenthal/examples/dot-config/niri/config.kdl diff --git a/modules/rosenthal/examples/noctalia-shell/settings.json b/modules/rosenthal/examples/dot-config/noctalia/settings.json similarity index 100% rename from modules/rosenthal/examples/noctalia-shell/settings.json rename to modules/rosenthal/examples/dot-config/noctalia/settings.json diff --git a/modules/rosenthal/examples/wezterm.lua b/modules/rosenthal/examples/dot-config/wezterm/wezterm.lua similarity index 100% rename from modules/rosenthal/examples/wezterm.lua rename to modules/rosenthal/examples/dot-config/wezterm/wezterm.lua diff --git a/modules/rosenthal/examples/dot-config/xfce4/helpers.rc b/modules/rosenthal/examples/dot-config/xfce4/helpers.rc new file mode 100644 index 0000000..4ea91d1 --- /dev/null +++ b/modules/rosenthal/examples/dot-config/xfce4/helpers.rc @@ -0,0 +1 @@ +TerminalEmulator=open-wezterm-here diff --git a/modules/rosenthal/services/desktop.scm b/modules/rosenthal/services/desktop.scm index 7c362a8..55b43dc 100644 --- a/modules/rosenthal/services/desktop.scm +++ b/modules/rosenthal/services/desktop.scm @@ -662,35 +662,33 @@ set-keymap us dvorak -o ctrl:nocaps\n") (license #f)))) (define %rosenthal-skeletons - `((".config/autostart/shepherd.desktop" - ,(local-file "../examples/shepherd.desktop")) + (let ((dot (lambda (dir file) + (cons + (string-append "." dir "/" file) + (local-file (string-append "../examples/dot-" dir "/" file)))))) + `((".config/emacs/init.el" + ,(local-file "../examples/emacs/init.el")) + (".config/emacs/init-fonts.el" + ,(local-file "../examples/emacs/init-fonts.el")) + (".config/emacs/init-interface.el" + ,(local-file "../examples/emacs/init-interface.el")) + (".config/emacs/init-editing.el" + ,(local-file "../examples/emacs/init-editing.el")) + (".config/emacs/init-miscellaneous.el" + ,(local-file "../examples/emacs/init-miscellaneous.el")) - (".config/emacs/init.el" - ,(local-file "../examples/emacs/init.el")) - (".config/emacs/init-fonts.el" - ,(local-file "../examples/emacs/init-fonts.el")) - (".config/emacs/init-interface.el" - ,(local-file "../examples/emacs/init-interface.el")) - (".config/emacs/init-editing.el" - ,(local-file "../examples/emacs/init-editing.el")) - (".config/emacs/init-miscellaneous.el" - ,(local-file "../examples/emacs/init-miscellaneous.el")) + ,(dot "config" "autostart/shepherd.desktop") + ,(dot "config" "niri/config.kdl") + ,(dot "config" "noctalia/settings.json") + ,(dot "config" "wezterm/wezterm.lua") + ,(dot "config" "xfce4/helpers.rc") + ;; Prevent Noctalia shell initial screen. + ,(dot "cache" "noctalia/shell-state.json") - (".config/niri/config.kdl" - ,(local-file "../examples/niri.kdl")) - (".cache/noctalia/shell-state.json" - ,(local-file "../examples/noctalia-shell/shell-state.json")) - (".config/noctalia/settings.json" - ,(local-file "../examples/noctalia-shell/settings.json")) - (".config/wezterm/wezterm.lua" - ,(local-file "../examples/wezterm.lua")) - (".config/xfce4/helpers.rc" - ,(plain-file "helpers.rc" "TerminalEmulator=open-wezterm-here\n")) - - ;; Selected from the default skeletons. - (".config/gdb/gdbinit" ,%default-gdbinit) - (".config/nano/nanorc" ,%default-nanorc) - (".guile" ,%default-dotguile))) + ;; Selected from the default skeletons. + (".config/gdb/gdbinit" ,%default-gdbinit) + (".config/nano/nanorc" ,%default-nanorc) + (".guile" ,%default-dotguile)))) ;;;