OMS/tietokoneet
2
0
Fork 0
Code Issues Pull Requests Projects Activity

Poista #:firmware asetus base-operating-system -funktiosta

Browse Source
This commit is contained in:
Saku Laesvuori 2026-08-14 14:42:10 +03:00
parent 0273a7b240
commit ca4d6b1c9d
Signed by: slaesvuo
GPG Key ID: 257D284A2A1D3A32
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/oms/systems.scm
View File

@ -20,13 +20,13 @@
#:use-module (sops services sops) #:use-module (sops services sops)
#:export (base-operating-system)) #:export (base-operating-system))
(define* (base-operating-system host-name #:key (firmware (list linux-firmware))) (define* (base-operating-system host-name)
(operating-system (operating-system
(kernel linux) (kernel linux)
(kernel-arguments (kernel-arguments
(append '("resume=oms-guix-swap") %default-kernel-arguments)) (append '("resume=oms-guix-swap") %default-kernel-arguments))
(initrd microcode-initrd) (initrd microcode-initrd)
(firmware firmware) (firmware (list linux-firmware))
(locale "fi_FI.utf8") (locale "fi_FI.utf8")
(timezone "Europe/Helsinki") (timezone "Europe/Helsinki")
(keyboard-layout (keyboard-layout "fi")) (keyboard-layout (keyboard-layout "fi"))
@ -138,8 +138,7 @@ ID with the extended system as it's value."
(append '("vmd") (operating-system-initrd-modules base)))))) (append '("vmd") (operating-system-initrd-modules base))))))
(define-system oms-kone (define-system oms-kone
(let ((base (base-operating-system "OMS-kone" (let ((base (base-operating-system "OMS-kone"))
#:firmware (list ibt-hw-firmware iwlwifi-firmware)))
(wpa-psk (sops-secret (wpa-psk (sops-secret
(key '("wpa-psk")) (key '("wpa-psk"))
(file (channel-file "sops/OMS-kone.yaml")))) (file (channel-file "sops/OMS-kone.yaml"))))
@ -149,6 +148,7 @@ ID with the extended system as it's value."
(operating-system (operating-system
(inherit base) (inherit base)
(kernel-arguments %default-kernel-arguments) (kernel-arguments %default-kernel-arguments)
(firmware (list ibt-hw-firmware iwlwifi-firmware))
(swap-devices '()) (swap-devices '())
(services (services
(append (append