config/guix/system: Lighten default and bababa, add bababa-emtec.

master
Pierre Neidhardt 2020-06-08 14:02:45 +02:00
parent 60d302a292
commit 631eae09c4
3 changed files with 62 additions and 21 deletions

View File

@ -1,6 +1,7 @@
;; To collect the size of a system:
;; guix size $(guix system build config.scm)
(define-module (default)
#:use-module (srfi srfi-1)
#:use-module (gnu)
#:use-module (gnu system nss)
#:use-module (gnu system mapped-devices))
@ -12,11 +13,12 @@
(use-package-modules
certs ; nss-certs
;; desktop ;
linux ; ntfs-3g
mtools ; exfat
;; EXWM
emacs-xyz)
nano ; To remove nano.
emacs-xyz ; EXWM
;; To remove zile:
zile)
(define %ambrevar/cdemu-vhba-udev-rule
;; For the "uaccess" tag to be applied properly, the rule must be executed
@ -91,7 +93,9 @@ StrictNodes 1")
fuse-exfat
emacs-exwm
vhba-module ; For CDEmu.
%base-packages))
(fold (lambda (package l) (delete package l))
%base-packages
(list nano zile))))
(define-public %ambrevar/firmware
(append ;; (list vhba-module) ; TODO: Useless?

View File

@ -6,9 +6,25 @@
#:use-module (gnu system)
#:use-module (gnu services))
(use-service-modules
nix
;; libvirt:
virtualization)
(use-package-modules
;; Nix
package-management)
(operating-system
(inherit %bababa/os)
(packages (cons* nix
(operating-system-packages %bababa/os)))
(services (cons*
(service nix-service-type)
;; Warning: This is very heavy:
(service libvirt-service-type
(libvirt-configuration
(unix-sock-group "kvm")))
;; TODO: Might need 9.6 for Iroha.
(postgresql-service)
(service docker-service-type)

View File

@ -1,6 +1,7 @@
;; With Eshell:
;; *sudo -E guix system -L ~/.config/guix/system reconfigure ~/.config/guix/system/desktop-bababa.scm
(define-module (desktop-bababa)
#:use-module (srfi srfi-1)
#:use-module (default)
#:use-module (nongnu packages linux)
#:use-module (gnu)
@ -8,22 +9,17 @@
#:use-module (gnu services))
(use-service-modules
nix
;; libvirt:
virtualization)
avahi ; To remove avahi.
desktop ; To remove bluetooth.
networking ; To remove NetworkManager.
;; To remove GDM:
xorg)
(use-package-modules
linux
;; nix:
package-management
;; Stumpwm:
wm)
(define %bababa/services
(cons*
(service nix-service-type)
%ambrevar/services))
(define-public %bababa/os
(operating-system
(inherit %ambrevar/default-os)
@ -54,14 +50,39 @@
(check? #f))
%base-file-systems))
(packages (cons* nix
stumpwm
(operating-system-packages default-operating-system)))
(packages (cons* stumpwm
(fold (lambda (package l) (delete package l))
(operating-system-packages %ambrevar/default-os)
(list
iw
wireless-tools))))
(services (cons*
(service libvirt-service-type
(libvirt-configuration
(unix-sock-group "kvm")))
%bababa/services))))
(service connman-service-type)
(service slim-service-type (slim-configuration
(display ":0")
(vt "vt7")))
(service slim-service-type (slim-configuration
(display ":1")
(vt "vt8")))
(remove
(lambda (service)
(or
(member (service-kind service)
(list avahi-service-type
bluetooth-service
cups-pk-helper-service-type
geoclue-service
gdm-service-type
;; NetworkManager. The applet is a
;; simple-service and must be removed by
;; matching the type name.
network-manager-service-type
;; wpa-supplicant-service-type ; Still needed for networking.
modem-manager-service-type
usb-modeswitch-service-type))
(member (service-type-name (service-kind service))
'(network-manager-applet))))
%ambrevar/services)))))
%bababa/os