From 33eecd41e77dfe7de708305eb40550b5d20b1cc0 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Sat, 12 Oct 2024 08:07:50 +0200 Subject: refactor(portable-bios): change naming convention --- machines/amd64.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++ machines/portable-bios.scm | 61 ---------------------------------------------- 2 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 machines/amd64.scm delete mode 100644 machines/portable-bios.scm (limited to 'machines') diff --git a/machines/amd64.scm b/machines/amd64.scm new file mode 100644 index 0000000..08b1eb2 --- /dev/null +++ b/machines/amd64.scm @@ -0,0 +1,61 @@ +(define-module (machines amd64) + ;; bootloader-configuration + #:use-module (gnu bootloader) + + ;; grub-bootloader + #:use-module (gnu bootloader grub) + + ;; file-system + ;; swap-space + #:use-module (gnu system file-systems) + + ;; linux + ;; linux-firmware + #:use-module (nongnu packages linux) + + ;; microcode-initrd + #:use-module (nongnu system linux-initrd)) + +;; bootloader-configuration +(define-public (bootloader-configuration* keyboard-layout*) + (let ((bootloader* grub-bootloader) + (bootloader-targets (list "/dev/sdb")) ; TODO: generalize the target + ) + (bootloader-configuration (bootloader bootloader*) + (targets bootloader-targets) + (keyboard-layout keyboard-layout*)))) + +;; string -> +;; (list record* file-system) +(define-public (file-systems* host-name*) + (let* ((root-device-string (string-append host-name* "-root")) + + (root-device (file-system-label root-device-string)) + + (file-system-root (file-system (type "ext4") + (mount-point "/") + (device root-device)))) + (append %base-file-systems + (list file-system-root)))) + +;; (list record* package) +(define-public firmware* + (list linux-firmware)) + +;; record* package +(define-public initrd* + microcode-initrd) + +;; record* package +(define-public kernel-amd64 + linux) + +;; string -> +;; (list record* swap-space) +(define-public (swap-devices* host-name*) + (let* ((label* (string-append host-name* "-swap")) + + (target* (file-system-label label*)) + + (swap-space* (swap-space (target target*)))) + (list swap-space*))) diff --git a/machines/portable-bios.scm b/machines/portable-bios.scm deleted file mode 100644 index 17714fe..0000000 --- a/machines/portable-bios.scm +++ /dev/null @@ -1,61 +0,0 @@ -(define-module (machines portable-bios) - ;; bootloader-configuration - #:use-module (gnu bootloader) - - ;; grub-bootloader - #:use-module (gnu bootloader grub) - - ;; file-system - ;; swap-space - #:use-module (gnu system file-systems) - - ;; linux - ;; linux-firmware - #:use-module (nongnu packages linux) - - ;; microcode-initrd - #:use-module (nongnu system linux-initrd)) - -;; bootloader-configuration -(define-public (bootloader-configuration* keyboard-layout*) - (let ((bootloader* grub-bootloader) - (bootloader-targets (list "/dev/sdb")) ; TODO: generalize the target - ) - (bootloader-configuration (bootloader bootloader*) - (targets bootloader-targets) - (keyboard-layout keyboard-layout*)))) - -;; string -> -;; (list record* file-system) -(define-public (file-systems* host-name*) - (let* ((root-device-string (string-append host-name* "-root")) - - (root-device (file-system-label root-device-string)) - - (file-system-root (file-system (type "ext4") - (mount-point "/") - (device root-device)))) - (append %base-file-systems - (list file-system-root)))) - -;; (list record* package) -(define-public firmware* - (list linux-firmware)) - -;; record* package -(define-public initrd* - microcode-initrd) - -;; record* package -(define-public kernel* - linux) - -;; string -> -;; (list record* swap-space) -(define-public (swap-devices* host-name*) - (let* ((label* (string-append host-name* "-swap")) - - (target* (file-system-label label*)) - - (swap-space* (swap-space (target target*)))) - (list swap-space*))) -- cgit v1.2.3