diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/modules/docker.nix | 1 | ||||
| -rw-r--r-- | nix/modules/impermanence.nix | 2 | ||||
| -rw-r--r-- | nix/systems/installer/default.nix | 14 |
3 files changed, 8 insertions, 9 deletions
diff --git a/nix/modules/docker.nix b/nix/modules/docker.nix index 1168341..ac2c456 100644 --- a/nix/modules/docker.nix +++ b/nix/modules/docker.nix @@ -6,7 +6,6 @@ containers = {}; }; containers.enable = true; - docker.enable = true; podman = { enable = true; dockerCompat = true; diff --git a/nix/modules/impermanence.nix b/nix/modules/impermanence.nix index aceb6fc..e5308ac 100644 --- a/nix/modules/impermanence.nix +++ b/nix/modules/impermanence.nix @@ -2,7 +2,7 @@ { assertions = [ { - assertion = (! config.monorepo.profiles.impermanence.enable && (! (config.monorepo.vars.fileSystem == "btrfs"))); + assertion = (! (config.monorepo.profiles.impermanence.enable && (! (config.monorepo.vars.fileSystem == "btrfs")))); message = "Impermanence requires btrfs filesystem."; } ]; diff --git a/nix/systems/installer/default.nix b/nix/systems/installer/default.nix index 8fb9dfd..780e2ee 100644 --- a/nix/systems/installer/default.nix +++ b/nix/systems/installer/default.nix @@ -58,6 +58,13 @@ cd "$HOME" ping -q -c1 google.com &>/dev/null && echo "online! Proceeding with the installation..." || nmtui +if [ ! -d "$HOME/monorepo/" ]; then + git clone ${commits.monorepoUrl} + cd "$HOME/monorepo" + git checkout "${commits.monorepoCommitHash}" + cd "$HOME" +fi + gum style --border normal --margin "1" --padding "1 2" "Choose a system to install or select `new` in order to create a new system." SYSTEM="$(gum choose $(find "$HOME/monorepo/nix/systems" -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | grep -v -E 'installer'; printf "New"))" @@ -75,13 +82,6 @@ if [[ "$SYSTEM" == "New" ]]; then fi fi -if [ ! -d "$HOME/monorepo/" ]; then - git clone ${commits.monorepoUrl} - cd "$HOME/monorepo" - git checkout "${commits.monorepoCommitHash}" - cd "$HOME" -fi - if [ ! -d "$HOME/monorepo/nix/systems/$SYSTEM" ]; then mkdir -p "$HOME/monorepo/nix/systems/$SYSTEM" |
