Only ask for logout when applicable

lib/modules/valhalla.nix

@@ -35,6 +35,12 @@
           };
         };
 
+        hostname = mkOption {
+          type = types.str;
+          description = "The hostname of the system.";
+          default = "valhalla";
+        };
+
         setupUser = {
           name = mkOption {
             type = types.str;

profiles/machines/manuel/DerGeret/config.nix

@@ -1,16 +1,20 @@
-{ ... }: {
+{ lib, ... }: {
   imports = [
     ../defaults.nix
   ];
 
   config = {
     valhalla = {
+      hostname = lib.mkDefault "der-geret";
+
       windows = {
         dualboot = {
           enable = true;
           linuxPercentage = 70; # better safe than sorry
         };
 
+        hostname = "DerGeret";
+
         users.manuel = {
           microsoftAccount = true;
           groups = ["Administrators"];

profiles/machines/manuel/ManuSurface/config.nix

@@ -4,6 +4,9 @@
   ];
 
   config = {
-    valhalla.partition.os.deviceName = "nvme0n1";
+    valhalla = {
+      hostname = "manu-surface";
+      partition.os.deviceName = "nvme0n1";
+    };
   };
 }

scripts/Arch/OS/install.fish

@@ -17,9 +17,12 @@ begin
         and source "$dir/../Software/pacman/main.fish"
         and source "$dir/../Software/yay/main.fish"
 
+        and source "$dir/../Software/PowerShell/main.fish"
+
         and yayinst \
+            linux-headers \
             pacman-contrib \
-            powershell-bin
+            yq
     end
 
     source "$dir/../../Common/OS/install.fish"

scripts/Arch/OS/setup.fish

@@ -11,7 +11,7 @@ begin
     end
 
     function installValhallaDeps -V mountDir
-        pacstrap -K "$mountDir" fish git jq nix tmux
+        pacstrap -K "$mountDir" fish git jq nix sudo tmux
     end
 
     function getInstallerScript -V dir -S
@@ -86,11 +86,10 @@ begin
                 true
             end
 
-            and echo "$ARCH_HOSTNAME" | arch-chroot "$mountDir" tee /etc/hostname > /dev/null
+            and echo (getConfig valhalla.hostname) | arch-chroot "$mountDir" tee /etc/hostname > /dev/null
             
             and arch-chroot "$mountDir" mkinitcpio -P
             and runHook installDrivers "Installing drivers..." || true
-            and arch-chroot "$mountDir" bash "$tempDir/../Software/sudo/install.sh"
             and runInOS fish "$tempDir/../Software/GRUB/main.fish"
 
             and if set -l keyLayout (getConfig valhalla.keyboardLayout)

scripts/Arch/Scripts/deploy.fish

@@ -21,7 +21,6 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 neofetch \
                 bash-completion \
                 wget \
-                oh-my-posh-bin \
                 screen \
                 tmux \
                 htop \
@@ -36,6 +35,8 @@ function deploySoftware -d "Deploys a the specified software action" -a action
         end
 
         and source "$dir/../../Common/Software/bash/main.fish" $argv
+        and source "$dir/../Software/sudo/main.fish" $argv
+        and source "$dir/../Software/Oh My Posh/main.fish" $argv
         and source "$dir/../Software/openssh/main.fish" $argv
         and source "$dir/../Software/vim/main.fish" $argv
         and source "$dir/../Software/git/main.fish" $argv
@@ -196,7 +197,6 @@ function deploySoftware -d "Deploys a the specified software action" -a action
     end
 
     and if collectionActive socialMedia && $isInstall
-
         yayinst \
             signal-desktop \
             vesktop-bin
@@ -263,7 +263,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 supertux \
                 gamepad-tool-bin
 
-            and flatpak install -y flathub com.usebottles.bottles
+            and sudo flatpak install -y flathub com.usebottles.bottles
         end
 
         and source "$dir/../Software/Lutris/main.fish" $argv

scripts/Arch/Software/Oh My Posh/main.fish

@@ -0,0 +1,20 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    set -l base "$dir/../../../Common/Software/Oh My Posh/main.fish"
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst oh-my-posh-bin
+    end
+
+    function configureSW -V base
+        fish "$base" configure
+    end
+
+    function userConfig -S -V base -a name
+        fish "$base" userConfig $argv
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/PowerShell/main.fish

@@ -0,0 +1,15 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst powershell-bin
+    end
+
+    function configureSW -V dir
+        fish "$dir/../../../Common/Software/PowerShell/main.fish" configure
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/aliae/main.fish

@@ -1,6 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
+    set -l base "$dir/../../../Common/Software/aliae/main.fish"
     source "$dir/../../Scripts/software.fish"
 
     function installSW
@@ -8,8 +9,12 @@ begin
             aliae-bin
     end
 
-    function configureSW -V dir
-        fish "$dir/../../../Common/Software/aliae/main.fish" configure
+    function configureSW -V base
+        fish "$base" configure
+    end
+
+    function userConfig -V base
+        fish "$base" userConfig $argv
     end
 
     runInstaller $argv

scripts/Arch/Software/git/main.fish

@@ -1,6 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
+    set -l base "$dir/../../../Common/Software/git/main.fish"
     source "$dir/../../Scripts/software.fish"
 
     function installSW
@@ -13,8 +14,12 @@ begin
             gitflow-zshcompletion-avh
     end
 
-    function configureSW -V dir
-        fish "$dir/../../../Common/Software/git/main.fish" configure
+    function configureSW -V base
+        fish "$base" configure
+    end
+
+    function userConfig -V base
+        fish "$base" userConfig $argv
     end
 
     runInstaller $argv

scripts/Arch/Software/rclone/main.fish

@@ -1,16 +1,20 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
+    set -l base "$dir/../../../Common/Software/rclone/main.fish"
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/rclone/main.fish"
 
     function installSW
         yayinst \
             rclone
     end
 
-    function configureSW -V dir
-        fish "$dir/../../../Common/Software/rclone/main.fish" configure
+    function configureSW -V base
+        fish "$base" configure
+    end
+
+    function userConfig -V base -a name
+        fish "$base" userConfig $argv
     end
 
     runInstaller $argv

scripts/Arch/Software/sudo/main.fish

@@ -0,0 +1,15 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        pacinst sudo
+    end
+
+    function configureSW
+        echo "%wheel ALL=(ALL:ALL) ALL" | sudo tee /etc/sudoers.d/wheel > /dev/null
+    end
+
+    runInstaller $argv
+end

scripts/Common/OS/install.fish

@@ -24,7 +24,7 @@ if [ (id -u) -eq 0 ]
         echo "$name ALL=(ALL:ALL) NOPASSWD: ALL"
     end > "$sudoConfig"
     
-    and sudo --preserve-env="CONFIG_NAME" --user "$name" "$INSTALLER_SCRIPT"
+    and sudo --preserve-env --set-home --user "$name" "$INSTALLER_SCRIPT"
     rm "$sudoConfig"
     userdel -rf "$name"
 else
@@ -59,4 +59,9 @@ else
     end
 
     and runHook postInstall || true
+    echo "The installation finished successfully!"
+    and echo "This machine will reboot in 5 seconds..."
+    and echo "Press CTRL-C to abort..."
+    and sleep 5
+    and systemctl reboot
 end

scripts/Common/OS/setup.fish

@@ -18,7 +18,7 @@ function runSetup
 
     if not type -q installValhallaDeps
         function installValhallaDeps
-            echo 'Please set up the hook `installValhallaDeps` for installing `fish`, `git`, `jq`, `nix` and `tmux`.'
+            echo 'Please set up the hook `installValhallaDeps` for installing `fish`, `git`, `jq`, `nix`, `sudo` and `tmux`.'
             exit 1
         end
     end
@@ -56,7 +56,7 @@ function runSetup
 
     and runHook installValhallaDeps
     and source "$dir/../../copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT"
-    runChroot git config --system --add safe.directory "$PROJECT_CLONE_ROOT"
+    runChroot "$mountDir" git config --system --add safe.directory "$PROJECT_CLONE_ROOT"
     and runHook setupOS || true
     and runHook autologin || true
 

scripts/Common/OS/users.fish

@@ -11,10 +11,10 @@ for name in (echo "$users" | jq '.[]' --raw-output0 | string split0)
 
     set -l groups (getUserConfig groups --apply 'builtins.concatStringsSep ","');
     set -l displayName (getUserConfig displayName --json)
-    set -l shell (getUserConfig displayName --json)
+    set -l shell (getUserConfig defaultShell --json)
 
     sudo useradd --create-home (
-            if [ displayName != "null" ]
+            if echo "$displayName" | jq --exit-status > /dev/null
                 echo "--comment"
                 echo "$displayName" | jq --raw-output
             end
@@ -26,7 +26,7 @@ for name in (echo "$users" | jq '.[]' --raw-output0 | string split0)
         ) "$name"
 
     if echo "$shell" | jq --exit-status > /dev/null
-        sudo chsh "$name" --shell "$shell"
+        sudo chsh "$name" --shell (which (echo "$shell" | jq --raw-output))
     end
 
     echo "Please Choose a New Password for User `$name`"

scripts/Common/Scripts/Config.ps1

@@ -51,7 +51,7 @@ $null = New-Module {
         $profiles = & {
             . "$PSScriptRoot/SoftwareManagement.ps1";
             
-            if (Test-Command "wsl") {
+            if (-not $IsWindows -or (Test-Command "wsl")) {
                 return Invoke-ConfigScript "getProfiles";
             } else {
                 return Get-ChildItem "$PSScriptRoot/../../../.config" | ForEach-Object { Split-Path -LeafBase $_ };
@@ -61,16 +61,20 @@ $null = New-Module {
         $choice = $Host.UI.PromptForChoice(
             "Select Profile",
             (& {
-                switch (Get-Stage) {
-                    ([WindowsInstallerAction]::Backup) {
-                        "Which profile do you wish to back up?";
-                    }
-                    ([WindowsInstallerAction]::Install) {
-                        "Which profile do you wish to install?";
-                    }
-                    $null {
-                        "Which profile do you wish to set up?";
+                if ($IsWindows) {
+                    switch (Get-Stage) {
+                        ([WindowsInstallerAction]::Backup) {
+                            "Which profile do you wish to back up?";
+                        }
+                        ([WindowsInstallerAction]::Install) {
+                            "Which profile do you wish to install?";
+                        }
+                        $null {
+                            "Which profile do you wish to set up?";
+                        }
                     }
+                } else {
+                    "Please select a profile:";
                 }
             }),
             (& {

scripts/Common/Software/Oh My Posh/main.fish

@@ -0,0 +1,31 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function configureSW -V dir
+        source "$dir/../bash/profile.fish"
+        source "$dir/../fish/profile.fish"
+
+        begin
+            printf %s\n \
+                'set -x POSH_THEME $POSH_THEME' \
+                "oh-my-posh init fish | source" \
+                "oh-my-posh completion fish | source"
+        end | installFishProfile "oh-my-posh"
+
+        begin
+            printf %s\n \
+                'eval "$(oh-my-posh init bash)"' \
+                'eval "$(oh-my-posh completion bash)"'
+        end | installBashProfile "oh-my-posh"
+
+        sudo -HE pwsh "$dir/Manage.ps1" Configure
+    end
+
+    function userConfig -S -V dir -a name
+        pwsh -CommandWithArgs '& $args[0] ConfigureUser @{ user=$args[1]; }' "$dir/Manage.ps1" $name
+    end
+
+    runInstaller $argv
+end

scripts/Common/Software/PowerShell/Module.ps1

@@ -52,7 +52,6 @@ $null = New-Module {
                 }
 
                 Remove-Item Env:\PENDING_MODULE_NAME;
-                & $Installer -Action ([InstallerAction]::Configure) @PSBoundParameters;
             };
 
             configurator = ($NoProfile.IsPresent) ? { } : {
@@ -63,7 +62,7 @@ $null = New-Module {
                 $name = $Arguments.Name;
 
                 Add-PowerShellProfileStatement `
-                    -DefaultUser `
+                    -System `
                     -Category $name `
                     -Script "Import-Module `"$name`";";
             };

scripts/Common/Software/PowerShell/main.fish

@@ -0,0 +1,11 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function configureSW -V dir
+        sudo -HE pwsh "$dir/Manage.ps1" Configure
+    end
+
+    runInstaller $argv
+end

scripts/Common/Software/Terminal-Icons/main.fish

@@ -0,0 +1,11 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW -V dir
+        sudo -HE pwsh "$dir/Manage.ps1"
+    end
+
+    runInstaller $argv
+end

scripts/Common/Software/aliae/Main.ps1

@@ -46,5 +46,5 @@ Start-SoftwareInstaller @PSBoundParameters `
                 ) -join [System.Environment]::NewLine)
     } `
     -UserConfigurator {
-        Copy-Item -Force "$PSScriptRoot/aliae.yml" ~/.aliae.yml;
+        Copy-Item -Force "$PSScriptRoot/aliae.yml" ~/.aliae.yaml;
     };

scripts/Common/Software/aliae/main.fish

@@ -38,6 +38,12 @@ begin
                     "aliae completion fish | source"
             end | installFishProfile "aliae" "aliae"
         end
+
+        sudo -HE pwsh "$dir/Main.ps1" Configure
+    end
+
+    function userConfig -V dir -a user
+        pwsh -CommandWithArgs '& $args[0] ConfigureUser @{ user=$args[1]; }' "$dir/Main.ps1" $user
     end
 
     runInstaller $argv

scripts/Common/Software/git/Manage.ps1

@@ -7,7 +7,7 @@ param (
 . "$PSScriptRoot/../../Scripts/System.ps1";
 . "$PSScriptRoot/../../Types/InstallerAction.ps1";
 
-$null = New-Module {
+& {
     param(
         [hashtable] $Parameters
     )

scripts/Common/Software/git/main.fish

@@ -8,7 +8,7 @@ begin
     end
 
     function userConfig -S -V dir -a name
-        configureGit "$name"
+        pwsh -CommandWithArgs '& $args[0] ConfigureUser @{ user=$args[1]; }' "$dir/Manage.ps1" $name
     end
 
     runInstaller $argv

scripts/Common/Software/posh-git/main.fish

@@ -0,0 +1,11 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW -V dir
+        sudo -HE pwsh "$dir/Manage.ps1"
+    end
+
+    runInstaller $argv
+end

scripts/Common/Software/rclone/main.fish

@@ -9,14 +9,37 @@ begin
 
     function userConfig -V dir -a name
         source "$dir/../../Scripts/config.fish"
-        set -l key "valhalla.users.$name.rclone.configurations"
+        set -l key "valhalla.linux.users.$name.rclone.configurations"
         set -l configs (getConfig "$key" --apply "builtins.attrNames" --json)
 
         if [ (echo "$configs" | jq "length") -gt 0 ]
             if [ "$XDG_SESSION_TYPE" = "tty" ]
+                set -l sessionPid
+                set -l freeTty
+                set -l service
+                set -l sessionConfig
+                set -l welcomeConfig ~"$name"/.config/plasma-welcomerc
                 set -l entryPoint ~"$name"/.config/autostart/PortValhallaProfile.desktop
                 sudo -u "$name" mkdir -p "$(dirname "$entryPoint")"
 
+                begin
+                    set -l file (sudo mktemp)
+                    sudo openvt -sw -- bash -c "tty > $(string escape $file)"
+                    set freeTty (basename (sudo cat $file))
+                    sudo rm $file
+                end
+
+                set service "getty@$freeTty"
+                set sessionConfig "/etc/systemd/system/$service.service.d/autologin.conf"
+                sudo mkdir -p (dirname $sessionConfig)
+
+                begin
+                    printf %s\n \
+                        "[General]" \
+                        "LastSeenVersion=1.0.0" \
+                        "ShowUpdatePage=false"
+                end | sudo -u "$name" tee "$welcomeConfig" > /dev/null
+
                 begin
                     printf %s\n \
                         "#!/user/bin/env xdg-open" \
@@ -26,20 +49,41 @@ begin
                         "Terminal=false" (
                             printf "%s " \
                                 "Exec=env" \
+                                "VALHALLA_REQUEST_LOGOUT=1" \
                                 "CONFIG_NAME=$(echo "$CONFIG_NAME" | string escape)" \
                                 "konsole -e fish $(realpath (status filename) | string escape) userConfig"
                         )
                 end | sudo -u "$name" tee "$entryPoint" > /dev/null
 
                 sudo chmod +x "$entryPoint"
-                sudo -Eu "$name" dbus-launch --exit-with-session startplasma-wayland &> /dev/null
-                rm "$entryPoint"
-                rm ~"$name"/.config/plasma-welcomerc
+
+                begin
+                    printf %s\n \
+                        "[Service]" \
+                        "ExecStart=" \
+                        "ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin $name %I \$TERM"
+                end | sudo tee "$sessionConfig" > /dev/null
+
+                sudo systemctl daemon-reload
+                sudo systemctl restart $service
+
+                while [ -z "$sessionPid" ]
+                    set sessionPid (sudo pgrep -t $freeTty -u "$name")
+                end
+
+                sudo openvt -sw -- sudo -u "$name" env (sudo cat /proc/$sessionPid/environ | string split0) /usr/lib/plasma-dbus-run-session-if-needed startplasma-wayland
+                sudo rm "$entryPoint"
+                sudo rm "$welcomeConfig"
+                sudo rm "$sessionConfig"
+                sudo rmdir (dirname "$sessionConfig")
+                sudo systemctl daemon-reload
             else if [ -n "$name" ] && [ "$name" != "$USER" ]
                 sudo -Eu "$name" CONFIG_NAME="$CONFIG_NAME" fish "$(status filename)" userConfig
             else
                 systemctl --user enable rclone.service
                 echo "Please complete the setup of your rclone configurations!"
+                mkdir -p ~/.mnt
+                touch ~/.mnt/.trackerignore
 
                 for config in (echo "$configs" | jq '.[]' --raw-output0 | string split0)
                     set -l configKey "$key.$config"
@@ -55,6 +99,12 @@ begin
                     rclone config || true
                     systemctl --user enable "$serviceName" --now || true
                 end
+
+                echo "rclone was configured successfully!"
+
+                if [ -n "$VALHALLA_REQUEST_LOGOUT" ]
+                    read -P "Please log out"
+                end
             end
         end
     end

scripts/Common/Software/vscode/main.fish

@@ -4,7 +4,7 @@ begin
     source "$dir/../../Scripts/software.fish"
 
     function userConfig -V dir -a name
-        pwsh "$dir/Main.ps1" ConfigureUser;
+        pwsh -CommandWithArgs '& $args[0] ConfigureUser @{ user=$args[1]; }' "$dir/Main.ps1" $user
     end
 
     runInstaller $argv

scripts/Common/Software/zoxide/Main.ps1

@@ -0,0 +1,19 @@
+param(
+    $Action,
+    [hashtable] $Arguments
+)
+
+. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../PowerShell/Profile.ps1";
+
+Start-SoftwareInstaller @PSBoundParameters `
+    -Configurator {
+        Add-PowerShellProfileStatement `
+            -System `
+            -Category "zoxide" `
+            -Script (
+                @(
+                    "# zoxide",
+                    (Get-ScriptInitializer "zoxide init powershell | Out-String")
+                ) -join [System.Environment]::NewLine);
+    };

scripts/Common/Software/zoxide/main.fish

@@ -8,7 +8,7 @@ begin
         source "$dir/../fish/profile.fish"
         echo 'eval "$(zoxide init bash)"' | installBashProfile "zoxide"
         echo "zoxide init fish | source" | installFishProfile "zoxide"
-        sudo pwsh -NoProfile "$dir/install.ps1"
+        sudo -HE pwsh -NoProfile "$dir/Main.ps1" Configure
     end
 
     runInstaller $argv

scripts/Windows/OS/Setup.ps1

@@ -8,7 +8,6 @@ function Start-Setup {
     $Global:InformationPreference = "Continue";
     $Global:ErrorActionPreference = "Inquire";
     $env:CONFIG_NAME ??= $ConfigurationName;
-    $null = $env:WIN_COMPUTER_NAME;
     $null = $env:SETUP_SCRIPT_NAME ??= "$PSScriptRoot/Install.ps1";
     $env:WSLENV = "CONFIG_NAME";
 
@@ -218,7 +217,7 @@ function Start-Setup {
 
     # Adjust unattended settings
     $computerName = (Get-Component (Get-PassSettings "specialize") "Microsoft-Windows-Shell-Setup").SelectSingleNode("./ua:ComputerName", $namespace);
-    $computerName.InnerText = "$env:WIN_COMPUTER_NAME";
+    $computerName.InnerText = $valhallaConfig.hostname;
 
     # Execute corresponding installer script after startup
     $oobeSettings = (Get-Component (Get-PassSettings "oobeSystem") "Microsoft-Windows-Shell-Setup");

scripts/Windows/Software/zoxide/Manage.ps1

@@ -3,25 +3,30 @@ param(
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../../Common/Software/PowerShell/Profile.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+& {
+    param(
+        [hashtable] $Parameters
+    )
 
-Start-SoftwareInstaller @PSBoundParameters `
-    -Installer {
-        param(
-            [scriptblock] $Installer
-        )
+    . "$PSScriptRoot/../../../Common/Software/PowerShell/Profile.ps1";
+    . "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+    . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
+    $base = "$PSScriptRoot/../../../Common/Software/zoxide/Main.ps1";
 
-        Install-ChocoPackage zoxide;
-        Install-WingetPackage junegunn.fzf;
-    } `
-    -Configurator {
-        Add-PowerShellProfileStatement `
-            -System `
-            -Category "zoxide" `
-            -Script (
-                @(
-                    "# zoxide",
-                    (Get-ScriptInitializer "zoxide init powershell | Out-String")
-                ) -join [System.Environment]::NewLine);
-    };
+    Start-SoftwareInstaller @PSBoundParameters `
+        -Installer {
+            param(
+                [scriptblock] $Installer
+            )
+
+            Install-ChocoPackage zoxide;
+            Install-WingetPackage junegunn.fzf;
+        } `
+        -Configurator {
+            param(
+                $Arguments
+            )
+
+            & $base ([InstallerAction]::ConfigureUser) @PSBoundParameters;
+        };
+} $PSBoundParameters;