Compare commits
No commits in common. "9c6d5509f646d3d17b4d20bd4ff7853d5a7a38b3" and "cc1f27f568999df1cf3ffff65fca6a23f7fe2d2c" have entirely different histories.
9c6d5509f6
...
cc1f27f568
|
@ -1,6 +1,7 @@
|
|||
#!/bin/env fish
|
||||
begin
|
||||
set -l dir (status dirname)
|
||||
set -q CONFIG_MODULE || set -l CONFIG_MODULE "$dir/config.nix"
|
||||
source "$dir/../../Common/OS/setup.fish"
|
||||
source "$dir/../../Common/Scripts/config.fish"
|
||||
|
||||
|
@ -14,7 +15,7 @@ begin
|
|||
pacstrap -K "$mountDir" fish jq nix tmux
|
||||
end
|
||||
|
||||
function setupOS -S -V dir -V mountDir
|
||||
function setupOS -S -V dir -V CONFIG_MODULE -V mountDir
|
||||
source "$dir/../../Common/Scripts/wait-network.fish"
|
||||
source "$dir/../../Common/Scripts/hooks.fish"
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@ function runSetup
|
|||
set -l dir (status dirname)
|
||||
source "$dir/../Scripts/config.fish"
|
||||
source "$dir/../Scripts/hooks.fish"
|
||||
set -l name (getConfig valhalla.setupUser.name)
|
||||
set -l mountDir (getConfig valhalla.partition.rootDir)
|
||||
set -l projectRoot (realpath "$dir/../../..")
|
||||
set -l projectName (basename "$projectRoot")
|
||||
|
|
|
@ -1,8 +1,4 @@
|
|||
#!/bin/env fish
|
||||
function isConfigured -S
|
||||
set -q "$CONFIG_MODULE"
|
||||
end
|
||||
|
||||
function getConfig -S -a property
|
||||
source "$(status dirname)/eval-module.fish"
|
||||
evalModule "$CONFIG_MODULE" "$property" $argv[2..]
|
||||
|
|
|
@ -20,10 +20,6 @@ begin
|
|||
source "$dir/config.fish"
|
||||
set -l users (getUsers)
|
||||
|
||||
if not isConfigured || [ "$USER" != (getConfig "valhalla.setupUser.name") ]
|
||||
runInstaller userConfig
|
||||
end
|
||||
|
||||
for name in (echo "$users" | jq '.[]' --raw-output0 | string split0)
|
||||
runInstaller userConfig "$name"
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue