operating-systems: buer: Replace elogind by seatd and replace agetty by greetd-agreety

home-environments/radio.scm

@@ -38,6 +38,7 @@
         #:use-module (gnu packages suckless)
   #|T|# #:use-module (gnu packages telegram)
         #:use-module (gnu packages terminals)
+        #:use-module (gnu packages text-editors)
         #:use-module (gnu packages tor-browsers)
         #:use-module (gnu packages toys)
   #|V|# #:use-module (gnu packages version-control)
@@ -74,7 +75,8 @@
   #|P|# #:use-module (radix packages pdf)
   #|S|# #:use-module (radix packages seninha)
         #:use-module (radix packages syndication)
-  #|T|# #:use-module (radix packages toys)
+  #|T|# #:use-module (radix packages text-editors)
+        #:use-module (radix packages toys)
   #|W|# #:use-module (radix packages wm)
 
   #|Radix home services|#
@@ -83,65 +85,134 @@
   #|S|# #:use-module (radix home services shells)
 
   #:export (home-environment
-            browser
+
-            editor
+            application:browser
-            pager
+            application:editor
-            reader
+            application:pager
-            shell
+            application:reader
-            terminal
+            application:shell
-            wm))
+            application:terminal
+            application:wm
+
+            packages:blogging
+            packages:calendar
+            packages:databases
+            packages:desktop
+            packages:development
+            packages:documentation
+            packages:downloads
+            packages:file-managing
+            packages:fonts
+            packages:games
+            packages:image
+            packages:messaging
+            packages:password
+            packages:sound
+            packages:video
+            packages:web))
 
 #|Default applications|#
