diff options
Diffstat (limited to 'systems')
| -rw-r--r-- | systems/ayase/guix-ayase.org | 11 | ||||
| -rw-r--r-- | systems/ayase/system-configuration.scm | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/systems/ayase/guix-ayase.org b/systems/ayase/guix-ayase.org index 97452b6..c249473 100644 --- a/systems/ayase/guix-ayase.org +++ b/systems/ayase/guix-ayase.org @@ -16,9 +16,6 @@ #:use-module (gnu services ssh) #:use-module (gnu services xorg)) - (define main-memory - '(target (uuid "cc6bbf7c-e42a-4ac3-a9ae-3b14d3b4b841"))) - (define marek-account (user-account (name "marek") (comment "Marek Paśnikowski") @@ -45,14 +42,14 @@ (device (uuid "B4FB-CBD9" 'fat32)) (type "vfat"))) + (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 swap-devices - (list (swap-space main-memory))) - (define system-packages (list (specification->package "emacs") (specification->package "emacs-exwm") @@ -70,7 +67,7 @@ (file-systems (append %base-file-systems efi-partition root-partition)) - (swap-devices swap-devices) + (swap-devices (list main-swap)) (users (append %base-user-accounts ayase-user-accounts)) (packages (append %base-packages diff --git a/systems/ayase/system-configuration.scm b/systems/ayase/system-configuration.scm index a99b7f9..2ed20d5 100644 --- a/systems/ayase/system-configuration.scm +++ b/systems/ayase/system-configuration.scm @@ -6,9 +6,6 @@ #:use-module (gnu services ssh) #:use-module (gnu services xorg)) -(define main-memory - '(target (uuid "cc6bbf7c-e42a-4ac3-a9ae-3b14d3b4b841"))) - (define marek-account (user-account (name "marek") (comment "Marek Paśnikowski") @@ -35,14 +32,14 @@ (device (uuid "B4FB-CBD9" 'fat32)) (type "vfat"))) +(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 swap-devices - (list (swap-space main-memory))) - (define system-packages (list (specification->package "emacs") (specification->package "emacs-exwm") @@ -60,7 +57,7 @@ (file-systems (append %base-file-systems efi-partition root-partition)) - (swap-devices swap-devices) + (swap-devices (list main-swap)) (users (append %base-user-accounts ayase-user-accounts)) (packages (append %base-packages |