Shell update

6 files changed, 17 insertions, 10 deletions

diff --git a/hooks/post-up/installations b/hooks/post-up/installations
index 562bfe2..320f86d 100644
--- a/hooks/post-up/installations
+++ b/hooks/post-up/installations
@@ -1,3 +1,2 @@
-#!/bin/bash
-set -e
+#!/bin/sh
 xsync
diff --git a/hooks/pre-up/1-oksh b/hooks/pre-up/1-oksh
new file mode 100755
index 0000000..7cff998
--- /dev/null
+++ b/hooks/pre-up/1-oksh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if ! [ -x "$(command -v mksh)" ]; then
+  sudo xbps-install -y mksh
+  chsh -s /bin/mksh
+fi
diff --git a/hooks/pre-up/2-nix b/hooks/pre-up/2-nix
new file mode 100755
index 0000000..cfba81f
--- /dev/null
+++ b/hooks/pre-up/2-nix
@@ -0,0 +1,8 @@
+#!/bin/mksh
+
+if ! [ -x "$(command -v nix)" ]; then
+  echo "Installing Nix"
+  sudo install -d -m755 -o $(id -u) -g $(id -g) /nix
+  curl -L https://nixos.org/nix/install | sh
+fi
+
diff --git a/hooks/pre-up/void b/hooks/pre-up/3-void
index 01de807..e0824c2 100755
--- a/hooks/pre-up/void
+++ b/hooks/pre-up/3-void
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # We'll use xpkg from xtools to find installable packages
 if ! [ -x "$(command -v xpkg)" ]; then
@@ -12,4 +12,4 @@ fi
 
 if [ ! "$(cat ~/repository.list | grep 'void-repo-nonfree')" ]; then
   sudo xbps-install -Sy void-repo-nonfree
-fi
\ No newline at end of file
+fi
diff --git a/hooks/pre-up/mbsync b/hooks/pre-up/4-mbsync
index 6d58bb1..6d58bb1 100755
--- a/hooks/pre-up/mbsync
+++ b/hooks/pre-up/4-mbsync
diff --git a/hooks/pre-up/nix b/hooks/pre-up/nix
deleted file mode 100755
index 84c077e..0000000
--- a/hooks/pre-up/nix
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-if ! [ -x "$(command -v nix)" ]; then
-   sh <(curl -L https://nixos.org/nix/install) --no-daemon
-fi
-