-(define browser "mullvadbrowser")
+(define application:browser "mullvadbrowser")
-(define editor "kak")
+(define application:editor "kak")
-(define pager "less")
+(define application:pager "less")
-(define reader "sioyek")
+(define application:reader "sioyek")
-(define shell "fish")
+(define application:shell "fish")
-(define terminal "foot")
+(define application:terminal "foot")
-(define wm "river")
+(define application:wm "river")
+
+(define packages:blogging
+  (list #|guile-xyz|# haunt))
+
+(define packages:calendar
+  (list #|calendar|# remind))
+
+(define packages:databases
+  (list #|databases|# recutils))
+
+(define packages:desktop
+  (list #|admin      |# hyfetch
+        #|freedesktop|# xdg-utils xdg-desktop-portal xdg-desktop-portal-wlr
+                        xdg-terminal-exec
+        #|glib       |# dbus
+        #|gnome      |# adwaita-icon-theme
+        #|image      |# grim slurp
+        #|terminals  |# foot
+        #|toys       |# wayneko
+        #|wm         |# fnott rivercarro riverguile river-bnf swww waybar
+        #|xdisorg    |# fuzzel wl-clipboard wlsunset
+        #|zig-xyz    |# river))
+
+(define packages:development
+  (list #|gnupg         |# gnupg pinentry
+        #|ssh           |# openssh
+        #|text-editors  |# kak-lsp parinfer-rust guile-lsp-server
+        #|math          |# libqalculate
+        #|vesion-control|# git))
+
+(define packages:documentation
+  (list #|c      |# c-intro-and-ref
+        #|gnu-doc|# gnu-standards
+        #|scheme |# sicp))
+
+(define packages:downloads
+  (list #|bittorrent|# aria2 qbittorrent
+        #|curl      |# curl
+        #|video     |#  yt-dlp))
+
+(define packages:file-managing
+  (list #|disk         |# lf
+        #|file         |# file
+        #|image-viewers|# chafa
+        #|pdf          |# poppler
+        #|seninha      |# fmutils
+        #|video        |# ffmpegthumbnailer))
+
+(define packages:fonts
+  (list #|fonts|# font-awesome font-google-noto font-google-noto-emoji
+                  font-juliamono font-liberation font-meslo-lg-dz font-misc-misc
+                  font-un font-wqy-zenhei))
+
+(define packages:games
+  (list #|games|# minetest supertuxkart xonotic))
+
+(define packages:image
+  (list #|image-viewers|# imv))
+
+(define packages:messaging
+  (list #|telegram|# telegram-desktop))
+
+(define packages:password
+  (list #|password-utils|# keepassxc))
+
+(define packages:reading
+  (list #|pdf        |# sioyek/wayland
+        #|syndication|# newsraft))
+
+(define packages:sound
+  (list #|linux     |# wireplumber
+        #|pulseaudio|# pamixer pavucontrol))
+
+(define packages:video
+  (list #|video|# ffmpeg mpv))
+
+(define packages:web
+  (list #|tor-browsers|# mullvadbrowser))
 
 (define home-environment
   (user-home-environment
    (packages
-    (list #|admin         |# hyfetch
+     (append #|B|# packages:blogging
-          #|bittorrent    |# aria2 qbittorrent
+             #|C|# packages:calendar
-          #|c             |# c-intro-and-ref
+             #|D|# packages:databases packages:desktop packages:development
-          #|calendar      |# remind
+                   packages:documentation packages:downloads
-          #|curl          |# curl
+             #|F|# packages:file-managing packages:fonts
-          #|disk          |# lf
+             #|G|# packages:games
-          #|databases     |# recutils
+             #|I|# packages:image
-          #|file          |# file
+             #|M|# packages:messaging
-          #|fonts         |# font-awesome font-google-noto font-google-noto-emoji
+             #|P|# packages:password
-                             font-juliamono font-liberation font-meslo-lg-dz
+             #|S|# packages:sound
-                             font-misc-misc font-un font-wqy-zenhei
+             #|V|# packages:video
-          #|freedesktop   |# xdg-utils xdg-desktop-portal xdg-desktop-portal-wlr
+             #|W|# packages:web))
-                             xdg-terminal-exec
-          #|games         |# minetest supertuxkart xonotic
-          #|glib          |# dbus
-          #|gnome         |# adwaita-icon-theme
-          #|gnu-doc       |# gnu-standards
-          #|gnupg         |# gnupg pinentry
-          #|guile-xyz     |# haunt
-          #|image         |# grim slurp
-          #|image-viewers |# chafa imv
-          #|linux         |# wireplumber
-          #|math          |# libqalculate
-          #|password-utils|# keepassxc
-          #|pdf           |# poppler sioyek/wayland
-          #|pulseaudio    |# pamixer pavucontrol
-          #|scheme        |# sicp
-          #|seninha       |# fmutils
-          #|ssh           |# openssh
-          #|syndication   |# newsraft
-          #|telegram      |# telegram-desktop
-          #|terminals     |# foot
-          #|tor-browsers  |# mullvadbrowser
-          #|toys          |# wayneko
-          #|vesion-control|# git
-          #|video         |# ffmpeg ffmpegthumbnailer mpv yt-dlp
-          #|wm            |# fnott rivercarro riverguile river-bnf swww waybar
-          #|xdisorg       |# fuzzel wl-clipboard wlsunset
-          #|zig-xyz       |# river))
 
    (services
     (list #|XDG services|#
@@ -233,17 +304,7 @@
                                    "f9130e11e35d2c147c6764ef85542dc58dc09c4f"
                                    (openpgp-fingerprint
                                     (format #f "F164 709E 5FC7 B32B AEC7  ~
-                                                9F37 1F2E 76AC E3F5 31C8")))))
+                                                9F37 1F2E 76AC E3F5 31C8")))))))
-                                (channel
-                                 (name 'saayix)
-                                 (branch "entropy")
-                                 (url "https://codeberg.org/look/saayix.git")
-                                 (introduction
-                                   (make-channel-introduction
-                                     "12540f593092e9a177eb8a974a57bb4892327752"
-                                     (openpgp-fingerprint
-                                      (format #f "3FFA 7335 973E 0A49 47FC  ~
-                                                  0A8C 38D5 96BE 07D3 34AB")))))))
 
           #|Shepherd service|#
           (service home-shepherd-service-type)
@@ -428,14 +489,14 @@
                             ("LC_COLLATE" . "C")))
           (simple-service 'home-default-applications-environment-variables
                           home-environment-variables-service-type
-                          `(("BROWSER"  . ,browser)
+                          `(("BROWSER"  . ,application:browser)
-                            ("EDITOR"   . ,editor)
+                            ("EDITOR"   . ,application:editor)
-                            ("PAGER"    . ,pager)
+                            ("PAGER"    . ,application:pager)
-                            ("READER"   . ,reader)
+                            ("READER"   . ,application:reader)
-                            ("SHELL"    . ,shell)
+                            ("SHELL"    . ,application:shell)
-                            ("TERMINAL" . ,terminal)
+                            ("TERMINAL" . ,application:terminal)
-                            ("VISUAL"   . ,editor)
+                            ("VISUAL"   . ,application:editor)
-                            ("WM"       . ,wm)))
+                            ("WM"       . ,application:wm)))
 
           #|SSH service|#
           (service home-openssh-service-type

operating-systems/buer.scm

@@ -69,6 +69,26 @@
 
   #:export (operating-system))
 
+(define user:radio
+  (user-account
+   (name "radio")
+   (password %radio-password)
+   (home-directory "/home/radio")
+   (shell (file-append fish "/bin/fish"))
+   (uid 1000)
+   (group "users")
+   (supplementary-groups `("audio" "seat" "video" "wheel"))))
+
+(define user:root
+  (user-account
+   (name "root")
+   (password %root-password)
+   (system? #t)
+   (home-directory "/root")
+   (uid 0)
+   (group "root")
+   (shell (file-append dash-next "/bin/dash"))))
+
 (define operating-system
   (gnu:operating-system
    (host-name "buer")
@@ -95,7 +115,7 @@
                                  "/backgrounds/guix-silver-16-9.svg"))
              (gfxmode `("1280x720x32"))))))
 
-   (kernel linux-libre-6.7)
+   (kernel linux-libre-6.8)
    (kernel-arguments
     (cons* "modprobe.blacklist=usbmouse,usbkbd,pcspkr"
            "thinkpad_acpi.fan_control=1"
@@ -120,29 +140,10 @@
            %base-file-systems))
 
    (users
-    (cons* (user-account
+    (cons* user:radio
-            (name "radio")
+           user:root
-            (password %radio-password)
-            (home-directory "/home/radio")
-            (shell (file-append fish "/bin/fish"))
-            (uid 1000)
-            (group "users")
-            (supplementary-groups `("audio" "adbusers" "video" "wheel")))
-           (user-account
-            (name "root")
-            (password %root-password)
-            (system? #t)
-            (home-directory "/root")
-            (uid 0)
-            (group "root")
-            (shell (file-append dash-next "/bin/dash")))
            %base-user-accounts))
 
-   (groups
-    (cons* (user-group
-             (name "adbusers"))
-           %base-groups))
-
    #|System level packages|#
    (packages
     (list #|admin       |# btop inetutils isc-dhcp opendoas shadow zzz
@@ -183,19 +184,21 @@
           (service console-font-service-type
                    (associate-right
                     (%default-console-font `("tty1" "tty2"))))
-          (service agetty-service-type
-                   (agetty-configuration
-                    (extra-options `("-L"))
-                    (term "vt100")
-                    (tty #f)))
-          (service mingetty-service-type
-                   (mingetty-configuration (tty "tty1")))
-          (service mingetty-service-type
-                   (mingetty-configuration (tty "tty2")))
 
           #|Login services|#
-          (service login-service-type)
+          (service seatd-service-type)
-          (service elogind-service-type)
+          (service greetd-service-type
+                   (greetd-configuration
+                    (greeter-supplementary-groups '("seat" "video"))
+                    (terminals
+                      (map (lambda (x)
+                             (greetd-terminal-configuration
+                              (terminal-vt (number->string x))
+                              (terminal-switch #t)
+                              (default-session-command
+                               (greetd-agreety-session
+                                (command #~(getenv "SHELL"))))))
+                           (iota 2 1)))))
 
           #|Log services|#
           (service rottlog-service-type)
@@ -257,7 +260,6 @@
                    (udev-configuration
                     (udev eudev)
                     (rules (list alsa-utils
-                                 android-udev-rules
                                  crda
                                  fuse
                                  lvm2))))