modules/rosenthal/packages/emacs-xyz.scm

@@ -57,28 +57,6 @@ editing Caddyfiles, configuration files for @code{caddy}.")
                  "14d6nvagcri0r687y3m179ijmnad89m5d5dj2rn2p6rpfc5nssr0"))))))
     (name "emacs-eat-dolly")))
 
-(define-public emacs-isearch-mb
-  (package
-    (name "emacs-isearch-mb")
-    (version "0.8")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://elpa.gnu.org/packages/isearch-mb-"
-                           version ".tar"))
-       (sha256
-        (base32 "1b4929vr5gib406p51zcvq1ysmzvnz6bs1lqwjp517kzp6r4gc5y"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/astoff/isearch-mb")
-    (synopsis "Control @code{isearch} from the minibuffer")
-    (description
-     "This Emacs package provides an alternative @code{isearch} UI based on the
-minibuffer.  This allows editing the search string in arbitrary ways without any
-special maneuver.  Unlike standard @code{isearch}, cursor motion commands do not
-end the search.  Moreover, the search status information in the echo area and
-some keybindings are slightly simplified.")
-    (license license:gpl3+)))
-
 (define-public emacs-pcmpl-tailscale
   (let ((commit "acd6bce54af506b0450cf6aa1068f63d4e25c8ce")
         (revision "0"))

modules/rosenthal/packages/wm.scm

@@ -83,17 +83,13 @@ exec ~a --path ~a/share/noctalia-shell \"$@\"~%"
                             "bin/fastfetch"
                             "bin/fc-list"
                             "bin/find"
-                            "bin/getent"
                             "bin/git"
-                            "bin/grep"
                             "bin/ls"
                             "bin/nmcli"
                             "bin/python3"
                             "bin/sh"
                             "bin/which"
-                            "bin/wl-paste"
+                            "bin/wlsunset"))))
-                            "bin/wlsunset"
-                            "bin/wtype"))))
                 (chmod script #o555)
                 (install-file script (in-vicinity #$output "bin")))))
           (add-after 'make-wrapper 'qt-wrap
@@ -112,8 +108,6 @@ exec ~a --path ~a/share/noctalia-shell \"$@\"~%"
            findutils
            fontconfig
            git-minimal
-           glibc
-           grep
            guile-3.0
            imagemagick
            network-manager
@@ -122,9 +116,7 @@ exec ~a --path ~a/share/noctalia-shell \"$@\"~%"
            qtwayland
            quickshell
            which
-           wl-clipboard
+           wlsunset))
-           wlsunset
-           wtype))
     (home-page "https://noctalia.dev/")
     (synopsis "Wayland desktop shell")
     (description

modules/rosenthal/services/desktop.scm

@@ -64,7 +64,6 @@
 
             %rosenthal-set-keymap
             %rosenthal-skeletons
-            %rosenthal-desktop-services-gdm
             %rosenthal-desktop-services
             %rosenthal-desktop-home-services))
 
@@ -654,8 +653,37 @@ configuration {
 ;;; Service presets.
 ;;;
 
-(define %rosenthal-desktop-services-gdm
+(define* (rosenthal-desktop-services-for-system
-  (cons* (service bluetooth-service-type
+          #:optional (system (or (%current-target-system)
+                                 (%current-system))))
+  (define %display-manager-service-type
+    (if (string-prefix? "x86_64" system)
+        gdm-service-type
+        sddm-service-type))
+
+  (define %term-font
+    (file-append (spec->pkg "font-terminus") "/share/consolefonts/ter-132n"))
+
+  (cons* (service greetd-service-type
+           (greetd-configuration
+             (greeter-supplementary-groups '("video" "input"))
+             (terminals
+              (map (lambda (x)
+                     (greetd-terminal-configuration
+                       (terminal-vt (number->string x))
+                       (terminal-switch (eqv? 1 x))
+                       (default-session-command
+                         (cond
+                          ((eqv? 1 x)
+                           (greetd-tuigreet-session))
+                          (else
+                           (greetd-agreety-session
+                             (command
+                              (greetd-user-session
+                                (command #~(getenv "SHELL"))))))))))
+                   (iota 6 1)))))
+
+         (service bluetooth-service-type
            (bluetooth-configuration
              (auto-enable? #t)))
 
@@ -678,45 +706,17 @@ configuration {
          (simple-service 'backlight udev-service-type (specs->pkgs "light"))
 
          (modify-services %desktop-services
+           (delete mingetty-service-type)
+           (delete %display-manager-service-type)
+           (delete screen-locker-service-type)
+
            ;; Use a font suitable for HiDPI monitors.
            (console-font-service-type
             _ => (map (lambda (num)
                         (cons (string-append "tty" (number->string num))
-                              (file-append (spec->pkg "font-terminus")
+                              %term-font))
-                                           "/share/consolefonts/ter-132n")))
                       (iota 6 1))))))
 
-(define* (rosenthal-desktop-services-for-system
-          #:optional (system (or (%current-target-system)
-                                 (%current-system))))
-  (define %display-manager-service-type
-    (if (string-prefix? "x86_64" system)
-        gdm-service-type
-        sddm-service-type))
-
-  (cons* (service greetd-service-type
-           (greetd-configuration
-             (greeter-supplementary-groups '("video" "input"))
-             (terminals
-              (map (lambda (x)
-                     (greetd-terminal-configuration
-                       (terminal-vt (number->string x))
-                       (terminal-switch (eqv? 1 x))
-                       (default-session-command
-                         (cond
-                          ((eqv? 1 x)
-                           (greetd-tuigreet-session))
-                          (else
-                           (greetd-agreety-session
-                             (command
-                              (greetd-user-session
-                                (command #~(getenv "SHELL"))))))))))
-                   (iota 6 1)))))
-
-         (modify-services %rosenthal-desktop-services-gdm
-           (delete mingetty-service-type)
-           (delete %display-manager-service-type))))
-
 (define-syntax %rosenthal-desktop-services
   (identifier-syntax (rosenthal-desktop-services-for-system)))
 
@@ -727,17 +727,7 @@ configuration {
              (auto-start? #f)
              (daemonize? #f)))
 
-         ;; NOTE: The environment variable set by ‘home-dbus-service-type’ will
+         (service home-dbus-service-type)
-         ;; prevent GNOME from starting when using above Shepherd configuration.
-         ;; Replace ‘home-dbus-service-type’, expecting the session bus will be
-         ;; started elsewhere.  See also:
-         ;; https://codeberg.org/guix/guix/issues/5899#issuecomment-10208485
-         (simple-service 'dbus home-shepherd-service-type
-           (list (shepherd-service
-                   (provision '(dbus))
-                   (start #~(const #t))
-                   (stop #~(const #f)))))
-
          (service home-pipewire-service-type)
 
          %base-home-services))