commit f7860f7970762083ab8a3e745026e3230aa4202d
parent a406115f1babd09be73d4ebe4d0e43b4c48d9022
Author: Vineet Kumar <git@vineetk.net>
Date: Sat, 23 May 2026 15:55:59 -0400
demiurge, hastur: reindent
Diffstat:
2 files changed, 206 insertions(+), 206 deletions(-)
diff --git a/epistemia/systems/demiurge.scm b/epistemia/systems/demiurge.scm
@@ -147,8 +147,8 @@
(one-shot? #t)
(documentation "Set GPU power cap on boot")
(start #~(make-forkexec-constructor
- (list #$(file-append bash "/bin/bash") "-c"
- (string-append
+ (list #$(file-append bash "/bin/bash") "-c"
+ (string-append
"echo 294000000 > /sys/class/drm/card0/device/hwmon/hwmon*/power1_cap; "
"echo 294000000 > /sys/class/drm/card1/device/hwmon/hwmon*/power1_cap"))))
(stop #~(make-kill-destructor)))))
diff --git a/epistemia/systems/hastur.scm b/epistemia/systems/hastur.scm
@@ -33,215 +33,215 @@
#:use-module (epistemia packages zfs))
(operating-system
- (inherit base-system)
- (host-name "hastur.epistemia")
+ (inherit base-system)
+ (host-name "hastur.epistemia")
- (users (cons (user-account
- (name "vin")
- (comment "Vineet")
- (shell (file-append bash "/bin/bash"))
- (group "users")
- (supplementary-groups '("wheel" "audio" "video" "input" "seat" "tty" "kvm")))
- %base-user-accounts))
+ (users (cons (user-account
+ (name "vin")
+ (comment "Vineet")
+ (shell (file-append bash "/bin/bash"))
+ (group "users")
+ (supplementary-groups '("wheel" "audio" "video" "input" "seat" "tty" "kvm")))
+ %base-user-accounts))
- (kernel linux-6.18)
- (kernel-arguments (list "net.ifnames=0" "modprobe.blacklist=snd_hda_intel"))
- (kernel-loadable-modules (list (list zfs-linux "module")))
+ (kernel linux-6.18)
+ (kernel-arguments (list "net.ifnames=0" "modprobe.blacklist=snd_hda_intel"))
+ (kernel-loadable-modules (list (list zfs-linux "module")))
- (initrd (lambda (file-systems . args)
- (apply microcode-initrd file-systems
- #:initrd epistemia-zfs-initrd
- #:zfs-package zfs-linux
- args)))
- (firmware (cons* i915-firmware iwlwifi-firmware %base-firmware))
+ (initrd (lambda (file-systems . args)
+ (apply microcode-initrd file-systems
+ #:initrd epistemia-zfs-initrd
+ #:zfs-package zfs-linux
+ args)))
+ (firmware (cons* i915-firmware iwlwifi-firmware %base-firmware))
- (bootloader (bootloader-configuration
- (bootloader grub-zfs)
- (targets '("/boot/efi"))))
+ (bootloader (bootloader-configuration
+ (bootloader grub-zfs)
+ (targets '("/boot/efi"))))
- (file-systems (append
- (list (file-system
- (device "zroot/root")
- (mount-point "/")
- (type "zfs")
- (check? #f)
- (needed-for-boot? #t))
- (file-system
- (device "zroot/gnu")
- (mount-point "/gnu")
- (type "zfs")
- (check? #f)
- (needed-for-boot? #t))
- (file-system
- (device "zroot/var")
- (mount-point "/var")
- (type "zfs")
- (check? #f)
- (needed-for-boot? #t))
- (file-system
- (device "zroot/home")
- (mount-point "/home")
- (type "zfs")
- (check? #f)
- (needed-for-boot? #t))
- (file-system
- (device (uuid "85DD-DE6D" 'fat))
- (mount-point "/boot/efi")
- (type "vfat"))
- (file-system
- (device "none")
- (mount-point "/home/vin/.local/state/runtime")
- (type "tmpfs")
- (options "uid=1000")))
- %base-file-systems))
+ (file-systems (append
+ (list (file-system
+ (device "zroot/root")
+ (mount-point "/")
+ (type "zfs")
+ (check? #f)
+ (needed-for-boot? #t))
+ (file-system
+ (device "zroot/gnu")
+ (mount-point "/gnu")
+ (type "zfs")
+ (check? #f)
+ (needed-for-boot? #t))
+ (file-system
+ (device "zroot/var")
+ (mount-point "/var")
+ (type "zfs")
+ (check? #f)
+ (needed-for-boot? #t))
+ (file-system
+ (device "zroot/home")
+ (mount-point "/home")
+ (type "zfs")
+ (check? #f)
+ (needed-for-boot? #t))
+ (file-system
+ (device (uuid "85DD-DE6D" 'fat))
+ (mount-point "/boot/efi")
+ (type "vfat"))
+ (file-system
+ (device "none")
+ (mount-point "/home/vin/.local/state/runtime")
+ (type "tmpfs")
+ (options "uid=1000")))
+ %base-file-systems))
- (swap-devices (list (swap-space (target (uuid "a9f91237-58fe-452a-b4af-cbd281f5b8ce")))))
+ (swap-devices (list (swap-space (target (uuid "a9f91237-58fe-452a-b4af-cbd281f5b8ce")))))
- (packages (append (list emacs-no-x
- git
- zfs-linux)
- %base-packages))
+ (packages (append (list emacs-no-x
+ git
+ zfs-linux)
+ %base-packages))
- (services (modify-services (append (list (service age-secret-service-type
- (age-secret-configuration
- (secrets (list
- (age-secret
- (name "wpa_supplicant")
- (file (local-file "../secrets/wpa_supplicant.age")))
- (age-secret
- (name "wg0_hastur")
- (file (local-file "../secrets/wg0_hastur.age")))
- (age-secret
- (name "wg1_hastur")
- (file (local-file "../secrets/wg1_hastur.age")))
- (age-secret
- (name "wg2_hastur")
- (file (local-file "../secrets/wg2_hastur.age")))))))
- (simple-service 'zfs-loader
- kernel-module-loader-service-type
- '("zfs"))
- (simple-service 'zfs-shepherd-services
- shepherd-root-service-type
- zfs-shepherd-services)
- (simple-service 'zfs-shepherd-services-user-processes
- user-processes-service-type
- '(zfs-automount))
- (service seatd-service-type)
- (service iptables-service-type)
- (service unbound-service-type
- (unbound-configuration
- (server
- (unbound-server
- (interface '("::1"))
- (hide-version #t)
- (hide-identity #t)
- (extra-options '((ip-freebind . yes)
- (aggressive-nsec . no)))))
- (forward-zone
- (list
- (unbound-zone
- (name ".")
- (forward-addr '("10.0.13.1")))
- (unbound-zone
- (name "carcosa.13f0.net.")
- (forward-addr '("9.9.9.9")))))))
- (service dhcpcd-service-type
- (dhcpcd-configuration
- (option '("rapid_commit" "interface_mtu"))
- (no-option '("nd_rdnss"
- "dhcp6_name_servers"
- "domain_name_servers"
- "domain_name"
- "domain_search"))
- (static '("domain_name_servers=::1"
- "domain_search=epistemia"))
- (no-hook '("hostname"))))
- (service wpa-supplicant-service-type
- (wpa-supplicant-configuration
- (shepherd-requirement '(age-secret kernel-module-loader))
- (wpa-supplicant wpa-supplicant-minimal)
- (dbus? #f)
- (interface "wlan0")
- (config-file "/run/secrets/wpa_supplicant")))
- (service bluetooth-service-type)
- (service openssh-service-type
- (openssh-configuration
- (permit-root-login #f)
- (authorized-keys
- `(("vin" ,(local-file "/data/ssh/id_ed25519.pub"))
- ("root" ,(local-file "/data/ssh/id_ed25519.pub"))))))
- (service wireguard-service-type
- (wireguard-configuration
- (interface "wg0")
- (addresses '("172.27.194.145/32" "fd00:0000:1337:cafe:1111:1111:9893:6822/128"))
- (port 51821)
- (bootstrap-private-key? #f)
- (shepherd-requirement '(age-secret wpa-supplicant))
- (private-key "/run/secrets/wg0_hastur")
- (pre-up '("while [ ! -f /run/secrets/wg0_hastur ]; do sleep 1; done"
- "while [ -z \"$(ip route show default)\" ]; do sleep 1; done"
- "ip route add 185.157.162.7 via $(ip route show default | cut -d' ' -f3) dev wlan0"))
- (post-down '("ip route del 185.157.162.7"))
- (peers
- (list
- (wireguard-peer
- (name "ovpn-ams-29")
- (public-key "wTlz3u1egzUrx4Ho02cL7Ht1BBa/C8bULzXStn5f+zk=")
- (allowed-ips '("0.0.0.0/0" "::0/0"))
- (endpoint "185.157.162.7:9929"))))))
- (service wireguard-service-type
- (wireguard-configuration
- (interface "wg1")
- (addresses '("10.0.13.3/24" "fd00:b0ba:cafe:babe::3/64"))
- (port 51820)
- (bootstrap-private-key? #f)
- (private-key "/run/secrets/wg1_hastur")
- (table #f)
- (shepherd-requirement '(age-secret unbound wpa-supplicant))
- (pre-up '("while [ ! -f /run/secrets/wg1_hastur ]; do sleep 1; done"
- "while [ -z \"$(ip route show default)\" ]; do sleep 1; done"))
- (peers
- (list
- (wireguard-peer
- (name "saklas.epistemia")
- (public-key "XvRailvccuc7LJIF4aaYM/MLkU4upiprwFlCfBllhl0=")
- (allowed-ips '("10.0.13.1/32" "fd00:b0ba:cafe:babe::1/128"))
- (endpoint "141.95.52.111:51820")
- (keep-alive 25))
- (wireguard-peer
- (name "demiurge.epistemia")
- (public-key "FMLvbSxY6vA8CRV4S1vl4+pMeCr/kR9n0G5w9buNqh4=")
- (allowed-ips '("10.0.13.2/32" "fd00:b0ba:cafe:babe::2/128"))
- (endpoint "carcosa.13f0.net:51820")
- (keep-alive 25))))))
- (service wireguard-service-type
- (wireguard-configuration
- (interface "wg2")
- (addresses '("10.0.14.2/24"))
- (port 51822)
- (bootstrap-private-key? #f)
- (private-key "/run/secrets/wg2_hastur")
- (shepherd-requirement '(age-secret wpa-supplicant))
- (pre-up '("while [ ! -f /run/secrets/wg2_hastur ]; do sleep 1; done"
- "while [ -z \"$(ip route show default)\" ]; do sleep 1; done"))
- (peers
- (list
- (wireguard-peer
- (name "abatur.epistemia")
- (public-key "OOpc1K4S56FdJkCaqHx3DC4aIO+zQCAo8ACwCboLEjg=")
- (allowed-ips '("10.0.14.1/32" "100.64.0.0/10"))
- (endpoint "87.99.141.145:51822")
- (keep-alive 25))))))
- (service pam-limits-service-type
- (list (pam-limits-entry "@audio" 'both 'rtprio 99)
- (pam-limits-entry "@audio" 'both 'memlock 'unlimited)))
- (service powertop-service-type)
- (service tlp-service-type))
- %base-services)
- (sysctl-service-type config =>
- (sysctl-configuration
- (settings
- (append
- '(("net.ipv4.ip_forward" . "1")
- ("net.ipv6.conf.all.forwarding" . "1"))
- %default-sysctl-settings)))))))
+ (services (modify-services (append (list (service age-secret-service-type
+ (age-secret-configuration
+ (secrets (list
+ (age-secret
+ (name "wpa_supplicant")
+ (file (local-file "../secrets/wpa_supplicant.age")))
+ (age-secret
+ (name "wg0_hastur")
+ (file (local-file "../secrets/wg0_hastur.age")))
+ (age-secret
+ (name "wg1_hastur")
+ (file (local-file "../secrets/wg1_hastur.age")))
+ (age-secret
+ (name "wg2_hastur")
+ (file (local-file "../secrets/wg2_hastur.age")))))))
+ (simple-service 'zfs-loader
+ kernel-module-loader-service-type
+ '("zfs"))
+ (simple-service 'zfs-shepherd-services
+ shepherd-root-service-type
+ zfs-shepherd-services)
+ (simple-service 'zfs-shepherd-services-user-processes
+ user-processes-service-type
+ '(zfs-automount))
+ (service seatd-service-type)
+ (service iptables-service-type)
+ (service unbound-service-type
+ (unbound-configuration
+ (server
+ (unbound-server
+ (interface '("::1"))
+ (hide-version #t)
+ (hide-identity #t)
+ (extra-options '((ip-freebind . yes)
+ (aggressive-nsec . no)))))
+ (forward-zone
+ (list
+ (unbound-zone
+ (name ".")
+ (forward-addr '("10.0.13.1")))
+ (unbound-zone
+ (name "carcosa.13f0.net.")
+ (forward-addr '("9.9.9.9")))))))
+ (service dhcpcd-service-type
+ (dhcpcd-configuration
+ (option '("rapid_commit" "interface_mtu"))
+ (no-option '("nd_rdnss"
+ "dhcp6_name_servers"
+ "domain_name_servers"
+ "domain_name"
+ "domain_search"))
+ (static '("domain_name_servers=::1"
+ "domain_search=epistemia"))
+ (no-hook '("hostname"))))
+ (service wpa-supplicant-service-type
+ (wpa-supplicant-configuration
+ (shepherd-requirement '(age-secret kernel-module-loader))
+ (wpa-supplicant wpa-supplicant-minimal)
+ (dbus? #f)
+ (interface "wlan0")
+ (config-file "/run/secrets/wpa_supplicant")))
+ (service bluetooth-service-type)
+ (service openssh-service-type
+ (openssh-configuration
+ (permit-root-login #f)
+ (authorized-keys
+ `(("vin" ,(local-file "/data/ssh/id_ed25519.pub"))
+ ("root" ,(local-file "/data/ssh/id_ed25519.pub"))))))
+ (service wireguard-service-type
+ (wireguard-configuration
+ (interface "wg0")
+ (addresses '("172.27.194.145/32" "fd00:0000:1337:cafe:1111:1111:9893:6822/128"))
+ (port 51821)
+ (bootstrap-private-key? #f)
+ (shepherd-requirement '(age-secret wpa-supplicant))
+ (private-key "/run/secrets/wg0_hastur")
+ (pre-up '("while [ ! -f /run/secrets/wg0_hastur ]; do sleep 1; done"
+ "while [ -z \"$(ip route show default)\" ]; do sleep 1; done"
+ "ip route add 185.157.162.7 via $(ip route show default | cut -d' ' -f3) dev wlan0"))
+ (post-down '("ip route del 185.157.162.7"))
+ (peers
+ (list
+ (wireguard-peer
+ (name "ovpn-ams-29")
+ (public-key "wTlz3u1egzUrx4Ho02cL7Ht1BBa/C8bULzXStn5f+zk=")
+ (allowed-ips '("0.0.0.0/0" "::0/0"))
+ (endpoint "185.157.162.7:9929"))))))
+ (service wireguard-service-type
+ (wireguard-configuration
+ (interface "wg1")
+ (addresses '("10.0.13.3/24" "fd00:b0ba:cafe:babe::3/64"))
+ (port 51820)
+ (bootstrap-private-key? #f)
+ (private-key "/run/secrets/wg1_hastur")
+ (table #f)
+ (shepherd-requirement '(age-secret unbound wpa-supplicant))
+ (pre-up '("while [ ! -f /run/secrets/wg1_hastur ]; do sleep 1; done"
+ "while [ -z \"$(ip route show default)\" ]; do sleep 1; done"))
+ (peers
+ (list
+ (wireguard-peer
+ (name "saklas.epistemia")
+ (public-key "XvRailvccuc7LJIF4aaYM/MLkU4upiprwFlCfBllhl0=")
+ (allowed-ips '("10.0.13.1/32" "fd00:b0ba:cafe:babe::1/128"))
+ (endpoint "141.95.52.111:51820")
+ (keep-alive 25))
+ (wireguard-peer
+ (name "demiurge.epistemia")
+ (public-key "FMLvbSxY6vA8CRV4S1vl4+pMeCr/kR9n0G5w9buNqh4=")
+ (allowed-ips '("10.0.13.2/32" "fd00:b0ba:cafe:babe::2/128"))
+ (endpoint "carcosa.13f0.net:51820")
+ (keep-alive 25))))))
+ (service wireguard-service-type
+ (wireguard-configuration
+ (interface "wg2")
+ (addresses '("10.0.14.2/24"))
+ (port 51822)
+ (bootstrap-private-key? #f)
+ (private-key "/run/secrets/wg2_hastur")
+ (shepherd-requirement '(age-secret wpa-supplicant))
+ (pre-up '("while [ ! -f /run/secrets/wg2_hastur ]; do sleep 1; done"
+ "while [ -z \"$(ip route show default)\" ]; do sleep 1; done"))
+ (peers
+ (list
+ (wireguard-peer
+ (name "abatur.epistemia")
+ (public-key "OOpc1K4S56FdJkCaqHx3DC4aIO+zQCAo8ACwCboLEjg=")
+ (allowed-ips '("10.0.14.1/32" "100.64.0.0/10"))
+ (endpoint "87.99.141.145:51822")
+ (keep-alive 25))))))
+ (service pam-limits-service-type
+ (list (pam-limits-entry "@audio" 'both 'rtprio 99)
+ (pam-limits-entry "@audio" 'both 'memlock 'unlimited)))
+ (service powertop-service-type)
+ (service tlp-service-type))
+ %base-services)
+ (sysctl-service-type config =>
+ (sysctl-configuration
+ (settings
+ (append
+ '(("net.ipv4.ip_forward" . "1")
+ ("net.ipv6.conf.all.forwarding" . "1"))
+ %default-sysctl-settings)))))))
