From 143aea958c5ce9df0b5694a0d4614400e7bb7c5e Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Tue, 12 Dec 2023 12:41:24 +0100
Subject: [PATCH] .

---
 install-guix-on-void.bash | 42 ++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/install-guix-on-void.bash b/install-guix-on-void.bash
index b5cef77..ea61287 100644
--- a/install-guix-on-void.bash
+++ b/install-guix-on-void.bash
@@ -1,53 +1,55 @@
 #!/usr/local/env bash
-sudo xbps-install -SuA nscd wget curl brightnessctl pam_rundir seatd polkit mdevd mesa-dri
-sudo ln -sf /etc/sv/nscd /var/service/
-sudo bash <<< curl https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
+ xbps-install -SuA wget curl brightnessctl pam_rundir seatd polkit mdevd mesa-dri gnupg2 xz
+ ln -sf /etc/sv/nscd /var/service/
+curl -L https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh > guix-install.sh
+ which guix || bash guix-install.sh
+ guix install shepherd
 
-sed -i '/pam_rundir/{h;s/^.*$/-session optional pam_rundir.so/};${x;/^$/{s//-session optional pam_rundir.so/;H};x}' /etc/pam.d/system-login
+ sed -i '/pam_rundir/{h;s/^.*$/-session optional pam_rundir.so/};${x;/^$/{s//-session optional pam_rundir.so/;H};x}' /etc/pam.d/system-login
 
 # Guix Daemon
-sudo mkdir -p /etc/sv/guix-daemon/log
-sudo cat <<'EOF' > /etc/sv/guix-daemon/run
+ mkdir -p /etc/sv/guix-daemon/log
+ cat <<'EOF' > /etc/sv/guix-daemon/run
 #!/bin/sh
 exec 2>&1
 exec ~root/.config/guix/current/bin/guix-daemon --build-users-group=guixbuild
 EOF
-sudo chmod +x /etc/sv/guix-daemon/run
+ chmod +x /etc/sv/guix-daemon/run
 
-sudo cat <<EOF > /etc/sv/guix-daemon/log/run
+ cat <<EOF > /etc/sv/guix-daemon/log/run
 #!/bin/sh
 exec vlogger -t guix-daemon -p daemon
 EOF
-sudo chmod +x /etc/sv/guix-daemon/log/run
+ chmod +x /etc/sv/guix-daemon/log/run
 
-sudo ln -sf /etc/sv/guix-daemon /var/service/
+ ln -sf /etc/sv/guix-daemon /var/service/
 
 # Shepherd Daemon
-sudo mkdir -p /etc/sv/shepherd/log
-sudo cat <<EOF > /etv/sv/shepherd/run
+ mkdir -p /etc/sv/shepherd/log
+ cat <<EOF > /etc/sv/shepherd/run
 #!/bin/sh
 exec 2>&1
-exec $(which shepherd)
+exec $(find /gnu -wholename '*/bin/shepherd')
 EOF
-sudo chmod +x /etc/sv/shepherd/run
+ chmod +x /etc/sv/shepherd/run
 
-sudo cat <<EOF > /etc/sv/shepherd/log/run
+ cat <<EOF > /etc/sv/shepherd/log/run
 #!/bin/sh
 exec vlogger -t shepherd -p daemon
 EOF
-sudo chmod +x /etc/sv/shepherd/log/run
+ chmod +x /etc/sv/shepherd/log/run
 
-sudo ln -sf /etc/sv/shepherd /var/service/
+ ln -sf /etc/sv/shepherd /var/service/
 
 # Enable Daemons
 
 for DAEMON in guix-daemon shepherd NetworkManager acpid dbus nscd polkitd seatd mdevd
 
 # Profile Initialization
-sudo cat <<'EOF' >> ~/.profile
+cat <<'EOF' >> ~/.profile
 GUIX_PROFILE="/home/zilti/.config/guix/current"
 . "$GUIX_PROFILE/etc/profile"
 EOF
 
-guix pull
-guix home reconfigure ./home/home-configuration.scm
+#guix pull
+#guix home reconfigure ./home/home-configuration.scm