diff --git a/scripts/Arch/Config/SecureBoot/main.fish b/scripts/Arch/Config/SecureBoot/main.fish index ed5c5692..9f675965 100755 --- a/scripts/Arch/Config/SecureBoot/main.fish +++ b/scripts/Arch/Config/SecureBoot/main.fish @@ -8,7 +8,7 @@ begin end function configureSW -V dir - source "$dir/../../../Common/Scripts/config.fish" + source "$dir/../../../Common/Scripts/settings.fish" set -l label (getOSConfig boot.label) set -l efiDir (getOSConfig boot.efiMountPoint) set -l bootNums (efibootmgr | sed "/$label/{ s/^.*Boot\([[:digit:]]\+\)\*.*\$/\1/; p; }; d") diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish index a3ead53e..761981f4 100755 --- a/scripts/Arch/OS/setup.fish +++ b/scripts/Arch/OS/setup.fish @@ -2,7 +2,7 @@ begin set -l dir (status dirname) source "$dir/../../Common/OS/setup.fish" - source "$dir/../../Common/Scripts/config.fish" + source "$dir/../../Common/Scripts/settings.fish" function runChroot -S arch-chroot $argv diff --git a/scripts/Arch/Software/steam/main.fish b/scripts/Arch/Software/steam/main.fish index 919eff97..73b0696f 100644 --- a/scripts/Arch/Software/steam/main.fish +++ b/scripts/Arch/Software/steam/main.fish @@ -9,7 +9,7 @@ begin function configureSW -V dir - . "$dir/../../../Common/Scripts/config.fish" + . "$dir/../../../Common/Scripts/settings.fish" if isOSEnabled hidpi begin diff --git a/scripts/Common/OS/install.fish b/scripts/Common/OS/install.fish index fee323b3..e1f63b6c 100755 --- a/scripts/Common/OS/install.fish +++ b/scripts/Common/OS/install.fish @@ -1,7 +1,7 @@ #!/bin/env fish set -l dir (status dirname) set -l cmdline (cat /proc/$fish_pid/cmdline | string split0) -source "$dir/../Scripts/config.fish" +source "$dir/../Scripts/settings.fish" source "$dir/../Scripts/hooks.fish" if [ (id -u) -eq 0 ] @@ -79,7 +79,7 @@ else runHook initializeUsers || begin if [ -n "$deployScript" ] - source "$dir/../Scripts/config.fish" + source "$dir/../Scripts/settings.fish" for name in (getUsers | jq '.[]' --raw-output0 | string split0) echo "Configuring user `$name`..." diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish index 7aa0532d..c3cde26f 100755 --- a/scripts/Common/OS/setup.fish +++ b/scripts/Common/OS/setup.fish @@ -1,7 +1,7 @@ #!/bin/env fish function runSetup set -l dir (status dirname) - source "$dir/../Scripts/config.fish" + source "$dir/../Scripts/settings.fish" source "$dir/../Scripts/hooks.fish" if [ -z "$CONFIG_NAME" ] diff --git a/scripts/Common/OS/users.fish b/scripts/Common/OS/users.fish index fb02284d..60981071 100755 --- a/scripts/Common/OS/users.fish +++ b/scripts/Common/OS/users.fish @@ -1,6 +1,6 @@ #!/bin/env fish set -l dir (status dirname) -source "$dir/../Scripts/config.fish" +source "$dir/../Scripts/settings.fish" set -l users (getUsers) echo "Creating users..." diff --git a/scripts/Common/Scripts/Config.ps1 b/scripts/Common/Scripts/Config.ps1 index 51f1facf..03f1687c 100644 --- a/scripts/Common/Scripts/Config.ps1 +++ b/scripts/Common/Scripts/Config.ps1 @@ -61,7 +61,7 @@ $null = New-Module { <# .SYNOPSIS - Runs a script based on the `config.fish` script. + Runs a script based on the `settings.fish` script. .PARAMETER Script The script to run. @@ -71,7 +71,7 @@ $null = New-Module { [string] $Script ) - $scriptPath = "$PSScriptRoot/../../Common/Scripts/config.fish"; + $scriptPath = "$PSScriptRoot/../../Common/Scripts/settings.fish"; if ($env:CONFIG_NAME -or ($Script -eq "getProfiles")) { $output = & { diff --git a/scripts/Common/Scripts/config.fish b/scripts/Common/Scripts/settings.fish similarity index 100% rename from scripts/Common/Scripts/config.fish rename to scripts/Common/Scripts/settings.fish diff --git a/scripts/Common/Scripts/software.fish b/scripts/Common/Scripts/software.fish index ee84551a..bc23a8e6 100755 --- a/scripts/Common/Scripts/software.fish +++ b/scripts/Common/Scripts/software.fish @@ -48,7 +48,7 @@ begin set -l args $_flag_force set -l name $argv[1] set -l action $argv[2] - source "$dir/config.fish" + source "$dir/settings.fish" if [ -n "$_flag_force" ] set force true diff --git a/scripts/Common/Software/grub/main.fish b/scripts/Common/Software/grub/main.fish index 40c501f6..2d08717b 100755 --- a/scripts/Common/Software/grub/main.fish +++ b/scripts/Common/Software/grub/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/config.fish" + source "$dir/../../Scripts/settings.fish" source "$dir/../../Scripts/software.fish" function configureSW diff --git a/scripts/Common/Software/rclone/main.fish b/scripts/Common/Software/rclone/main.fish index 75afceb6..067d4b25 100755 --- a/scripts/Common/Software/rclone/main.fish +++ b/scripts/Common/Software/rclone/main.fish @@ -8,7 +8,7 @@ begin end function userConfig -V dir -a name - source "$dir/../../Scripts/config.fish" + source "$dir/../../Scripts/settings.fish" set -l key "programs.rclone.configurations" set -l configs (getUserConfig "$name" "$key" --apply "builtins.attrNames" --json) diff --git a/winiso/deploy.fish b/winiso/deploy.fish index 2d4fe6a4..18fae779 100755 --- a/winiso/deploy.fish +++ b/winiso/deploy.fish @@ -213,7 +213,7 @@ begin and rm -rf "$projectPath/archiso" and begin - source "$dir/../scripts/Common/Scripts/config.fish" + source "$dir/../scripts/Common/Scripts/settings.fish" and for name in (getProfiles | jq '.[]' --raw-output0 | string split0) set -l CONFIG_NAME "$name"