M files/guix-config.scm => files/guix-config.scm +10 -4
@@ 162,7 162,7 @@
(name "root")
;; If "" then no password set otherwise put the output of mkpasswd
;; with your desired password (mkpasswd --method=sha-512)
- (password "")
+; (password "")
(uid 0)
(group "root")
(comment "System God")
@@ 174,7 174,7 @@
(uid 1000)
(group "users")
;; The set of groups we have thus far as needed for basic laptop experience
- (supplementary-groups '("sudo" "netdev" "kvm" "audio" "video"))
+ (supplementary-groups '("sudo" "netdev" "dialout" "kvm" "audio" "video"))
(home-directory "/home/admin"))
;; Service accounts required
@@ 391,8 391,14 @@ root ALL=(ALL) ALL
;; [slim] (EE) dbus-core: error connecting to system bus
(simple-service 'extras-dbus dbus-root-service-type
(list iwd slim))
- ;; still need to manually start the iwd process
- ;; but a shepherd service here should fix that
+ ;; Add a simple shepherd service so we don't have to manually start iwd
+ (simple-service 'iwd-shepherd-service
+ shepherd-root-service-type (list (shepherd-service
+ (documentation "iwd service")
+ (requirement '(dbus-system))
+ (provision '(iwd))
+ (start #~(make-forkexec-constructor (list #$(file-append iwd "/libexec/iwd"))))
+ (stop #~(make-kill-destructor)))))
;; To log what we are doing
;; unfortunately there is no way to disable MARK messages
M files/guix-kodi-config.scm => files/guix-kodi-config.scm +2 -2
@@ 162,7 162,7 @@
(name "root")
;; If "" then no password set otherwise put the output of mkpasswd
;; with your desired password (mkpasswd --method=sha-512)
- (password "")
+; (password "")
(uid 0)
(group "root")
(comment "System God")
@@ 174,7 174,7 @@
(uid 1000)
(group "users")
;; The set of groups we have thus far as needed for basic laptop experience
- (supplementary-groups '("sudo" "netdev" "kvm" "audio" "video"))
+ (supplementary-groups '("sudo" "netdev" "dialout" "kvm" "audio" "video"))
(home-directory "/home/admin"))
;; Desired service account
M files/kodi.sh => files/kodi.sh +3 -0
@@ 1,6 1,9 @@
#!/usr/bin/env bash
set -eux
+GUIX_PROFILE="/home/kodi/.guix-profile"
+. "$GUIX_PROFILE/etc/profile"
+
# Needed for systemd systems
# sleep 60
M files/nonguix-config.scm => files/nonguix-config.scm +10 -4
@@ 197,7 197,7 @@
(name "root")
;; If "" then no password set otherwise put the output of mkpasswd
;; with your desired password (mkpasswd --method=sha-512)
- (password "")
+; (password "")
(uid 0)
(group "root")
(comment "System God")
@@ 209,7 209,7 @@
(uid 1000)
(group "users")
;; The set of groups we have thus far as needed for basic laptop experience
- (supplementary-groups '("sudo" "netdev" "kvm" "audio" "video"))
+ (supplementary-groups '("sudo" "netdev" "dialout" "kvm" "audio" "video"))
(home-directory "/home/admin"))
;; Service accounts required
@@ 426,8 426,14 @@ root ALL=(ALL) ALL
;; [slim] (EE) dbus-core: error connecting to system bus
(simple-service 'extras-dbus dbus-root-service-type
(list iwd slim))
- ;; still need to manually start the iwd process
- ;; but a shepherd service here should fix that
+ ;; Add a simple shepherd service so we don't have to manually start iwd
+ (simple-service 'iwd-shepherd-service
+ shepherd-root-service-type (list (shepherd-service
+ (documentation "iwd service")
+ (requirement '(dbus-system))
+ (provision '(iwd))
+ (start #~(make-forkexec-constructor (list #$(file-append iwd "/libexec/iwd"))))
+ (stop #~(make-kill-destructor)))))
;; To log what we are doing
;; unfortunately there is no way to disable MARK messages
M files/nonguix-kodi-config.scm => files/nonguix-kodi-config.scm +2 -2
@@ 216,7 216,7 @@
(name "root")
;; If "" then no password set otherwise put the output of mkpasswd
;; with your desired password (mkpasswd --method=sha-512)
- (password "")
+; (password "")
(uid 0)
(group "root")
(comment "System God")
@@ 228,7 228,7 @@
(uid 1000)
(group "users")
;; The set of groups we have thus far as needed for basic laptop experience
- (supplementary-groups '("sudo" "netdev" "kvm" "audio" "video"))
+ (supplementary-groups '("sudo" "netdev" "dialout" "kvm" "audio" "video"))
(home-directory "/home/admin"))
;; Desired service account
M personal/x200.scm => personal/x200.scm +14 -40
@@ 11,6 11,7 @@
(gnu services linux)
(gnu services pm)
(gnu services security-token)
+ (gnu services shepherd)
(gnu services xorg))
(use-service-modules desktop networking xorg)
@@ 57,44 58,13 @@
xfce
xorg)
-;; Needed to get basic graphics performance on an X200
-(define-public intel-vaapi-driver-g45-h264
- (let ((base intel-vaapi-driver))
- (package
- (inherit base)
- (name "intel-vaapi-driver-g45-h264")
- (version "2.3.0")
- (source (origin
- (method url-fetch)
- (uri
- (string-append
- "https://bitbucket.org/alium/g45-h264/downloads/intel-driver-g45-h264-"
- version ".tar.gz"))
- (sha256
- (base32
- "0hf6h6754qf2sfhfq5i6pwn5dc06hjib6m05r8999ilbvrv4axar"))))
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:phases phases '%standard-phases)
- `(modify-phases ,phases
- (add-before 'bootstrap 'skip-premature-configure
- (lambda _
- (setenv "NOCONFIGURE" "set")
- #t))))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("libtool" ,libtool)
- ,@(package-native-inputs base))))))
-
(operating-system
(host-name "x200")
(timezone "America/New_York")
(keyboard-layout (keyboard-layout "us"))
(locale "en_US.UTF-8")
- ;; Set kernel on a version compatible with: intel-vaapi-driver-g45-h264
- (kernel linux-libre-4.19)
+ (kernel linux-libre)
;; according to <https://linrunner.de/tlp/installation/arch.html#thinkpads-only-external-kernel-modules> and "guix shell tlp -- sudo tlp-stat -b"
(kernel-loadable-modules (list tp-smapi-module))
@@ 135,7 105,7 @@
;;"virtio_pci" "virtio_balloon" "virtio_blk" "virtio_net" "virtio_console" "virtio-rng"
"usb-storage" "uas" ; for the installation image etc.
"nls_iso8859-1" ; for `mkfs.fat`, et.al
-; "xxhash_generic" ; For btrfs xxhash checksum support (not supported on older Linux kernels)
+ "xxhash_generic" ; For btrfs xxhash checksum support (not supported on older Linux kernels)
"dm-crypt" "xts" "serpent_generic" "wp512" ; for encrypted root partitions
"usbhid" "hid-generic" "hid-apple")) ; keyboards during early boot
@@ 215,7 185,7 @@
(uid 1000)
(group "users")
;; The set of groups we have thus far as needed for basic laptop experience
- (supplementary-groups '("sudo" "netdev" "kvm" "audio" "video" "tor" "seat"))
+ (supplementary-groups '("sudo" "netdev" "dialout" "kvm" "audio" "video" "tor" "seat"))
(home-directory "/home/admin"))
;; Service accounts required
@@ 341,7 311,6 @@ root ALL=(ALL) ALL
man-db ; Enable support for manpages
man-pages ; Actually have the contents for Linux
man-pages-posix ; Posix Version
- net-tools ; XXX: remove when Inetutils suffices
nftables ; Manage firewall (replaces iptables)
nss-certs ; for HTTPS access
nvi ; For quick edits
@@ 355,7 324,6 @@ root ALL=(ALL) ALL
rxvt-unicode ; Terminal
screen ; Terminal multiplex
sed ; Search and replace
- slim ; graphical login manager with slimlock
slock ; as slimlock is broken right now
shadow ; User management tools (and passwd)
sshfs ; Enable simple remote filesystem mounts
@@ 367,11 335,11 @@ root ALL=(ALL) ALL
tree ; Handy file directory map generator
usbutils ; For manipulating USB devices (lsusb)
util-linux ; For dmesg
- intel-vaapi-driver-g45-h264 ; Needed for mpv playback performance on x200
+ intel-vaapi-driver ; Needed for mpv playback performance on x200
wget ; Downloader
which ; Find full path
whois ; For mkpasswd
- xf86-video-intel ; intel video driver
+ xf86-video-intel ; X11 drivers for intel
xrdb ; Ensure ~/.Xresources is loaded
xorg-server-xwayland ; Enable x11 on wayland
xz)) ; Support xz
@@ 455,8 423,14 @@ root ALL=(ALL) ALL
;; [slim] (EE) dbus-core: error connecting to system bus
(simple-service 'extras-dbus dbus-root-service-type
(list iwd))
- ;; still need to manually start the iwd process
- ;; but a shepherd service here should fix that
+ ;; Add a simple shepherd service so we don't have to manually start iwd
+ (simple-service 'iwd-shepherd-service
+ shepherd-root-service-type (list (shepherd-service
+ (documentation "iwd service")
+ (requirement '(dbus-system))
+ (provision '(iwd))
+ (start #~(make-forkexec-constructor (list #$(file-append iwd "/libexec/iwd"))))
+ (stop #~(make-kill-destructor)))))
;; For tor
(service tor-service-type)