config/guix/system/default: Clean up locale-libcs, default file-system.

master
Pierre Neidhardt 2020-06-10 08:34:56 +02:00
parent 7a1f3ee1eb
commit 3eb013af6b
1 changed files with 10 additions and 30 deletions

View File

@ -72,10 +72,6 @@ StrictNodes 1")
;; (substitute-urls
;; (list
;; "https://ci.guix.gnu.org"
;; ;; "https://qualif.ci.guix.gnu.org"
;; ;; "https://berlin.guixsd.org"
;; ;; "https://mirror.hydra.gnu.org"
;; ;; "https://hydra.gnu.org"
;; "https://gx.bufio.org"))
;; (extra-options '("--max-jobs=2"))))
(udev-service-type config =>
@ -91,15 +87,14 @@ StrictNodes 1")
ntfs-3g
;; exfat-utils ; TODO: Needed for macOS drives? Does not seem to work.
fuse-exfat
emacs-exwm
emacs-exwm ; Still needs emacs-exwm installed in a user profile.
vhba-module ; For CDEmu.
(fold (lambda (package l) (delete package l))
%base-packages
(list nano zile))))
(define-public %ambrevar/firmware
(append ;; (list vhba-module) ; TODO: Useless?
%base-firmware))
%base-firmware)
(define-public %ambrevar/default-os
(operating-system
@ -107,9 +102,6 @@ StrictNodes 1")
(timezone "Europe/Paris")
(locale "en_US.utf8")
;; TODO: Remove this once everything has been rebuilt using 2.29.
(locale-libcs (list glibc-2.28 (canonical-package glibc)))
;; Use the UEFI variant of GRUB with the EFI System
;; Partition mounted on /boot/efi.
(bootloader (bootloader-configuration
@ -121,26 +113,12 @@ StrictNodes 1")
;; TODO: Remove all virtio modules?
;; (initrd-modules (delete "virtio-rng" %base-initrd-modules))
;; Assume the target root file system is labelled "guix",
;; and the EFI System Partition is specified by its UUID.
(file-systems (cons* (file-system
(device (file-system-label "guix"))
(mount-point "/")
(type "ext4"))
(file-system
(device (file-system-label "home"))
(mount-point "/home")
(type "ext4"))
(file-system
(device (uuid "4E30-891F" 'fat))
(mount-point "/boot/efi")
(type "vfat"))
(file-system
(mount-point "/tmp")
(device "none")
(type "tmpfs")
(check? #f))
%base-file-systems))
(file-systems (cons*
(file-system
(device (file-system-label "guix"))
(mount-point "/")
(type "ext4"))
%base-file-systems))
(users (cons* (user-account
(name "ambrevar")
@ -160,3 +138,5 @@ StrictNodes 1")
;; Allow resolution of '.local' host names with mDNS.
(name-service-switch %mdns-host-lookup-nss)))
%ambrevar/default-os