.

config.scm

@@ -1,6 +1,7 @@
 ;; -*- mode: guix-scheme -*-
 
-(use-modules (gnu)
+(use-modules
+ (gnu)
  (gnu services avahi)
  (gnu services base)
  (gnu services desktop)
@@ -21,40 +22,46 @@
  (host-name "ziltis-machine")
  (timezone "Europe/Berlin")
  (locale "de_DE.utf8")
- (bootloader (bootloader-configuration
+ (bootloader
+  (bootloader-configuration
    (bootloader grub-efi-bootloader)
-              (targets '("/boot/efi"))
-              (keyboard-layout
-               (keyboard-layout "de"))))
- (file-systems (append
-                (list
+   (targets
+    '("/boot/efi"))
+   (keyboard-layout keyboard-layout)))
+ (file-systems
+  (cons*
    (file-system
-                  (device (partition-label "EFI System Partition"))
+    (device
+     (partition-label "EFI System Partition"))
     (mount-point "/boot/efi")
     (type "vfat"))
    (file-system
-                  (device (file-system-label "guix-root")
+    (device
+     (file-system-label "guix-root")
      (mount-point "/")
      (type "xfs")))
-                 (file-system
-                  (device (label "swap"))
-                  (type "swap")))
    %base-file-systems))
- (swap-devices (list
+ (swap-devices
+  (list
    (swap-space
-                 (target (label "swap"))
+    (target
+     (label "swap"))
     (discard? #t))))
- (keyboard-layout (keyboard-layout "de"))
- (users (cons (user-account
+ (keyboard-layout
+  (keyboard-layout "de"))
+ (users
+  (cons* (user-account
           (name "zilti")
           (group "users")
-               (supplementary-groups '("wheel"
+          (supplementary-groups
+           '("wheel"
              "seat"
              "audio"
              "video"
              "libvirt")))
    %base-user-accounts))
- (packages (append
+ (packages
+  (append
    (list
     nss-certs
     emacs
@@ -62,14 +69,18 @@
     kitty
     swayfx)
    %base-packages))
-
- (services (append
+ (services
+  (append
    (modify-services
     %desktop-services
     (delete login-service-type)
     (delete mingetty-service-type))
-            (list (service avahi-service-type)
-
+   (list
+    (service network-manager-service-type)
+    (service wpa-supplicant-service-type)
+    (service ntp-service-type)
+    (service gdm-service-type)
+    (service avahi-service-type)
     (service elogind-service-type)
     (service seatd-service-type)
     (service polkit-service-type)
@@ -82,20 +93,18 @@
     (service udisks-service-type)
     (service bluetooth-service-type)
     (service inputattach-service-type)
-
     (service fstrim-service-type)
-
     (service earlyoom-service-type
              (earlyoom-configuration
               (minimum-available-memory 5)
               (minimum-free-swap 5)))
-
     (service greetd-service-type
              (greetd-configuration
               (greeter-supplementary-groups
                (list "video" "input" "seat"))
               (terminals
-                             (list (greetd-terminal-configuration
+               (list
+                (greetd-terminal-configuration
                  (terminal-vt "1")
                  (terminal-switch #t)
                  (default-session-command
@@ -103,17 +112,14 @@
                     (sway 'swayfx)
                     ;; (sway-configuration #f)
                     )))))))
-
     (service fprintd-service-type)
-
     (service screen-locker-service-type
              (screen-locker-configuration
               (name "swaylock")
-                            (program (file-append swaylock-effects "/bin/swaylock"))
+              (program
+               (file-append swaylock-effects "/bin/swaylock"))
               (using-setuid? #f)))
-
     (service libvirt-service-type
              (libvirt-configuration
               (unix-sock-group "libvirt"))))))
-
  (name-service-switch %mdns-host-lookup-nss))