From a66bc759f5a1e44ef2707d8758b23313d197d0fe Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Tue, 19 Mar 2024 19:49:03 +0100
Subject: [PATCH] .

---
 config.org                  | 32 +++++++++++++++++++-------------
 config.scm                  | 10 +++++++++-
 home/home-configuration.scm |  4 ++++
 home/sway/sway              |  4 ----
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/config.org b/config.org
index 7b14ae5..6bcc635 100644
--- a/config.org
+++ b/config.org
@@ -52,6 +52,7 @@ This is to be run after setting up the partitions.
 - gnu services linux
 - gnu services networking
 - gnu services pm
+- gnu services sddm
 - gnu services sound
 - gnu services virtualization
 - gnu services xorg
@@ -167,6 +168,7 @@ This adds the Nonguix channel.
 - git
 - glu
 - hwdata
+- hyprland
 - i915-firmware
 - libdrm
 - mesa
@@ -177,6 +179,8 @@ This adds the Nonguix channel.
 - tuxedo-keyboard
 - xf86-video-amdgpu
 - xf86-video-intel
+- xorg-server-xwayland
+- xorg-server
 - amdgpu-firmware
 - amd-microcode
 - intel-microcode
@@ -216,18 +220,20 @@ This adds the Nonguix channel.
 These services are unmodified, or have just few settings.
 
 #+NAME: root-simple-services
-| Service     | Options                                              |
-|-------------+------------------------------------------------------|
-| tlp         | ()                                                   |
-| thermald    | ((adaptive? #t))                                     |
-| bluetooth   | ()                                                   |
-| docker      | ()                                                   |
-| earlyoom    | ((minimum-available-memory 5) (minimum-free-swap 5)) |
-| inputattach | ()                                                   |
-| libvirt     | ((unix-sock-group "libvirt"))                        |
-| fstrim      | ()                                                   |
-| fprintd     | ()                                                   |
-| seatd       | ()                                                   |
+| Service        | Options                                              |
+|----------------+------------------------------------------------------|
+| tlp            | ()                                                   |
+| thermald       | ((adaptive? #t))                                     |
+| bluetooth      | ()                                                   |
+| docker         | ()                                                   |
+| earlyoom       | ((minimum-available-memory 5) (minimum-free-swap 5)) |
+| inputattach    | ()                                                   |
+| libvirt        | ((unix-sock-group "libvirt"))                        |
+| fstrim         | ()                                                   |
+| fprintd        | ()                                                   |
+| plasma-desktop | ()                                                   |
+| sddm           | ()                                                   |
+| seatd          | ()                                                   |
 
 #+NAME: root-simple-service-block
 #+begin_src scheme :noweb yes :exports none :results output
@@ -383,7 +389,7 @@ This is the full operating system specification.
       (name "zilti")
       (group "users")
       (supplementary-groups
-       '("avahi" "docker" "users" "wheel" "netdev" "audio" "cdrom" "video" "libvirt" "seat")))
+       '("avahi" "docker" "users" "wheel" "netdev" "audio" "cdrom" "video" "libvirt" "lp")))
      %base-user-accounts))
     <<root-package-block>>
     <<root-services-block>>
diff --git a/config.scm b/config.scm
index ba529cd..adc78b5 100644
--- a/config.scm
+++ b/config.scm
@@ -11,6 +11,7 @@
   (gnu services linux)
   (gnu services networking)
   (gnu services pm)
+  (gnu services sddm)
   (gnu services sound)
   (gnu services virtualization)
   (gnu services xorg)
@@ -75,7 +76,7 @@
     (name "zilti")
     (group "users")
     (supplementary-groups
-     '("avahi" "docker" "users" "wheel" "netdev" "audio" "cdrom" "video" "libvirt" "seat")))
+     '("avahi" "docker" "users" "wheel" "netdev" "audio" "cdrom" "video" "libvirt" "lp")))
    %base-user-accounts))
   (packages
    (append
@@ -89,6 +90,7 @@
           git
           glu
           hwdata
+          hyprland
           i915-firmware
           libdrm
           mesa
@@ -99,6 +101,8 @@
           tuxedo-keyboard
           xf86-video-amdgpu
           xf86-video-intel
+          xorg-server-xwayland
+          xorg-server
           amdgpu-firmware
           amd-microcode
           intel-microcode)
@@ -151,6 +155,10 @@
           (service
             fprintd-service-type
             (fprintd-configuration))
+          (service
+            plasma-desktop-service-type
+            (plasma-desktop-configuration))
+          (service sddm-service-type (sddm-configuration))
           (service
             seatd-service-type
             (seatd-configuration)))
diff --git a/home/home-configuration.scm b/home/home-configuration.scm
index 457467a..99ba0ae 100644
--- a/home/home-configuration.scm
+++ b/home/home-configuration.scm
@@ -189,6 +189,7 @@
                           "icedove-wayland"
                           "kitty"
                           "ksshaskpass"
+                          "kwayland-integration"
                           "ledger"
                           "libaacs"
                           "libbdplus"
@@ -207,10 +208,13 @@
                           "pass-otp"
                           "pavucontrol"
                           "pinentry-qt"
+                          "plasma-desktop"
                           "pv"
+                          "qtwayland@5.15.10"
                           "rsync"
                           "rust"
                           "rust-cargo"
+                          "sddm"
                           "senpai"
                           "sideload"
                           "slurp"
diff --git a/home/sway/sway b/home/sway/sway
index 3ed6ac5..220cd04 100644
--- a/home/sway/sway
+++ b/home/sway/sway
@@ -275,10 +275,6 @@ mode "resize" {
 #}
 
 # Autostarts
-exec pipewire && sleep 0.2s
-exec pipewire-pulse
-exec wireplumber
-exec shepherd
 exec waybar
 exec swaync
 exec swayidle