scripts/lib/action.fish

@@ -10,15 +10,14 @@ function runActionSetup -V dir
     and runHook prepareNix || installNixPkgs
 
     and echo "Flagging repository as safe..."
-    and sudo git config --system --add safe.directory (realpath -m "$(status dirname)/../..")
+    and sudo git config --system --add safe.directory (realpath "$(status dirname)/../..")
     and runHook actionPreRun || true
 end
 
-function runActionConfigure -V dir
+function runActionConfigure
     and if [ -z "$CONFIG_NAME" ]
-        source "$dir/settings.fish"
         selectProfile config
-        set -gx CONFIG_NAME "$config"
+        set -x CONFIG_NAME "$config"
     end
 end
 
@@ -38,44 +37,39 @@ function runAction -V dir
 end
 
 function runSetupUserAction -V dir
-    source "$dir/settings.fish"
-    runActionSetup
-    runActionConfigure
-    set -l env "CONFIG_NAME=$CONFIG_NAME"
-    set -l name (getOSConfig setupUser.name)
-
-    if [ "$USER" != "$name" ]
+    if [ (id -u) -eq 0 ]
         set -l cmdline (cat /proc/$fish_pid/cmdline | string split0)
 
-        if [ (id -u) -ne 0 ]
-            sudo --set-home --preserve-env $cmdline
+        if [ -z "$TMUX" ]
+            runActionSetup
+            tmux new-session -e "CONFIG_NAME=$CONFIG_NAME" $cmdline
         else
-            if [ -z "$TMUX" ]
-                tmux new-session -e "$env" $cmdline
-            else
-                set -l sudoConfig "/etc/sudoers.d/PortValhalla"
+            source "$dir/settings.fish"
+            runActionConfigure
+            set -l sudoConfig "/etc/sudoers.d/PortValhalla"
+            set -l name (getOSConfig setupUser.name)
 
-                begin
-                    echo "Creating setup user"
+            and begin
+                echo "Creating setup user"
 
-                    and useradd \
-                            --comment "PortValhalla Setup User" \
-                            --system \
-                            --groups nix-users \
-                            --create-home \
-                            --uid (getOSConfig setupUser.id --json) \
-                            "$name"
-
-                    and begin
-                        echo "$name ALL=(ALL:ALL) NOPASSWD: ALL"
-                    end >"$sudoConfig"
-
-                    and sudo --preserve-env --set-home --user "$name" $cmdline
-                    disposeAction
-                    rm "$sudoConfig"
-                    userdel -rf "$name"
-                end
+                and useradd \
+                    --comment "PortValhalla Setup User" \
+                    --system \
+                    --no-user-group \
+                    --groups nix-users \
+                    --create-home \
+                    --uid (getOSConfig setupUser.id --json) \
+                    "$name"
             end
+
+            and begin
+                echo "$name ALL=(ALL:ALL) NOPASSWD: ALL"
+            end >"$sudoConfig"
+
+            and sudo --preserve-env --set-home --user "$name" $cmdline
+            disposeAction
+            rm "$sudoConfig"
+            userdel -rf "$name"
         end
     else
         $argv

scripts/lib/nix.fish

@@ -3,14 +3,10 @@ begin
     set -l config "$dir/config.fish"
     set nixPkgsDir "/nix/var/nix/profiles/per-user/root/channels/nixpkgs"
 
-    function __isNixModule -a path
-        nix-instantiate --eval --expr "{ path }: import path" --argstr path "$path" &>/dev/null
-    end
-
     function downloadNixPkgs -V config
         source "$config"
 
-        if ! __isNixModule "$nixPkgsCache"
+        if [ ! -d "$nixPkgsCache" ]
             mkdir -p "$nixPkgsCache"
             and git clone https://github.com/NixOS/nixpkgs.git --depth=1 -b "$nixPkgsVersion" "$nixPkgsCache"
             and rm -rf "$nixPkgsCache/.git"
@@ -20,8 +16,8 @@ begin
     function installNixPkgs -V config -V nixPkgsDir
         source "$config"
 
-        if ! __isNixModule "$nixPkgsDir"
-            if ! __isNixModule "$nixPkgsCache"
+        if [ ! -d "$nixPkgsDir" ]
+            if [ ! -d "$nixPkgsCache" ]
                 downloadNixPkgs
             end