diff options
| -rw-r--r-- | ikaruga.scm | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/ikaruga.scm b/ikaruga.scm index b6be28a..0b6b1f1 100644 --- a/ikaruga.scm +++ b/ikaruga.scm @@ -23,14 +23,16 @@ ;; guix system reconfigure ikaruga.scm (use-modules (gnu) - (nongnu packages linux) - (nongnu system linux-initrd)) -(use-service-modules cups desktop networking ssh xorg) + (gnu services desktop) + (nongnu packages linux) + (nongnu system linux-initrd)) (operating-system ;; Use regular Linux with the big bad proprietary firmware blobs. (kernel linux) (initrd microcode-initrd) + ;; sof-firmware is required for sound to work, linux-firmware takes + ;; care of everything else. (firmware (list sof-firmware linux-firmware)) (locale "en_US.utf8") (timezone "America/New_York") @@ -46,34 +48,32 @@ (packages (append (list (specification->package "nss-certs")) %base-packages)) (services (modify-services (cons (service gnome-desktop-service-type) - %desktop-services) - ;; Get nonguix substitutes. - (guix-service-type config => - (guix-configuration - (inherit config) - (substitute-urls - (append (list "https://substitutes.nonguix.org") - %default-substitute-urls)) - (authorized-keys - (append (list (local-file "./nonguix-signing-key.pub")) - %default-authorized-guix-keys)))))) + %desktop-services) + ;; Get nonguix substitutes. + (guix-service-type config => + (guix-configuration + (inherit config) + (substitute-urls + (append (list "https://substitutes.nonguix.org") + %default-substitute-urls)) + (authorized-keys + (append (list (local-file "./nonguix-signing-key.pub")) + %default-authorized-guix-keys)))))) (bootloader (bootloader-configuration (bootloader grub-efi-bootloader) (targets (list "/boot/efi")) (keyboard-layout keyboard-layout))) (mapped-devices (list (mapped-device - (source (uuid - "02b1ffb4-d868-4e5f-ab9b-8be3092e3a3c")) + (source (uuid "02b1ffb4-d868-4e5f-ab9b-8be3092e3a3c")) (target "cryptroot") (type luks-device-mapping)))) (file-systems (cons* (file-system - (mount-point "/boot/efi") - (device (uuid "91D3-F76B" - 'fat32)) - (type "vfat")) + (mount-point "/boot/efi") + (device (uuid "91D3-F76B" 'fat32)) + (type "vfat")) (file-system - (mount-point "/") - (device "/dev/mapper/cryptroot") - (type "ext4") - (dependencies mapped-devices)) - %base-file-systems))) + (mount-point "/") + (device "/dev/mapper/cryptroot") + (type "ext4") + (dependencies mapped-devices)) + %base-file-systems))) |