fix installer; fix continuity again

diff --git a/config/nix.org b/config/nix.org
index de5be70d893f48dfcc429718cea5b8dc4191e2f0..a11f06443f5cec70bb68f947e3be23444a70eb35 100644 (file)
--- a/config/nix.org
+++ b/config/nix.org
@@ -493,7 +493,6 @@ In order to run docker/podman containers, I need this file:
         containers = {};
       };
       containers.enable = true;
         containers = {};
       };
       containers.enable = true;

-      docker.enable = true;

       podman = {
         enable = true;
         dockerCompat = true;
       podman = {
         enable = true;
         dockerCompat = true;


@@ -1161,7 +1160,7 @@ This is my impermanence profile, which removes all files on reboot except for th
   {
     assertions = [
       {
   {
     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.";
       }
     ];
         message = "Impermanence requires btrfs filesystem.";
       }
     ];


@@ -3887,6 +3886,13 @@ This contains the installation script I use to install my systems.
 
   ping -q -c1 google.com &>/dev/null && echo "online! Proceeding with the installation..." || nmtui
 
 
   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"))"
   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"))"


@@ -3904,13 +3910,6 @@ This contains the installation script I use to install my systems.
     fi
   fi
 
     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"
 
   if [ ! -d "$HOME/monorepo/nix/systems/$SYSTEM" ]; then
     mkdir -p "$HOME/monorepo/nix/systems/$SYSTEM"

diff --git a/nix/modules/docker.nix b/nix/modules/docker.nix
index 11683416c9da3bfdc0f0c6cb333b06b53eb42e50..ac2c45685b02087fed64420b8c4fbbfce1aa83e7 100644 (file)
--- a/nix/modules/docker.nix
+++ b/nix/modules/docker.nix
@@ -6,7 +6,6 @@
       containers = {};
     };
     containers.enable = true;
       containers = {};
     };
     containers.enable = true;

-    docker.enable = true;

     podman = {
       enable = true;
       dockerCompat = true;
     podman = {
       enable = true;
       dockerCompat = true;

diff --git a/nix/modules/impermanence.nix b/nix/modules/impermanence.nix
index aceb6fc60ec0119b5dd06bc23800c08290679233..e5308ac880858d9cb1cd51c47c3c0af104d509b5 100644 (file)
--- a/nix/modules/impermanence.nix
+++ b/nix/modules/impermanence.nix
@@ -2,7 +2,7 @@
 {
   assertions = [
     {
 {
   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.";
     }
   ];
       message = "Impermanence requires btrfs filesystem.";
     }
   ];

diff --git a/nix/systems/installer/default.nix b/nix/systems/installer/default.nix
index 8fb9dfd2dea8c2ed5e2ab14909eedbf3dbc0752f..780e2ee870d1aa8e6ceb47c86159af1f0de5443c 100644 (file)
--- 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
 
 
 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"))"
 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
 
   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"
 
 if [ ! -d "$HOME/monorepo/nix/systems/$SYSTEM" ]; then
   mkdir -p "$HOME/monorepo/nix/systems/$SYSTEM"