From 7d43d907a63a62ca2e30450ad9e214efdc156761 Mon Sep 17 00:00:00 2001 From: Vineet Kumar Date: Fri, 22 May 2026 18:12:55 -0400 Subject: demiurge: do some quoting and indenting --- epistemia/files/emacs/.config/emacs/init.el | 2 +- epistemia/systems/demiurge.scm | 102 ++++++++++++++-------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/epistemia/files/emacs/.config/emacs/init.el b/epistemia/files/emacs/.config/emacs/init.el index fdc8d33..af34f60 100644 --- a/epistemia/files/emacs/.config/emacs/init.el +++ b/epistemia/files/emacs/.config/emacs/init.el @@ -544,7 +544,7 @@ :custom (notmuch-show-logo nil) (notmuch-tree-outline-enabled t) - (notmuch-multipart/alternative-discouraged (list "text/html" "multipart/related"))) + (notmuch-multipart/alternative-discouraged '("text/html" "multipart/related"))) ;; TODO: needs NOTMUCH_PROFILE set or update package to git ;; (use-package notmuch-indicator diff --git a/epistemia/systems/demiurge.scm b/epistemia/systems/demiurge.scm index 590c979..617d001 100644 --- a/epistemia/systems/demiurge.scm +++ b/epistemia/systems/demiurge.scm @@ -45,9 +45,9 @@ (list (nginx-location-configuration (uri "/") - (body (list (string-append "proxy_pass http://127.0.0.1:" (number->string proxy-port) ";") - "proxy_set_header Upgrade $http_upgrade;" - "proxy_set_header Connection \"upgrade\";"))))))) + (body `(,(string-append "proxy_pass http://127.0.0.1:" (number->string proxy-port) ";") + "proxy_set_header Upgrade $http_upgrade;" + "proxy_set_header Connection \"upgrade\";"))))))) (operating-system (inherit base-system) @@ -62,11 +62,11 @@ %base-user-accounts)) (kernel linux-6.18) - (kernel-arguments (list "net.ifnames=0" - "modprobe.blacklist=snd_hda_intel" - "amdgpu.gfxoff=0" - "amdgpu.aspm=0" - "amdgpu.runpm=0")) + (kernel-arguments '("net.ifnames=0" + "modprobe.blacklist=snd_hda_intel" + "amdgpu.gfxoff=0" + "amdgpu.aspm=0" + "amdgpu.runpm=0")) (kernel-loadable-modules (list (list zfs-linux "module"))) (initrd (lambda (file-systems . args) @@ -137,16 +137,16 @@ (simple-service 'gpu-power-cap shepherd-root-service-type (list (shepherd-service - (provision '(gpu-power-cap)) - (requirement '(udev)) - (one-shot? #t) - (documentation "Set GPU power cap on boot") - (start #~(make-forkexec-constructor + (provision '(gpu-power-cap)) + (requirement '(udev)) + (one-shot? #t) + (documentation "Set GPU power cap on boot") + (start #~(make-forkexec-constructor (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))))) + "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))))) (service seatd-service-type) (service iptables-service-type) (service static-networking-service-type @@ -196,20 +196,20 @@ (pre-up '("while [ ! -f /run/secrets/wg0_demiurge ]; do sleep 1; done" "ip route replace 185.157.162.7 via 192.168.1.1 dev eth0")) (post-up - (list "ip rule add fwmark 0x1 table 100 priority 100" - "ip rule add fwmark 51820 table 100 priority 100" - "ip route replace default via 192.168.1.1 dev eth0 table 100" - #~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -A PREROUTING -i eth0 -d 192.168.1.2 -m conntrack --ctstate NEW -j CONNMARK --set-mark 0x1") - #~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -A PREROUTING -i eth0 -j CONNMARK --restore-mark") - #~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -A OUTPUT -m conntrack --ctstate ESTABLISHED,RELATED -j CONNMARK --restore-mark"))) + `("ip rule add fwmark 0x1 table 100 priority 100" + "ip rule add fwmark 51820 table 100 priority 100" + "ip route replace default via 192.168.1.1 dev eth0 table 100" + ,#~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -A PREROUTING -i eth0 -d 192.168.1.2 -m conntrack --ctstate NEW -j CONNMARK --set-mark 0x1") + ,#~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -A PREROUTING -i eth0 -j CONNMARK --restore-mark") + ,#~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -A OUTPUT -m conntrack --ctstate ESTABLISHED,RELATED -j CONNMARK --restore-mark"))) (post-down - (list "ip route del 185.157.162.7 via 192.168.1.1 dev eth0" - "ip rule del fwmark 0x1 table 100" - "ip rule del fwmark 51820 table 100" - "ip route flush table 100" - #~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -D PREROUTING -i eth0 -d 192.168.1.2 -m conntrack --ctstate NEW -j CONNMARK --set-mark 0x1") - #~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -D PREROUTING -i eth0 -j CONNMARK --restore-mark") - #~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -D OUTPUT -m conntrack --ctstate ESTABLISHED,RELATED -j CONNMARK --restore-mark"))) + `("ip route del 185.157.162.7 via 192.168.1.1 dev eth0" + "ip rule del fwmark 0x1 table 100" + "ip rule del fwmark 51820 table 100" + "ip route flush table 100" + ,#~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -D PREROUTING -i eth0 -d 192.168.1.2 -m conntrack --ctstate NEW -j CONNMARK --set-mark 0x1") + ,#~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -D PREROUTING -i eth0 -j CONNMARK --restore-mark") + ,#~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -D OUTPUT -m conntrack --ctstate ESTABLISHED,RELATED -j CONNMARK --restore-mark"))) (peers (list (wireguard-peer @@ -306,31 +306,31 @@ (simple-service 'llm-router shepherd-root-service-type (list (shepherd-service - (provision '(llm-router)) - (requirement '(user-processes networking guix-daemon)) - (documentation "llm-router service") - (start #~(make-forkexec-constructor - (list "/home/vin/.config/guix/current/bin/guix" "shell" - "-m" "/data/src/public/llm-router/manifest.scm" - "--" "python3" "app.py") - #:user "vin" - #:directory "/data/src/public/llm-router" - #:log-file "/var/log/llm-router.log")) - (stop #~(make-kill-destructor))))) + (provision '(llm-router)) + (requirement '(user-processes networking guix-daemon)) + (documentation "llm-router service") + (start #~(make-forkexec-constructor + '("/home/vin/.config/guix/current/bin/guix" "shell" + "-m" "/data/src/public/llm-router/manifest.scm" + "--" "python3" "app.py") + #:user "vin" + #:directory "/data/src/public/llm-router" + #:log-file "/var/log/llm-router.log")) + (stop #~(make-kill-destructor))))) (simple-service 'sdui shepherd-root-service-type (list (shepherd-service - (provision '(sdui)) - (requirement '(user-processes networking guix-daemon)) - (documentation "sdui service") - (start #~(make-forkexec-constructor - (list "/home/vin/.config/guix/current/bin/guix" "shell" - "-m" "/data/src/public/sdui/manifest.scm" - "--" "python3" "app.py") - #:user "vin" - #:directory "/data/src/public/sdui" - #:log-file "/var/log/sdui.log")) - (stop #~(make-kill-destructor))))) + (provision '(sdui)) + (requirement '(user-processes networking guix-daemon)) + (documentation "sdui service") + (start #~(make-forkexec-constructor + '("/home/vin/.config/guix/current/bin/guix" "shell" + "-m" "/data/src/public/sdui/manifest.scm" + "--" "python3" "app.py") + #:user "vin" + #:directory "/data/src/public/sdui" + #:log-file "/var/log/sdui.log")) + (stop #~(make-kill-destructor))))) ;; netx three temporary (service dbus-root-service-type) (service rootless-podman-service-type -- cgit v1.2.3