guix-packages/ambrevar/system/default: Update for Guix 0.16+
Pierre Neidhardt
parent
dc10549479
commit
3f7e903ac7
|
|
@ -1,28 +1,17 @@
|
|||
(define-module (ambrevar system default)
|
||||
#:use-module (gnu)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (ambrevar linux-custom)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu system nss)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (ambrevar linux-custom)
|
||||
#:use-module (gnu packages linux) ; For ntfs-3g
|
||||
#:use-module (gnu packages mtools) ; For exfat
|
||||
#:use-module (gnu services xorg)
|
||||
#:use-module (gnu services networking)
|
||||
#:use-module (gnu services cups)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages cups)
|
||||
#:use-module (gnu packages mtools)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (srfi srfi-1))
|
||||
#:use-module (gnu services networking) ; For tor
|
||||
#:use-module (gnu packages xorg))
|
||||
|
||||
(use-service-modules desktop)
|
||||
(use-package-modules bootloaders certs suckless) ; xorg
|
||||
(use-package-modules certs)
|
||||
(use-package-modules gnome)
|
||||
;; (use-package-modules bootloaders certs suckless) ; xorg
|
||||
|
||||
;; Allow members of the "video" group to change the screen brightness.
|
||||
(define %backlight-udev-rule
|
||||
|
|
@ -76,19 +65,20 @@ 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"))
|
||||
(substitute-urls
|
||||
(list
|
||||
"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://berlin.guixsd.org"
|
||||
;; "https://mirror.hydra.gnu.org"
|
||||
;; "https://hydra.gnu.org"))))
|
||||
(udev-service-type config =>
|
||||
(udev-configuration
|
||||
(inherit config)
|
||||
|
|
@ -133,22 +123,18 @@ StrictNodes 1")
|
|||
;; TODO: Remove all virtio modules.
|
||||
(initrd-modules (delete "virtio-rng" %base-initrd-modules))
|
||||
|
||||
;; REVIEW: shpchp seems to be obsolete.
|
||||
;; (initrd-modules (append (list "shpchp")
|
||||
;; %base-initrd-modules))
|
||||
|
||||
;; Assume the target root file system is labelled "guixsd",
|
||||
;; and the EFI System Partition is specified by its UUID.
|
||||
(file-systems (cons* (file-system
|
||||
(device (file-system-label "guixsd"))
|
||||
(mount-point "/")
|
||||
(type "ext4"))
|
||||
;; (file-system
|
||||
;; (device (file-system-label "home"))
|
||||
;; (mount-point "/home")
|
||||
;; (type "ext4"))
|
||||
(file-system
|
||||
(device (file-system-label "home"))
|
||||
(mount-point "/home")
|
||||
(type "ext4"))
|
||||
(file-system
|
||||
(device (uuid "8AC2-4252" 'fat))
|
||||
(device (uuid "4E30-891F" 'fat))
|
||||
(mount-point "/boot/efi")
|
||||
(type "vfat"))
|
||||
(file-system
|
||||
|
|
@ -170,10 +156,12 @@ StrictNodes 1")
|
|||
;; "audio"
|
||||
"lp" ; for bluetooth
|
||||
"video"))
|
||||
;; TODO: Default to name?
|
||||
(home-directory "/home/ambrevar"))
|
||||
%base-user-accounts))
|
||||
|
||||
(packages (cons* nss-certs ;for HTTPS access
|
||||
;; gvfs ;for user mounts
|
||||
ntfs-3g
|
||||
exfat-utils
|
||||
fuse-exfat
|
||||
|
|
@ -193,13 +181,13 @@ StrictNodes 1")
|
|||
;; ;; >> echo 'auto' > '/sys/bus/pci/devices/0000:02:00.0/power/control';
|
||||
;; )
|
||||
(bluetooth-service)
|
||||
(service cups-service-type
|
||||
(cups-configuration
|
||||
(web-interface? #t)
|
||||
;; hplip depends on a lot of Qt libraries. Use hplip-minimal instead?
|
||||
;; (extensions
|
||||
;; (list cups-filters escpr hplip))
|
||||
))
|
||||
;; (service cups-service-type
|
||||
;; (cups-configuration
|
||||
;; (web-interface? #t)
|
||||
;; ;; hplip depends on a lot of Qt libraries. Use hplip-minimal instead?
|
||||
;; ;; (extensions
|
||||
;; ;; (list cups-filters escpr hplip))
|
||||
;; ))
|
||||
(service tor-service-type
|
||||
(tor-configuration
|
||||
(config-file (plain-file "tor.conf" %mimimi/tor-config))))
|
||||
|
|
|
|||
Loading…
Reference in New Issue