config/guix/system/default: Clean up.
parent
8520b9bd4c
commit
54079ab49a
|
@ -7,14 +7,13 @@
|
||||||
#:use-module (gnu packages mtools) ; For exfat
|
#:use-module (gnu packages mtools) ; For exfat
|
||||||
#:use-module (gnu packages emacs-xyz) ; For EXWM
|
#:use-module (gnu packages emacs-xyz) ; For EXWM
|
||||||
#:use-module (gnu packages wm) ; For stumpwm
|
#:use-module (gnu packages wm) ; For stumpwm
|
||||||
;; #:use-module (gnu services docker)
|
|
||||||
;; For tor
|
;; For tor
|
||||||
#:use-module (gnu services networking))
|
#:use-module (gnu services networking))
|
||||||
|
|
||||||
(use-service-modules desktop)
|
;; TODO: Do we need the following?
|
||||||
(use-package-modules certs)
|
;; (use-service-modules desktop)
|
||||||
(use-package-modules gnome)
|
;; (use-package-modules certs)
|
||||||
;; (use-service-modules nix)
|
;; (use-package-modules gnome)
|
||||||
;; (use-package-modules bootloaders certs suckless) ; xorg
|
;; (use-package-modules bootloaders certs suckless) ; xorg
|
||||||
|
|
||||||
(define %ambrevar/cdemu-vhba-udev-rule
|
(define %ambrevar/cdemu-vhba-udev-rule
|
||||||
|
@ -50,15 +49,6 @@ StrictNodes 1")
|
||||||
|
|
||||||
(define-public %ambrevar/services
|
(define-public %ambrevar/services
|
||||||
(cons*
|
(cons*
|
||||||
;; (service nix-service-type)
|
|
||||||
;; (service docker-service-type)
|
|
||||||
;; (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
|
(service tor-service-type
|
||||||
(tor-configuration
|
(tor-configuration
|
||||||
(config-file (plain-file "tor.conf" %ambrevar/tor-config))))
|
(config-file (plain-file "tor.conf" %ambrevar/tor-config))))
|
||||||
|
@ -124,10 +114,10 @@ StrictNodes 1")
|
||||||
(device (file-system-label "guix"))
|
(device (file-system-label "guix"))
|
||||||
(mount-point "/")
|
(mount-point "/")
|
||||||
(type "ext4"))
|
(type "ext4"))
|
||||||
;; (file-system
|
(file-system
|
||||||
;; (device (file-system-label "home"))
|
(device (file-system-label "home"))
|
||||||
;; (mount-point "/home")
|
(mount-point "/home")
|
||||||
;; (type "ext4"))
|
(type "ext4"))
|
||||||
(file-system
|
(file-system
|
||||||
(device (uuid "4E30-891F" 'fat))
|
(device (uuid "4E30-891F" 'fat))
|
||||||
(mount-point "/boot/efi")
|
(mount-point "/boot/efi")
|
||||||
|
@ -139,16 +129,11 @@ StrictNodes 1")
|
||||||
(check? #f))
|
(check? #f))
|
||||||
%base-file-systems))
|
%base-file-systems))
|
||||||
|
|
||||||
;; (groups (cons* (user-group
|
|
||||||
;; (name "plugdev")
|
|
||||||
;; (system? #t))
|
|
||||||
;; %base-groups))
|
|
||||||
(users (cons* (user-account
|
(users (cons* (user-account
|
||||||
(name "ambrevar")
|
(name "ambrevar")
|
||||||
(group "users")
|
(group "users")
|
||||||
(supplementary-groups '("wheel" "netdev" ; netdev is needed for networking.
|
(supplementary-groups '("wheel" "netdev" ; netdev is needed for networking.
|
||||||
;; "plugdev" ; TODO: Needed for nitrokey?
|
;; "plugdev" ; TODO: Needed for nitrokey?
|
||||||
;; "audio"
|
|
||||||
"lp" ; TODO: Needed for bluetooth?
|
"lp" ; TODO: Needed for bluetooth?
|
||||||
"video"))
|
"video"))
|
||||||
;; TODO: Can we default to name?
|
;; TODO: Can we default to name?
|
||||||
|
@ -156,10 +141,9 @@ StrictNodes 1")
|
||||||
%base-user-accounts))
|
%base-user-accounts))
|
||||||
|
|
||||||
(packages (cons* nss-certs ; for HTTPS access
|
(packages (cons* nss-certs ; for HTTPS access
|
||||||
;; gvfs ; for user mounts
|
;; gvfs ; TODO: For user mounts?
|
||||||
;; nix
|
|
||||||
ntfs-3g
|
ntfs-3g
|
||||||
exfat-utils ; TODO: Needed for macOS drives?
|
;; exfat-utils ; TODO: Needed for macOS drives? Does not seem to work.
|
||||||
fuse-exfat
|
fuse-exfat
|
||||||
stumpwm
|
stumpwm
|
||||||
emacs-exwm
|
emacs-exwm
|
||||||
|
|
Loading…
Reference in New Issue