Remove %desktop-services, attempt to kill gdm for good

1 files changed, 131 insertions, 84 deletions

diff --git a/.config/guix/modules/ymir.scm b/.config/guix/modules/ymir.scm
index 199f14a..5ce2d5c 100644
--- a/.config/guix/modules/ymir.scm
+++ b/.config/guix/modules/ymir.scm
@@ -5,8 +5,20 @@
 
 (define-module (ymir)
   #:use-module (gnu)
-  #:use-module (dwm-custom))
-(use-service-modules audio desktop networking ssh xorg file-sharing)
+  #:use-module (dwm-custom)
+  #:use-module (gnu packages suckless)
+  #:use-module (gnu services)
+  #:use-module (gnu services admin)
+  #:use-module (gnu services audio)
+  #:use-module (gnu services avahi)
+  #:use-module (gnu services dbus)
+  #:use-module (gnu services desktop)
+  #:use-module (gnu services file-sharing)
+  #:use-module (gnu services networking)
+  #:use-module (gnu services sound)
+  #:use-module (gnu services ssh)
+  #:use-module (gnu services xorg)
+  )
 
 ;;;; user
 (define-public username "bdunahu")
@@ -25,85 +37,120 @@
 ;;;; base os
 (define-public ymir
   (operating-system
-    (host-name "ymir")
-    (locale "en_US.utf8")
-    (timezone "America/Denver")
-    (keyboard-layout (keyboard-layout "us"))
-    (kernel-arguments
-     (list
-      "quiet"))
-
-    ;; 'root' is implicit
-    (users (cons* user
-                  %base-user-accounts))
-
-    ;; grub (uefi)
-    (bootloader (bootloader-configuration
-                 (bootloader grub-efi-bootloader)
-                 (targets (list "/boot/efi"))
-                 (keyboard-layout keyboard-layout)))
-
-    ;; packages installed system-wide.
-    (packages `(,@(map specification->package
-                       '("cryptsetup"
-                         "curl"
-                         "dmenu"
-                         "emacs"
-                         "git"
-                         "gtk+"
-                         "icecat"
-                         "imagemagick"
-                         "libnotify"
-                         "mpd"
-                         "mpd-mpc"
-                         ;; "nss-certs" ;; was moved to base-packages
-                         "pass-otp"
-                         "password-store"
-                         "pavucontrol"
-                         "picom"
-                         "pinentry"
-                         "pulseaudio"
-                         "recutils"
-                         "sxiv"
-                         "vim"
-                         "xmodmap"
-                         "xrdb"))
-                ,@%base-packages
-                ,dwm-packages))
-
-    ;; base system services.
-    (services
-     (append (list
-              (service openssh-service-type
-                       (openssh-configuration
-                        (x11-forwarding? #t)
-                        (permit-root-login 'prohibit-password)
-                        (password-authentication? #f)))
-              (service tor-service-type)
-              (service transmission-daemon-service-type)
-              (service mpd-service-type
-                       (mpd-configuration
-                        (user user)
-                        (music-directory "~/Personal/mpd/music")
-                        (playlist-directory "~/Personal/mpd/playlist")
-                        (default-port 6600)))
-              ;; (service elogind-service-type
-              ;;          (elogind-configuration
-              ;;           (handle-power-key 'hibernate)
-              ;;           (idle-action-seconds (* 5 60))
-              ;;           (idle-action 'suspend)))
-              (set-xorg-configuration
-               (xorg-configuration (keyboard-layout keyboard-layout))))
-
-             ;; This is the default list of services we
-             ;; are appending to.
-             %desktop-services))
-
-    ;; OVERRIDE ME
-    (file-systems (cons*
-                   (file-system
-                     (mount-point "/")
-                     (device "none")
-                     (type "tmpfs")
-                     (check? #f))
-                   %base-file-systems))))
+   (host-name "ymir")
+   (locale "en_US.utf8")
+   (timezone "America/Denver")
+   (keyboard-layout (keyboard-layout "us"))
+   (kernel-arguments
+    (list
+     "quiet"))
+
+   ;; 'root' is implicit
+   (users (cons* user
+                 %base-user-accounts))
+
+   ;; grub (uefi)
+   (bootloader (bootloader-configuration
+                (bootloader grub-efi-bootloader)
+                (targets (list "/boot/efi"))
+                (keyboard-layout keyboard-layout)))
+
+   ;; packages installed system-wide.
+   (packages `(,@(map specification->package
+                      '(
+                        "cryptsetup"
+                        "curl"
+                        "dmenu"
+                        "emacs"
+                        "git"
+                        "gtk+"
+                        "icecat"
+                        "imagemagick"
+                        "libnotify"
+                        "mpd"
+                        "mpd-mpc"
+                        "pass-otp"
+                        "password-store"
+                        "pavucontrol"
+                        "pinentry"
+                        "pulseaudio"
+                        "recutils"
+                        "sxiv"
+                        "vim"
+                        ))
+               ,@%base-packages
+               ,dwm-packages))
+
+   ;; base system services.
+   (services
+    (cons*
+     (service openssh-service-type
+              (openssh-configuration
+               (x11-forwarding? #t)
+               (permit-root-login 'prohibit-password)
+               (password-authentication? #f)))
+     (service tor-service-type)
+     (service transmission-daemon-service-type)
+     (service mpd-service-type
+              (mpd-configuration
+               (user user)
+               (music-directory "~/Personal/mpd/music")
+               (playlist-directory "~/Personal/mpd/playlist")
+               (default-port 6600)))
+     (set-xorg-configuration
+      (xorg-configuration (keyboard-layout keyboard-layout)))
+
+     (service screen-locker-service-type
+              (screen-locker-configuration
+               (name "slock")
+               (program (file-append slock "/bin/slock"))))
+
+     ;; so that non-root users in the wheel group can
+     ;; perform administrative tasks (similar to "sudo").
+     polkit-wheel-service
+     ;; The global fontconfig cache directory can sometimes contain
+     ;; stale entries, possibly referencing fonts that have been GC'd,
+     ;; so mount it read-only.
+     fontconfig-file-system-service
+
+     (service network-manager-service-type)
+     (service wpa-supplicant-service-type) ; needed by NetworkManager
+     ;; (simple-service 'network-manager-applet
+     ;;                 profile-service-type
+     ;;                 (list network-manager-applet))
+     (service modem-manager-service-type)
+     (service usb-modeswitch-service-type)
+
+     ;; The D-Bus clique.
+     (service avahi-service-type)
+     (service udisks-service-type)
+     (service upower-service-type)
+     (service accountsservice-service-type)
+     (service cups-pk-helper-service-type)
+     (service colord-service-type)
+     (service geoclue-service-type)
+     (service polkit-service-type)
+     (service elogind-service-type
+              (elogind-configuration
+               (handle-power-key 'hibernate)
+               (idle-action-seconds (* 5 60))
+               (idle-action 'suspend)))
+     (service dbus-root-service-type)
+
+     (service ntp-service-type)
+
+     (service x11-socket-directory-service-type)
+
+     (service pulseaudio-service-type)
+     (service alsa-service-type)
+
+     %base-services))
+
+   ;; OVERRIDE ME
+   (file-systems (cons*
+                  (file-system
+                   (mount-point "/")
+                   (device "none")
+                   (type "tmpfs")
+                   (check? #f))
+                  %base-file-systems))))