modules/rosenthal/examples/emacs/editing.el

@@ -84,17 +84,6 @@
   :bind
   ("C-c e" . macrostep-expand))
 
-;;guix:emacs-macrostep-geiser
-(use-package macrostep-geiser
-  :after (geiser-mode)
-  :hook
-  (geiser-mode . macrostep-geiser-setup))
-
-(use-package macrostep-geiser
-  :after (geiser-repl)
-  :hook
-  (geiser-repl-mode . macrostep-geiser-setup))
-
 ;;guix:emacs-puni
 (use-package puni
   :hook

modules/rosenthal/examples/emacs/init.el

@@ -25,10 +25,10 @@
   ;; Workaround to use fish as login shell.
   (shell-file-name "/bin/sh"))
 
-(load-file (locate-user-emacs-file "init-fonts.el"))
-(load-file (locate-user-emacs-file "init-interface.el"))
-(load-file (locate-user-emacs-file "init-editing.el"))
-(load-file (locate-user-emacs-file "init-miscellaneous.el"))
+(load-file (locate-user-emacs-file "fonts.el"))
+(load-file (locate-user-emacs-file "interface.el"))
+(load-file (locate-user-emacs-file "editing.el"))
+(load-file (locate-user-emacs-file "miscellaneous.el"))
 
 
 ;;;
@@ -39,7 +39,6 @@
   (setopt initial-scratch-message
           ";;; Type your Guile program here and evaluate it.\n\n")
   (scheme-mode)
-  (geiser-repl-import-module "(gnu)")
   (geiser-repl-import-module "(nonguix)")
   (geiser-repl-import-module "(rosenthal)")
   (delete-window)

modules/rosenthal/examples/niri.kdl

