diff options
Diffstat (limited to 'systems/ayase/system-configuration.scm')
| -rw-r--r-- | systems/ayase/system-configuration.scm | 169 |
1 files changed, 61 insertions, 108 deletions
diff --git a/systems/ayase/system-configuration.scm b/systems/ayase/system-configuration.scm index caf9960..e9fedb1 100644 --- a/systems/ayase/system-configuration.scm +++ b/systems/ayase/system-configuration.scm @@ -9,114 +9,67 @@ #:use-module (suweren services) #:use-module (users marekpasnikowski)) -(define bootloader-targets - (list "/boot/efi")) - -(define marek-groups - (list "wheel" - "netdev" - "audio" - "video")) - -(define root-filesystem-device - (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c")) - -(define package-specifications - (list "emacs" - "emacs-exwm" - "emacs-desktop-environment")) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define efi-partition - (file-system (mount-point "/boot/efi") - (device (uuid "B4FB-CBD9" 'fat32)) - (type "vfat"))) - -(define marek-account - (user-account (name "marekpasnikowski") - (comment "Marek Paśnikowski") - (group "users") - (home-directory "/home/marek") - (supplementary-groups marek-groups))) - -(define root-partition - (file-system (mount-point "/") - (device root-filesystem-device) - (type "ext4"))) - -(define swap-space-target - (uuid "f1c1b2ab-5c11-4708-80c2-d5ac99ff35cf")) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define ayase-file-systems - (list root-partition - efi-partition)) - -(define ayase-user-accounts - (list marek-account)) - -(define keyboard-layout - (keyboard-layout "pl")) - -(define main-swap - (swap-space (target swap-space-target))) - -(define system-packages - (map specification->package - package-specifications)) - -(define system-services - (list (service openssh-service-type) - (service tor-service-type))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define bootloader - (bootloader-configuration (bootloader grub-efi-bootloader) - (targets bootloader-targets) - (keyboard-layout keyboard-layout))) - -(define file-systems - (append %base-file-systems - ;; %distribution-file-systems - ayase-file-systems)) - -(define firmware - (list linux-firmware)) - -(define packages - (append %base-packages - ;; %distribution-packages - system-packages)) - -(define services - (append %distribution-services - marekpasnikowski-services - system-services)) - -(define swap-devices - (list main-swap)) +(define-public ayase + (let* ((bootloader-targets (list "/boot/efi")) + (marek-groups (list "wheel" + "netdev" + "audio" + "video")) + (root-filesystem-device (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c")) + (package-specifications (list "emacs" + "emacs-exwm" + "emacs-desktop-environment")) -(define users - (append %base-user-accounts - ayase-user-accounts)) + (efi-partition (file-system (mount-point "/boot/efi") + (device (uuid "B4FB-CBD9" 'fat32)) + (type "vfat"))) + (marek-account (user-account (name "marekpasnikowski") + (comment "Marek Paśnikowski") + (group "users") + (home-directory "/home/marek") + (supplementary-groups marek-groups))) + (root-partition (file-system (mount-point "/") + (device root-filesystem-device) + (type "ext4"))) + (swap-space-target (uuid "f1c1b2ab-5c11-4708-80c2-d5ac99ff35cf")) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (ayase-file-systems (list root-partition + efi-partition)) + (ayase-user-accounts (list marek-account)) + (keyboard-layout (keyboard-layout "pl")) + (main-swap (swap-space (target swap-space-target))) + (system-packages (map specification->package + package-specifications)) + (system-services (list (service openssh-service-type) + (service tor-service-type))) -(define-public ayase - (operating-system (kernel linux) - (bootloader bootloader) - (keyboard-layout keyboard-layout) - (initrd microcode-initrd) - (firmware firmware) - (host-name "ayase") - (file-systems file-systems) - (swap-devices swap-devices) - (users users) - (packages packages) - (timezone "Europe/Warsaw") - (locale "pl_PL.utf8") - (services services) - (sudoers-file %sudoers-specification*))) + (bootloader (bootloader-configuration (bootloader grub-efi-bootloader) + (targets bootloader-targets) + (keyboard-layout keyboard-layout))) + (file-systems (append %base-file-systems + ;; %distribution-file-systems + ayase-file-systems)) + (firmware (list linux-firmware)) + (packages (append %base-packages + ;; %distribution-packages + system-packages)) + (services (append %distribution-services + marekpasnikowski-services + system-services)) + (swap-devices (list main-swap)) + (users (append %base-user-accounts + ayase-user-accounts))) + (operating-system (kernel linux) + (bootloader bootloader) + (keyboard-layout keyboard-layout) + (initrd microcode-initrd) + (firmware firmware) + (host-name "ayase") + (file-systems file-systems) + (swap-devices swap-devices) + (users users) + (packages packages) + (timezone "Europe/Warsaw") + (locale "pl_PL.utf8") + (services services) + (sudoers-file %sudoers-specification*)))) |