diff --git a/.config/guix/system/default.scm b/.config/guix/system/default.scm index eb4ed44d..487dc185 100644 --- a/.config/guix/system/default.scm +++ b/.config/guix/system/default.scm @@ -90,14 +90,14 @@ StrictNodes 1") ;; exfat-utils ; TODO: Needed for macOS drives? Does not seem to work. fuse-exfat emacs-exwm - vhba-module + vhba-module ; For CDEmu. %base-packages)) (define-public %ambrevar/firmware (append ;; (list vhba-module) ; TODO: Useless? %base-firmware)) -(define-public default-operating-system +(define-public %ambrevar/default-os (operating-system (host-name "ambrevar-system") (timezone "Europe/Paris") diff --git a/.config/guix/system/desktop-bababa-emtec.scm b/.config/guix/system/desktop-bababa-emtec.scm new file mode 100644 index 00000000..8aa12287 --- /dev/null +++ b/.config/guix/system/desktop-bababa-emtec.scm @@ -0,0 +1,15 @@ +;; With Eshell: +;; *sudo -E guix system -L ~/.config/guix/system reconfigure ~/.config/guix/system/desktop-bababa-emtec.scm +(define-module (desktop-bababa) + #:use-module (default) + #:use-module (gnu) + #:use-module (gnu system) + #:use-module (gnu services)) + +(operating-system + (inherit %bababa/os) + (services (cons* + ;; TODO: Might need 9.6 for Iroha. + (postgresql-service) + (service docker-service-type) + (operating-system-services %bababa/os)))) diff --git a/.config/guix/system/desktop-bababa.scm b/.config/guix/system/desktop-bababa.scm index fe8c78a8..2c4f8e2e 100644 --- a/.config/guix/system/desktop-bababa.scm +++ b/.config/guix/system/desktop-bababa.scm @@ -9,8 +9,6 @@ (use-service-modules nix - docker ; REVIEW: Needs 'modprobe overlay'? - databases ; PostgreSQL ;; libvirt: virtualization) @@ -26,44 +24,44 @@ (service nix-service-type) %ambrevar/services)) -(operating-system - (inherit default-operating-system) - (host-name "bababa") +(define-public %bababa/os + (operating-system + (inherit %ambrevar/default-os) + (host-name "bababa") - (bootloader (bootloader-configuration - (bootloader grub-bootloader) - (timeout 1) - (target "/dev/sdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (timeout 1) + (target "/dev/sdb"))) - (kernel linux) - (firmware (append (list amdgpu-firmware) - %ambrevar/firmware)) + (kernel linux) + (firmware (append (list amdgpu-firmware) + %ambrevar/firmware)) - (file-systems (cons* (file-system - (device (file-system-label "guixsd")) ; TODO: Change label to "guix". - (mount-point "/") - (type "ext4")) - (file-system - (device (file-system-label "babadata")) - (mount-point "/media/babadata") - (type "btrfs") - (create-mount-point? #t)) - (file-system - (mount-point "/tmp") - (device "none") - (type "tmpfs") - (check? #f)) - %base-file-systems)) + (file-systems (cons* (file-system + (device (file-system-label "guixsd")) ; TODO: Change label to "guix". + (mount-point "/") + (type "ext4")) + (file-system + (device (file-system-label "babadata")) + (mount-point "/media/babadata") + (type "btrfs") + (create-mount-point? #t)) + (file-system + (mount-point "/tmp") + (device "none") + (type "tmpfs") + (check? #f)) + %base-file-systems)) - (packages (cons* nix - stumpwm - (operating-system-packages default-operating-system))) + (packages (cons* nix + stumpwm + (operating-system-packages default-operating-system))) - (services (cons* - (service libvirt-service-type - (libvirt-configuration - (unix-sock-group "kvm"))) - ;; TODO: Might need 9.6 for Iroha. - (postgresql-service) - (service docker-service-type) - %bababa/services))) + (services (cons* + (service libvirt-service-type + (libvirt-configuration + (unix-sock-group "kvm"))) + %bababa/services)))) + +%bababa/os diff --git a/.config/guix/system/laptop-mimimi.scm b/.config/guix/system/laptop-mimimi.scm index 7354371d..bccf943d 100644 --- a/.config/guix/system/laptop-mimimi.scm +++ b/.config/guix/system/laptop-mimimi.scm @@ -123,7 +123,7 @@ EndSection") (extra-config (list %mimimi/xorg-touchpad))))))))) (operating-system - (inherit default-operating-system) + (inherit %ambrevar/default-os) (host-name "mimimi") (kernel linux)