diff options
Diffstat (limited to 'systems/ayase')
| -rw-r--r-- | systems/ayase/guix-ayase.org | 40 | ||||
| -rw-r--r-- | systems/ayase/system-configuration.scm | 40 |
2 files changed, 52 insertions, 28 deletions
diff --git a/systems/ayase/guix-ayase.org b/systems/ayase/guix-ayase.org index 40a1dc9..b1682a0 100644 --- a/systems/ayase/guix-ayase.org +++ b/systems/ayase/guix-ayase.org @@ -16,6 +16,15 @@ #:use-module (gnu services ssh) #:use-module (gnu services xorg)) + ;; DATA + + ;; ABSTRACTION 2 + + (define efi-partition + (file-system (mount-point "/boot/efi") + (device (uuid "B4FB-CBD9" 'fat32)) + (type "vfat"))) + (define marek-account (user-account (name "marek") (comment "Marek Paśnikowski") @@ -26,30 +35,31 @@ "audio" "video")))) + (define root-partition + (file-system (mount-point "/") + (device (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c" 'ext4)) + (type "ext4"))) + (define xorg-configuration '(xorg-configuration (keyboard-layout keyboard-layout))) + ;; ABSTRACTION 1 + + (define ayase-file-systems + (list root-partition + efi-partition)) + (define ayase-user-accounts (list marek-account)) (define bootloader '(bootloader-configuration (bootloader grub-efi-bootloader) - (targets (list "/boot/efi")) - (keyboard-layout keyboard-layout))) - - (define efi-partition - (file-system (mount-point "/boot/efi") - (device (uuid "B4FB-CBD9" 'fat32)) - (type "vfat"))) + (targets (list "/boot/efi")) + (keyboard-layout keyboard-layout))) (define main-swap (swap-space (target (uuid "cc6bbf7c-e42a-4ac3-a9ae-3b14d3b4b841")))) - (define root-partition - (file-system (mount-point "/") - (device (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c" 'ext4)) - (type "ext4"))) - (define system-packages (list (specification->package "emacs") (specification->package "emacs-exwm") @@ -61,12 +71,14 @@ (service cups-service-type) (set-xorg-configuration xorg-configuration))) + ;; PUBLIC + (operating-system (bootloader bootloader) (keyboard-layout (keyboard-layout "pl")) (host-name "ayase") (file-systems (append %base-file-systems - efi-partition - root-partition)) + ;; %distribution-file-systems + ayase-file-systems)) (swap-devices (list main-swap)) (users (append %base-user-accounts ayase-user-accounts)) diff --git a/systems/ayase/system-configuration.scm b/systems/ayase/system-configuration.scm index ab63c06..d0f249c 100644 --- a/systems/ayase/system-configuration.scm +++ b/systems/ayase/system-configuration.scm @@ -6,6 +6,15 @@ #:use-module (gnu services ssh) #:use-module (gnu services xorg)) +;; DATA + +;; ABSTRACTION 2 + +(define efi-partition + (file-system (mount-point "/boot/efi") + (device (uuid "B4FB-CBD9" 'fat32)) + (type "vfat"))) + (define marek-account (user-account (name "marek") (comment "Marek Paśnikowski") @@ -16,30 +25,31 @@ "audio" "video")))) +(define root-partition + (file-system (mount-point "/") + (device (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c" 'ext4)) + (type "ext4"))) + (define xorg-configuration '(xorg-configuration (keyboard-layout keyboard-layout))) +;; ABSTRACTION 1 + +(define ayase-file-systems + (list root-partition + efi-partition)) + (define ayase-user-accounts (list marek-account)) (define bootloader '(bootloader-configuration (bootloader grub-efi-bootloader) - (targets (list "/boot/efi")) - (keyboard-layout keyboard-layout))) - -(define efi-partition - (file-system (mount-point "/boot/efi") - (device (uuid "B4FB-CBD9" 'fat32)) - (type "vfat"))) + (targets (list "/boot/efi")) + (keyboard-layout keyboard-layout))) (define main-swap (swap-space (target (uuid "cc6bbf7c-e42a-4ac3-a9ae-3b14d3b4b841")))) -(define root-partition - (file-system (mount-point "/") - (device (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c" 'ext4)) - (type "ext4"))) - (define system-packages (list (specification->package "emacs") (specification->package "emacs-exwm") @@ -51,12 +61,14 @@ (service cups-service-type) (set-xorg-configuration xorg-configuration))) +;; PUBLIC + (operating-system (bootloader bootloader) (keyboard-layout (keyboard-layout "pl")) (host-name "ayase") (file-systems (append %base-file-systems - efi-partition - root-partition)) + ;; %distribution-file-systems + ayase-file-systems)) (swap-devices (list main-swap)) (users (append %base-user-accounts ayase-user-accounts)) |