Remove bash profile during installation script

profiles/machines/manuel/server.nix

@@ -87,6 +87,11 @@ in {
                     "94.130.48.193"
                     "fe80::1"
                   ];
+
+                  DNS = [
+                    "5.9.164.112"
+                    "1.1.1.1"
+                  ];
                 };
 
                 Address = {

scripts/Arch/OS/setup.fish

@@ -94,6 +94,7 @@ begin
 
             and echo (getOSConfig hostname) | arch-chroot "$mountDir" tee /etc/hostname >/dev/null
 
+            and runInOS fish "$tempDir/../Software/systemd-networkd/main.fish"
             and runInOS fish "$tempDir/../Software/btrfs/main.fish"
             and arch-chroot "$mountDir" mkinitcpio -P
             and runInOS fish "$tempDir/../Software/grub/main.fish"

scripts/Arch/Software/systemd-networkd/main.fish

@@ -6,6 +6,7 @@ begin
 
     function configureSW -V dir
         systemctl enable systemd-networkd
+        systemctl enable systemd-resolved
         configureSWBase $argv
     end
 

scripts/Common/OS/setup.fish

@@ -77,25 +77,34 @@ function runSetup
         and runHook --force autologin "Please set up a function `autologin` for  setting up autologin for the `root` user"
 
         and begin
-            set -l script (string escape (getCloneFile (getInstallerScript)))
+            set -l profile "/root/.bash_profile"
 
-            wrapScript (
-                string join " " \
-                    (begin
-                        for var in \
-                                CONFIG_NAME \
-                                VALHALLA_BACKUP_DISABLED \
-                                VALHALLA_BACKUP_DIR \
-                                VALHALLA_BACKUP_SERVER \
-                                VALHALLA_BACKUP_SERVER_PORT \
-                                VALHALLA_BACKUP_SERVER_USER \
-                                VALHALLA_BACKUP_SERVER_KEY
-                            echo "$var=$(string escape "$$var")"
-                        end
-                    end) \
-                    (string escape $script))
+            begin
+                set -l profile (string escape "$profile")
+                set -l tmp (string escape "$profile""_")
+                set -l script (string escape (getCloneFile (getInstallerScript)))
 
-        end | runChroot "$mountDir" tee /root/.bash_profile >/dev/null
+                printf "%s\n" \
+                    "mv $profile $tmp" \
+                    (wrapScript (
+                        string join " " \
+                            (begin
+                                for var in \
+                                        CONFIG_NAME \
+                                        VALHALLA_BACKUP_DISABLED \
+                                        VALHALLA_BACKUP_DIR \
+                                        VALHALLA_BACKUP_SERVER \
+                                        VALHALLA_BACKUP_SERVER_PORT \
+                                        VALHALLA_BACKUP_SERVER_USER \
+                                        VALHALLA_BACKUP_SERVER_KEY
+                                    echo "$var=$(string escape "$$var")"
+                                end
+                            end) \
+                            (string escape $script) "&&")) \
+                    "rm $tmp  ||"
+                    "mv $tmp $profile"
+            end | runChroot "$mountDir" tee "$profile" >/dev/null
+        end
     end
 
     function actionPostRun

scripts/Common/Software/systemd-networkd/main.fish

@@ -8,7 +8,7 @@ begin
         set config (getProgramConfig $argv --json)
 
         for name in (echo "$config" | jq '.networkFiles | keys[]' --raw-output0 | string split0 || true)
-            echo "$config" | NAME=$name jq '.networkFiles[env.NAME]' | sudo tee "/etc/systemd/network/10-$name.network" >/dev/null
+            echo "$config" | NAME=$name jq '.networkFiles[env.NAME]' --raw-output | sudo tee "/etc/systemd/network/10-$name.network" >/dev/null
         end
     end
 

scripts/lib/action.fish

@@ -55,6 +55,8 @@ function runSetupUserAction -V dir
                 set -l sudoConfig "/etc/sudoers.d/PortValhalla"
 
                 begin
+                    set success true
+
                     if id -u "$name" &>/dev/null
                         echo "Setup user already exists!"
                     else
@@ -74,10 +76,15 @@ function runSetupUserAction -V dir
                     end >"$sudoConfig"
 
                     and sudo --preserve-env --set-home --user "$name" env "PATH=$PATH" $cmdline
-                    or read -P "An error occurred! Press enter to continue: "
+                    or begin
+                        read -P "An error occurred! Press enter to continue: "
+                        set success false
+                    end
+
                     disposeAction
                     rm "$sudoConfig"
                     userdel -rf "$name"
+                    success
                 end
             end
         end