From fdc18aae269d612d9a4fda6545f89aa3ee7f09a0 Mon Sep 17 00:00:00 2001
From: Marc Coquand <marc@mccd.space>
Date: Sat, 8 Jun 2024 12:12:57 -0500
Subject: Updates

---
 hooks/post-up/services | 31 +++++++++++++++----------------
 hooks/pre-up/1-ksh     |  6 ------
 hooks/pre-up/2-nix     |  1 +
 hooks/pre-up/3-void    |  4 ++--
 hooks/pre-up/4-mbsync  |  1 -
 5 files changed, 18 insertions(+), 25 deletions(-)
 delete mode 100755 hooks/pre-up/1-ksh

(limited to 'hooks')

diff --git a/hooks/post-up/services b/hooks/post-up/services
index a507fda..0d36f7d 100755
--- a/hooks/post-up/services
+++ b/hooks/post-up/services
@@ -1,26 +1,25 @@
 #!/bin/sh
 
-if [ $(ls /var/service | grep NetworkManager -c) -eq 0 ]
+if [ $(ls /var/service | grep elogind -c) -eq 0 ]
 then
-  sudo xbps-install -y NetworkManager dbus
-  sudo ln -s /etc/sv/NetworkManager /var/service/
-  sudo ln -s /etc/sv/dbus /var/service
-  sudo sv stop wpa_supplicant
-  sudo sv stop dhcpcd
-  sudo unlink /var/service/wpa_supplicant
-  sudo unlink /var/service/dhcpcd
+  doas xbps-install -y elogind
+  doas ln -s /etc/sv/elogind /var/service/
   sleep 5
-  sudo sv start dbus
-  sudo sv start NetworkManager
+  doas sv start elogind
 fi
 
-
-if [ $(ls /var/service | grep elogind -c) -eq 0 ]
+if [ $(ls /var/service | grep NetworkManager -c) -eq 0 ]
 then
-  sudo xbps-install -y elogind
-  sudo ln -s /etc/sv/elogind /var/service/
+  doas xbps-install -y NetworkManager dbus
+  doas ln -s /etc/sv/NetworkManager /var/service/
+  doas ln -s /etc/sv/dbus /var/service
+  doas sv stop wpa_supplicant
+  doas sv stop dhcpcd
+  doas unlink /var/service/wpa_supplicant
+  doas unlink /var/service/dhcpcd
   sleep 5
-  sudo sv start elogind
+  doas sv start dbus
+  doas sv start NetworkManager
 fi
 
-xsync
+echo "Services setup; logout and in, then run xsync"
diff --git a/hooks/pre-up/1-ksh b/hooks/pre-up/1-ksh
deleted file mode 100755
index 30dd8e1..0000000
--- a/hooks/pre-up/1-ksh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if ! [ -x "$(command -v mksh)" ]; then
-  sudo xbps-install -y mksh
-  echo "Installed, run chsh -s /bin/mksh"
-fi
diff --git a/hooks/pre-up/2-nix b/hooks/pre-up/2-nix
index 0cb74ba..19ba279 100755
--- a/hooks/pre-up/2-nix
+++ b/hooks/pre-up/2-nix
@@ -3,6 +3,7 @@
 if ! [ -x "$(command -v nix)" ]; then
   echo "Installing Nix"
   doas install -d -m755 -o $(id -u) -g $(id -g) /nix
+  doas xbps-install -y xz
   curl -L https://nixos.org/nix/install | sh
   echo "Nix has been installed, you should run nix profile install nixpkgs#nix-direnv once profile has been refreshed"
 fi
diff --git a/hooks/pre-up/3-void b/hooks/pre-up/3-void
index f8b7bc5..f2523f4 100755
--- a/hooks/pre-up/3-void
+++ b/hooks/pre-up/3-void
@@ -2,9 +2,9 @@
 
 # We'll use xpkg from xtools to find installable packages
 if ! [ -x "$(command -v xpkg)" ]; then
-  sudo xbps-install -y xtools
+  doas xbps-install -y xtools
 fi
 
 if [ ! "$(cat ~/repository.list | grep 'void-repo-nonfree')" ]; then
-  sudo xbps-install -y void-repo-nonfree
+  doas xbps-install -y void-repo-nonfree
 fi
diff --git a/hooks/pre-up/4-mbsync b/hooks/pre-up/4-mbsync
index 6d58bb1..b49b258 100755
--- a/hooks/pre-up/4-mbsync
+++ b/hooks/pre-up/4-mbsync
@@ -1,3 +1,2 @@
 #!/bin/sh
 mkdir -p ~/mail-home
-mkdir -p ~/mail-work
\ No newline at end of file
-- 
cgit v1.2.3