config/guix/system: Update modules to use Nonguix properly

master
Pierre Neidhardt 2019-06-15 11:19:21 +02:00
parent 9d7a73821f
commit e7179b0b26
3 changed files with 24 additions and 24 deletions

View File

@ -2,7 +2,7 @@
#:use-module (gnu)
#:use-module (gnu system nss)
#:use-module (gnu system mapped-devices)
#:use-module (nonfree packages linux)
#:use-module (nongnu packages linux)
#:use-module (gnu packages linux) ; For ntfs-3g
#:use-module (gnu packages mtools) ; For exfat
#:use-module (gnu packages emacs-xyz) ; For EXWM
@ -10,7 +10,7 @@
#:use-module (gnu packages wm) ; For awesomewm
#:use-module (gnu services xorg)
#:use-module (gnu services networking) ; For tor
#:use-module (gnu services docker)
;; #:use-module (gnu services docker)
#:use-module (gnu packages xorg))
(use-service-modules desktop)
@ -79,22 +79,22 @@ EndSection")
(define %mimimi/services
(modify-services
%desktop-services
(guix-service-type config =>
(guix-configuration
(inherit config)
;; Don't clean build deps.
;; See (info "(guix) Invoking guix-daemon").
;; WARNING: This tends to yield an ever-growing store.
;; (extra-options '("--gc-keep-outputs"))
;; Specify substitutes manually. Defaults
;; should be good enough in most cases.
(substitute-urls
(list
"https://qualif.ci.guix.gnu.org"
;; "https://berlin.guixsd.org"
;; "https://mirror.hydra.gnu.org"
;; "https://hydra.gnu.org"
))))
;; (guix-service-type config =>
;; (guix-configuration
;; (inherit config)
;; ;; Don't clean build deps.
;; ;; See (info "(guix) Invoking guix-daemon").
;; ;; WARNING: This tends to yield an ever-growing store.
;; ;; (extra-options '("--gc-keep-outputs"))
;; ;; Specify substitutes manually. Defaults
;; ;; should be good enough in most cases.
;; (substitute-urls
;; (list
;; "https://qualif.ci.guix.gnu.org"
;; ;; "https://berlin.guixsd.org"
;; ;; "https://mirror.hydra.gnu.org"
;; ;; "https://hydra.gnu.org"
;; ))))
(udev-service-type config =>
(udev-configuration
(inherit config)
@ -130,11 +130,11 @@ StrictNodes 1")
(timeout 1)
(target "/boot/efi")))
(kernel linux-nonfree)
(kernel linux)
;; (kernel-arguments '("modprobe.blacklist=pcspkr"))
;; (kernel-arguments '("modprobe.blacklist=nouveau"))
;; (kernel-arguments '("pcie_port_pm=off"))
(firmware (append (list linux-firmware-iwlwifi
(firmware (append (list iwlwifi-firmware
vhba-module)
%base-firmware))
;; TODO: Remove all virtio modules.
@ -211,7 +211,7 @@ StrictNodes 1")
(service tor-service-type
(tor-configuration
(config-file (plain-file "tor.conf" %mimimi/tor-config))))
(service docker-service-type)
;; (service docker-service-type)
%mimimi/services))
;; Allow resolution of '.local' host names with mDNS.

View File

@ -2,7 +2,7 @@
;; *sudo -E guix system -L ~/.config/guix/system reconfigure ~/.config/guix/system/desktop-bababa.scm
(define-module (desktop-bababa)
#:use-module (default)
#:use-module (nonfree packages linux)
#:use-module (nongnu packages linux)
#:use-module (gnu system)
#:use-module (gnu bootloader)
#:use-module (gnu bootloader grub)
@ -20,7 +20,7 @@
;; (kernel linux-libre)
;; (firmware %base-firmware)
(firmware (append (list linux-firmware-amdgpu)
(firmware (append (list amdgpu-firmware)
%base-firmware))
(file-systems (cons* (file-system

View File

@ -2,7 +2,7 @@
;; *sudo -E guix system -L ~/.config/guix/system reconfigure ~/.config/guix/system/laptop-mimimi.scm
(define-module (laptop-mimimi)
#:use-module (default)
#:use-module (nonfree packages linux)
#:use-module (nongnu packages linux)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu bootloader grub)
#:use-module (gnu bootloader)