bunch of stuff

guix/system/apollyon-laptop.scm

@@ -1,19 +1,18 @@
 (use-modules (gnu)
-             (gnu services desktop)
              (gnu packages wm)
-             (gnu packages shells)
              (gnu packages version-control)
              (gnu packages emacs)
              (gnu packages gnuzilla)
              (gnu packages vim)
              (gnu packages certs)
-             (gnu packages file-systems)
-             (gnu packages suckless)
-             (gnu packages admin)
-             (gnu packages linux)
-             (gnu packages audio)
              (gnu packages pulseaudio)
+             (gnu packages audio)
+             (gnu packages linux)
+             (gnu packages suckless)
+             (gnu packages terminals)
              (gnu packages gnome)
+	     (gnu packages shells)
+	     (gnu packages emacs)
              (gnu system setuid)
              (nongnu packages linux))
 
@@ -22,62 +21,52 @@
  desktop
  networking
  ssh
- ;; sddm
  xorg)
 
 (operating-system
  (kernel linux)
- (firmware (list linux-firmware))
+ (firmware (list linux-firmware sof-firmware))
  (locale "en_US.utf8")
  (timezone "America/Los_Angeles")
  (keyboard-layout (keyboard-layout "us"))
- (host-name "borges") 
- (setuid-programs
-  (let ((from (lambda (package file)
-                (setuid-program (program (file-append package file))))))
-    (cons* (from light "/bin/light")
-           (from network-manager "/bin/nmtui")
-           (from sway "/bin/sway")
-           (from swaylock "/bin/swaylock")
-           %setuid-programs)))
+ (host-name "apollyon")
  (users (cons* (user-account
                 (name "opal")
                 (comment "opal")
                 (group "users")
-                (home-directory "/home/opal")
                 (shell (file-append zsh "/bin/zsh"))
+                (home-directory "/home/opal")
                 (supplementary-groups
-                 '("wheel"
-                   "netdev"
-                   "audio"
-                   "video")))
+                 '("wheel" "netdev" "audio" "video")))
                %base-user-accounts))
-
- (packages (append (list git
-                         network-manager
-                         icecat
-                         vim
-                         nss-certs
-                         exfat-utils
-                         emacs
-                         sway
-                         swaybg
-                         swaylock
-                         swayidle
-                         dmenu
-                         bluez
-                         bluez-alsa
-                         pulseaudio)
-                   %base-packages)) 
+ (packages
+  (append
+   (list
+     zsh
+     emacs
+     i3-wm
+     i3status
+     git
+     network-manager
+     icecat
+     emacs
+     bluez
+     bluez-alsa
+     pulseaudio
+     dmenu
+     alacritty
+     nss-certs)
+   %base-packages))
  (services
-  (cons*
-   (service 
-    (modify-services %desktop-services
-                     (gdm-service-type config
-                                       => (gdm-configuration
-                                           (inherit config)
-                                           (wayland? #t)
-                                           (debug? #t)))))))
+  (append
+   (list (service gnome-desktop-service-type)
+         (service openssh-service-type)
+         (service tor-service-type)
+         (service cups-service-type)
+         (set-xorg-configuration
+          (xorg-configuration
+           (keyboard-layout keyboard-layout))))
+   %desktop-services))
  (bootloader
   (bootloader-configuration
    (bootloader grub-efi-bootloader)
@@ -86,7 +75,7 @@
  (mapped-devices
   (list (mapped-device
          (source
-          (uuid "0eb58e93-c463-4d40-a819-4c9d594ed230"))
+          (uuid "ceb0c15f-30b6-4d02-a7e9-96ddcd73c763"))
          (target "cryptroot")
          (type luks-device-mapping))))
  (file-systems
@@ -97,6 +86,6 @@
           (dependencies mapped-devices))
          (file-system
           (mount-point "/boot/efi")
-          (device (uuid "2AFC-9172" 'fat32))
+          (device (uuid "739C-796C" 'fat32))
           (type "vfat"))
          %base-file-systems)))