From e6f26581bf22e266c5056eddfb264eca2efb6ef4 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Thu, 11 Jul 2024 17:11:25 +0200
Subject: Wayland-based desktop support

Add a separate home service to configure a Wayland-based desktop instead of an
X11 one.

Screensharing in Zoom doesn't work unfortunately, but it worked (at least for
a while) through OBS.

Waybar might need some work to bring it in line with the previous polybar
configuration, especially in terms of aesthetics.
---
 tw/system/cern.scm | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'tw/system/cern.scm')

diff --git a/tw/system/cern.scm b/tw/system/cern.scm
index 362ff9e0..1ca01508 100644
--- a/tw/system/cern.scm
+++ b/tw/system/cern.scm
@@ -17,8 +17,8 @@
   #:use-module (tw services wireguard)
   #:use-module (tw system))
 
-(use-package-modules certs cups disk docker file-systems gnome kerberos linux
-                     mtools pulseaudio search shells wm xorg)
+(use-package-modules certs cups disk docker file-systems freedesktop gnome
+                     kerberos linux mtools pulseaudio search shells wm xorg)
 
 (use-service-modules admin authentication avahi base cups dbus desktop docker
                      kerberos linux mcron networking pm shepherd ssh syncthing
@@ -29,10 +29,6 @@
 (define guixsd-root-partition         ; /dev/nvme0n1p2
   (uuid "933d1bec-14ec-4421-aa4d-93846c68f27c" 'btrfs))
 
-(define custom-xorg-config
-  (xorg-configuration
-   (keyboard-layout %british-keyboard)))
-
 (define-public %cern-system
   (operating-system
     (host-name "twilkenlaptop.cern.ch")
@@ -48,7 +44,7 @@
     ;; The MT7921E module is for the card connected via PCIe, which it is
     ;; (it's in an M.2 slot).  Alternatives are S (SDIO) and U (USB).
     (kernel nongnu:linux)
-    ;; (kernel-loadable-modules (list ddcci-driver-linux))   ; TODO: disabled because the package fails to build
+    (kernel-loadable-modules (list ddcci-driver-linux v4l2loopback-linux-module))
     (initrd nongnu:microcode-initrd)
     (firmware (cons* nongnu:i915-firmware nongnu:ibt-hw-firmware nongnu:sof-firmware
                      nongnu:iwlwifi-firmware %base-firmware))
@@ -99,7 +95,8 @@
         ;; We need to preserve $TERMINFO so that programs under sudo can
         ;; find kitty's terminfo files. This is possibly unsafe; sudo
         ;; explicitly deletes this variable by default.
-        "Defaults env_keep += \"TERMINFO\"\n"
+        "Defaults env_keep += \"TERMINFO\"\n"        ; for kitty
+        "Defaults env_keep += \"TERMINFO_DIRS\"\n"   ; for foot
         (plain-file-content %sudoers-specification)
         ;; In addition to the default rules, allow admins to power off
         ;; the computer. They'll have to use the system binaries, not
@@ -127,17 +124,6 @@
          (sched-powersave-on-bat? #t)
          (cpu-boost-on-ac? #t)))
 
-      (service unattended-upgrade-service-type
-        (unattended-upgrade-configuration
-         (schedule "0 22 * * *")   ; every night at 22:00
-         (maximum-duration (* 40 60))   ; 40 minutes
-         (channels #~(@ (tw channels) %system-channels))
-         (operating-system-expression
-          #~(@ (tw system cern) %cern-system))
-         (services-to-restart
-          ;; Anything that won't cause disruption when restarting.
-          '(mcron earlyoom thermald))))
-
       (service openntpd-service-type
         (openntpd-configuration
          ;; Use CERN time servers.
@@ -149,6 +135,7 @@
                         #:host-name host-name
                         #:cores 12
                         #:work-system? #t
+                        #:wayland? #t
                         #:wireless-interface "wlp0s20f3"
                         #:backlight-device "intel_backlight")
         ;; openntpd works better.
-- 
cgit v1.2.3