refactor some things, fix docker

1 files changed, 13 insertions, 54 deletions

diff --git a/modules/freya/system.scm b/modules/freya/system.scm
index bd8e862..7aa8576 100644
--- a/modules/freya/system.scm
+++ b/modules/freya/system.scm
@@ -30,11 +30,11 @@
            #:use-module (nongnu packages linux)
            #:use-module (srfi srfi-1)
            #:use-module (freya bootloader uki)
-           #:use-module (freya packages wm)
            #:use-module (freya packages certs)
            #:use-module (freya packages linux)
            #:use-module (freya packages gl)
            #:use-module (freya packages qt)
+           #:use-module (freya packages wm)
            #:use-module (freya packages networking)
            #:use-module (freya packages virtualization))
 
@@ -49,7 +49,6 @@
          (keyboard-layout (keyboard-layout "us"))
          (host-name "ThisWillChange")
 
-         ;; The list of user accounts ('root' is implicit).
          (users (cons* (user-account
                 (name "freya")
                 (comment "Freya Murphy")
@@ -59,7 +58,7 @@
                 (supplementary-groups '("wheel"
                                         "audio"
                                         "lp"
-                                        ;"docker"
+                                        "docker"
                                         "plugdev"
                                         "libvirt"
                                         "kvm"
@@ -68,14 +67,7 @@
                                         "tty")))
                   %base-user-accounts))
 
-         (packages (append (specifications->packages (list ; desktop
-                                                           "swayfx"
-                                                           "swaybg"
-                                                           "swayidle"
-                                                           "cage"
-                                                           "libnotify"
-
-                                                           ; gtk
+         (packages (append (specifications->packages (list ; gtk
                                                            "wxwidgets"
                                                            "gtk+"
                                                            "dconf"
@@ -106,8 +98,6 @@
                                                            ; xdg
                                                            "xdg-utils"
                                                            "xdg-desktop-portal"
-                                                           "xdg-desktop-portal-wlr"
-                                                           "xdg-desktop-portal-gtk"
 
                                                            ; firmware
                                                            "sof-firmware"
@@ -116,7 +106,7 @@
 
                                                            ; needed programs
                                                            "qemu"
-                                                           "pulseaudio"
+                                                           "pulseaudio" ; pactl
                                                            "alsa-utils"
                                                            "neovim"
 
@@ -140,16 +130,13 @@
                                                            "openssl"
 
                                                            ; system daemons
-                                                           "chrony"
                                                            "docker"
                                                            "containerd"
                                                            "avahi"
                                                            "gnupg"
-                                                           "pinentry"
                                                            "light"
                                                            "brightnessctl"
                                                            "wireguard-tools"
-                                                           "fprintd"
                                                            "libpcap"
 
                                                            ; fonts
@@ -157,40 +144,21 @@
                                                            "font-google-noto-sans-cjk"
                                                            "font-jetbrains-mono"
                                                            "font-dejavu"))
-                           (list ; desktop
-                                 swaylock-effects-new
-                                 waybar-new
-
-                                 ; hyprwm
-                                 hyprland
-                                 hyprlock
-                                 hyprpaper
-                                 hypridle
-                                 hyprland-plugin-hy3
-                                 hyprland-plugins
-                                 xdg-desktop-portal-hyprland
-
-                                 ; qt
+                           (list ; qt
                                  qt5-styleplugins
                                  qt6gtk2
 
                                  ; bluetooth
                                  bluez-new
-                                 blueman-new
-                                 overskride
 
                                  ; system
-                                 virt-manager-new
+                                 virt-manager-ovmf
                                  freya-ca-certs
                                  mesa)
                            %base-packages))
 
-         ;; Below is the list of system services. TO search for available
-         ;; services. run 'guix system search KEYWORD' in a terminal.
          (services
            (append (list
-                ;; To configure OpenSSH, pass an 'openssh-configuration'
-                ;; record as a second argument to 'service' below.
                 (service openssh-service-type)
                 (service pcscd-service-type)
                 (service spice-vdagent-service-type)
@@ -200,17 +168,16 @@
                 (service cups-service-type
                     (cups-configuration
                       (web-interface? #t)))
-                ;; Avahi is only present for CUPS to support "automagic" printing
                 (service avahi-service-type
                     (avahi-configuration
-                      (publish? #f) ;; do not advertise this machiene
-                      (publish-workstation? #f))) ; do not advertise, I want this to be as silent as possible
-               ;(service docker-service-type)
-               ;(service chrony-sericve-type)
+                      (publish? #f)
+                      (publish-workstation? #f)))
+               (service docker-service-type)
+               (service containerd-service-type)
                (service nix-service-type)
                (service libvirt-service-type
                         (libvirt-configuration
-                          (libvirt libvirt-new)
+                          (libvirt libvirt-ovmf)
                           (unix-sock-group "libvirt")
                           (tls-port "16555")))
                (service virtlog-service-type)
@@ -220,11 +187,8 @@
                           (experimental #t)
                           (fast-connectable? #t)))
                (service pam-limits-service-type)
-               (service fprintd-service-type)
                (udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))
 
-           ;; This is the default list of services we
-           ;; are appending to.
            (modify-services %desktop-services
                             (guix-service-type config =>
                                                (guix-configuration
@@ -233,13 +197,8 @@
                                                    (append (list "https://substitutes.nonguix.org")
                                                            %default-substitute-urls))
                                                  (authorized-keys
-                                                   (cons* (plain-file "non-guix.pub"
-                                                                      "(public-key
-                                                                      (ecc
-                                                                        (curve Ed25519)
-                                                                        (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)
-                                                                        )
-                                                                      )" ) %default-authorized-guix-keys))))
+                                                   (append (list (local-file "../../certs/non-guix.pub"))
+                                                           %default-authorized-guix-keys))))
                             (udev-service-type config =>
                                                (udev-configuration
                                                  (inherit config)))