@@ -631,7 +631,7 @@ binds {
 
 
 // Start user Shepherd
-spawn-at-startup "shepherd"
+spawn-at-startup "sh" "-c" "pgrep --uid $USER shepherd > /dev/null || shepherd"
 
 overview {
     backdrop-color "#D2DEE9"

modules/rosenthal/packages/wm.scm

@@ -48,7 +48,7 @@
     (arguments
      (list
       #:install-plan
-      #~'(("." "etc/xdg/quickshell/noctalia-shell"))
+      #~'(("." "share/noctalia-shell"))
       #:imported-modules
       `((guix build qt-utils)
         ,@%copy-build-system-modules)
@@ -71,7 +71,7 @@
                   (lambda ()
                     (format #t "~
 #!~a
-exec ~a --config ~a/etc/xdg/quickshell/noctalia-shell \"$@\"~%"
+exec ~a --path ~a/share/noctalia-shell \"$@\"~%"
                             (search-input-file inputs "bin/sh")
                             (search-input-file inputs "bin/quickshell")
                             #$output)))

modules/rosenthal/services/base.scm

@@ -9,7 +9,6 @@
 
   #:use-module (gnu services base)
 
-  #:use-module (gnu packages admin)
   #:use-module (gnu packages bash)
   #:use-module (rosenthal packages admin)
   #:export (greetd-tuigreet-session))
@@ -19,7 +18,7 @@
   greetd-tuigreet-session?
   this-greetd-tuigreet-session
   (tuigreet greetd-tuigreet-session-tuigreet
-            (default tuigreet))
+            (default (spec->pkg "tuigreet")))
   (args     greetd-tuigreet-session-args
             (default '("--issue"
                        "--time"

modules/rosenthal/services/desktop.scm

@@ -30,14 +30,6 @@
   #:use-module (gnu home services shepherd)
   #:use-module (gnu home services sound)
 
-  #:use-module (gnu packages fcitx5)
-  #:use-module (gnu packages fonts)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages networking)
-  #:use-module (gnu packages qt)
-  #:use-module (gnu packages wm)
-  #:use-module (gnu packages xorg)
   #:use-module (rosenthal packages wm)
   #:use-module (rosenthal packages xorg)
 
@@ -83,7 +75,7 @@
 
 (define-configuration/no-serialization home-blueman-applet-configuration
   (blueman
-   (file-like blueman)
+   (file-like (spec->pkg+out "blueman"))
    ""))
 
 (define %home-blueman-applet-shepherd
@@ -119,10 +111,10 @@
 
 (define-configuration/no-serialization home-fcitx5-configuration
   (fcitx5
-   (file-like fcitx5)
+   (file-like (spec->pkg   "fcitx5"))
    "")
   (utilities
-   (list-of-file-likes (list fcitx5-configtool))
+   (list-of-file-likes (specs->pkgs "fcitx5-configtool"))
    "")
   (themes
    (list-of-file-likes '())
@@ -161,10 +153,10 @@
             themes
             input-method-editors
             (if gtk-im-module?
-                (list fcitx5-gtk)
+                (list (spec->pkg "fcitx5-gtk"))
                 '())
             (if qt-im-module?
-                (list fcitx5-qt)
+                (list (spec->pkg "fcitx5-qt"))
                 '()))))
 
 (define %home-fcitx5-shepherd
@@ -199,7 +191,7 @@
 
 (define-configuration/no-serialization home-mako-configuration
   (mako
-   (file-like mako)
+   (file-like (spec->pkg "mako"))
    "")
   (config
    maybe-file-like
@@ -242,7 +234,7 @@
 
 (define-configuration/no-serialization home-network-manager-applet-configuration
   (network-manager-applet
-   (file-like network-manager-applet)
+   (file-like (spec->pkg "network-manager-applet"))
    ""))
 
 (define %home-network-manager-applet-shepherd
@@ -354,7 +346,7 @@ compositor.")))
 
 (define-configuration/no-serialization home-swaybg-configuration
   (swaybg
-   (file-like swaybg)
+   (file-like (spec->pkg "swaybg"))
    "")
   (background
    (file-like (local-file "../examples/wallpaper.jpg"))
@@ -414,9 +406,9 @@ compositor.")))
 (define %home-theme-profile
   (match-record-lambda <home-theme-configuration>
       (packages)
-    (cons* adwaita-icon-theme
-           hicolor-icon-theme
-           qtwayland
+    (append (specs->pkgs "adwaita-icon-theme"
+                         "hicolor-icon-theme"
+                         "qtwayland")
             packages)))
 
 (define %home-theme-files
@@ -466,7 +458,7 @@ gtk-key-theme-name = ~a~%"
 
 (define-configuration/no-serialization home-waybar-configuration
   (waybar
-   (file-like waybar)
+   (file-like (spec->pkg "waybar"))
    "")
   (config
    maybe-file-like
@@ -526,8 +518,8 @@ gtk-key-theme-name = ~a~%"
           (define* (build-keyboard-layout file layout #:optional variant #:key model options)
             (define pipe
               (apply open-pipe* OPEN_READ
-                     #$(file-append console-setup)
-                     (string-append "-I" #$xkeyboard-config "/share/X11/xkb")
+                     #$(file-append (spec->pkg "console-setup") "/bin/ckbcomp")
+                     (string-append "-I" #$(spec->pkg "xkeyboard-config") "/share/X11/xkb")
                      "-rules" "base"
                      `(,@(if model
                              '("-model" ,model)
@@ -545,7 +537,7 @@ gtk-key-theme-name = ~a~%"
               (port-filename
                (mkstemp "/tmp/console-keymap.XXXXXX")))
             (build-keyboard-layout file-name layout variant #:model model #:options options)
-            (invoke "sudo" #$(file-append kbd "/bin/loadkeys") file-name)
+            (invoke "sudo" #$(file-append (spec->pkg "kbd") "/bin/loadkeys") file-name)
             (false-if-exception
              (substitute*
                  (in-vicinity
@@ -625,14 +617,14 @@ set-keymap us dvorak -o ctrl:nocaps\n")
 (define %rosenthal-skeletons
   `((".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/fonts.el"
+     ,(local-file "../examples/emacs/fonts.el"))
+    (".config/emacs/interface.el"
+     ,(local-file "../examples/emacs/interface.el"))
+    (".config/emacs/editing.el"
+     ,(local-file "../examples/emacs/editing.el"))
+    (".config/emacs/miscellaneous.el"
+     ,(local-file "../examples/emacs/miscellaneous.el"))
 
     (".config/foot/foot.ini"
      ,(plain-file "foot.ini" "font=monospace:size=12\n"))
@@ -683,14 +675,14 @@ configuration {
              (using-setuid? #f)))
 
          ;; Add udev rules for backlight control.
-         (simple-service 'backlight udev-service-type (list light))
+         (simple-service 'backlight udev-service-type (specs->pkgs "light"))
 
          (modify-services %desktop-services
            ;; Use a font suitable for HiDPI monitors.
            (console-font-service-type
             _ => (map (lambda (num)
                         (cons (string-append "tty" (number->string num))
-                              (file-append font-terminus
+                              (file-append (spec->pkg "font-terminus")
                                            "/share/consolefonts/ter-132n")))
                       (iota 6 1))))))
 

modules/rosenthal/services/shellutils.scm

@@ -18,8 +18,6 @@
 
   #:use-module (gnu home services shells)
 
-  #:use-module (gnu packages rust-apps)
-  #:use-module (gnu packages shellutils)
   #:use-module (rosenthal packages rust-apps)
 
   #:export (home-fish-plugin-atuin-service-type
@@ -77,7 +75,7 @@
 
 (define-configuration/no-serialization home-direnv-configuration
   (direnv
-   (file-like direnv)
+   (file-like (spec->pkg "direnv"))
    "")
   (shells
    list
@@ -111,7 +109,7 @@
 
 (define-configuration/no-serialization home-zoxide-configuration
   (zoxide
-   (file-like zoxide)
+   (file-like (spec->pkg "zoxide"))
    "")
   (shells
    list