diff options
| -rw-r--r-- | .config/guix/hati.scm | 2 | ||||
| -rw-r--r-- | .config/guix/kvasir.scm | 91 | ||||
| -rw-r--r-- | .config/guix/vali.scm | 2 |
3 files changed, 49 insertions, 46 deletions
diff --git a/.config/guix/hati.scm b/.config/guix/hati.scm index f1802cb..ba27501 100644 --- a/.config/guix/hati.scm +++ b/.config/guix/hati.scm @@ -43,7 +43,7 @@ ,@bd-desktop-system-services ,@bd-mpd-service ,(service guix-home-service-type - `(("bdunahu" ,home))))) + `((,username ,home))))) (mapped-devices (list (mapped-device (source (uuid "1e9c3cd7-97c2-411a-975a-40222d185563")) diff --git a/.config/guix/kvasir.scm b/.config/guix/kvasir.scm index 14a71c6..e0dcba6 100644 --- a/.config/guix/kvasir.scm +++ b/.config/guix/kvasir.scm @@ -4,58 +4,61 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define-module (kvasir) - #:use-module (ymir) + #:use-module (base) + #:use-module (desktop) #:use-module (gnu) #:use-module (gnu home) - #:use-module (gnu packages) #:use-module (gnu home services) - #:use-module (gnu services) - #:use-module (guix gexp) - #:use-module (xdg) - #:use-module (shell) - #:use-module (ssh) - #:use-module (gpg) #:use-module (gnu image) + #:use-module (gnu packages) + #:use-module (gnu services) + #:use-module (gnu services guix) #:use-module (gnu system image) - #:use-module (xserver) - #:use-module (base)) + #:use-module (guix gexp) + #:use-module (ymir)) + + +(define home + (home-environment + (services + `(,@bd-base-home-services + ,@bd-desktop-home-services)))) (define system (operating-system - (inherit ymir) - (host-name "kvasir") - - (file-systems (cons* (file-system - (mount-point "/boot/efi") - (device (uuid - "8A13-7018" - 'fat32)) - (type "vfat")) - (file-system - (mount-point "/") - (device (uuid - "69a3593b-12bd-40ad-a932-007674a8cfe8")) - (type "ext4")) %base-file-systems)))) - -(define MiB (expt 2 20)) -(define GiB (expt 2 30)) + (inherit ymir) + (host-name "kvasir") + + + ;; (all packages are system wide) + (packages + `(,@bd-base-system-packages + ,@bd-desktop-system-packages + ,@(map specification->package + '( + "brightnessctl" + )))) + + (services + `(,@bd-base-system-services + ,@bd-desktop-system-services + ,(service guix-home-service-type + `((,username ,home))))) + + + (file-systems (cons* (file-system + (mount-point "/boot/efi") + (device (uuid + "8A13-7018" + 'fat32)) + (type "vfat")) + (file-system + (mount-point "/") + (device (uuid + "69a3593b-12bd-40ad-a932-007674a8cfe8")) + (type "ext4")) %base-file-systems)))) (image - (format 'iso9660) - (operating-system system) - (partitions - (list - ;; (partition - ;; (size (* 40 MiB)) - ;; (offset (* 1024 1024)) - ;; (label "GNU-ESP") - ;; (file-system "vfat") - ;; (flags '(esp)) - ;; (initializer (gexp initialize-efi-partition))) - (partition - (size (* 28 GiB)) - (label root-label) - (file-system "ext4") - (flags '(boot)) - (initializer (gexp initialize-root-partition)))))) + (inherit iso9660-image) + (operating-system system)) diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm index 4a436c9..f4e34a4 100644 --- a/.config/guix/vali.scm +++ b/.config/guix/vali.scm @@ -43,7 +43,7 @@ ,@bd-desktop-system-services ,@bd-mpd-service ,(service guix-home-service-type - `(("bdunahu" ,home))))) + `((,username ,home))))) (mapped-devices (list (mapped-device (source (uuid "8d3ccf19-035a-4956-8ba7-7c00dfa3a02c")) |