fix bug in continuity

diff --git a/README.org b/README.org
index c3edaa37d08c86f0b0ee74d5dd8b07bb338a0641..9a9f5a03cbdb5ca02f12ce9c4e91afefe3dc518d 100644 (file)
--- a/README.org
+++ b/README.org
@@ -16,7 +16,11 @@ as well as writing a lot of things with a literate config. To see more, see my
 ** So, where is this website of yours located?
 https://ret2pop.net, it is the road to enlightenment.
 * Wait, so where are your dotfiles?
-To use my dotfiles, download the ISO image for the installer, log in, and run:
+To use my dotfiles, download the [[file:nix-installer.iso][ISO image]] for the installer. Note that you can validate the ISO image with the [[file:nix-installer.iso.sha256][checksum file]] provided:
+#+begin_src bash
+  sha256sum -c nix-installer.iso.sha256
+#+end_src
+with the ISO in the same directory. This install installs a certain commit hash of my monorepo. Flash the image, log into the installer, and run:
 #+begin_src bash
   nix_installer
 #+end_src
@@ -28,7 +32,7 @@ That's all! Note that if you install with an encrypted disk, you will have to ru
 #+begin_src bash
   echo "password123" > /tmp/secret.key
 #+end_src
-first.
+before ~nix_installer~.
 ** Post-setup
 In emacs, run ~M-x all-the-icons-install-fonts, ~~M-x nerd-icons-install-fonts~, and ~M-x org-roam-db-sync~. Install your music to ~$HOME/music~ for
 emms. In firefox, go to the three-bar menu and enable all the add-ons that were automatically installed. Set up the ~mu~ program in order to

diff --git a/config/nix.org b/config/nix.org
index ae8631daeb6332257c63b27a257ca9bdb2f96368..de5be70d893f48dfcc429718cea5b8dc4191e2f0 100644 (file)
--- a/config/nix.org
+++ b/config/nix.org
@@ -482,12 +482,24 @@ Still, it is suitable for using Krita.
   }
 #+end_src
 You should add your own video drivers in a custom machine configuration.
-** Docker
-In order to run docker containers, I need this file:
+** Containers
+In order to run docker/podman containers, I need this file:
 #+begin_src nix :tangle ../nix/modules/docker.nix
   { lib, config, vars, ... }:
   {
-    virtualisation.docker.enable = true;
+    virtualisation = {
+      oci-containers = {
+        backend = "podman";
+        containers = {};
+      };
+      containers.enable = true;
+      docker.enable = true;
+      podman = {
+        enable = true;
+        dockerCompat = true;
+        defaultNetwork.settings.dns_enabled = true;
+      };
+    };
   }
 #+end_src
 ** Pipewire
@@ -1149,7 +1161,7 @@ This is my impermanence profile, which removes all files on reboot except for th
   {
     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.";
       }
     ];
@@ -3699,6 +3711,7 @@ as several other useful services.
   }
 #+end_src
 *** Home
+I want cuda in home manager too.
 #+begin_src nix :tangle ../nix/systems/affinity/home.nix
   { lib, config, pkgs, ... }:
   {
@@ -3807,7 +3820,7 @@ work deterministically.
 #+begin_src nix :tangle ../nix/systems/installer/commits.nix
   {
     diskoCommitHash = "c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a";
-    monorepoCommitHash = "bb31a5a879154432e11a75e69070b58004ddc07b";
+    monorepoCommitHash = "e2fbfac7ad7c0b4d438179b31d2ed53d884313a0";
     monorepoUrl = "https://github.com/ret2pop/monorepo";
   }
 #+end_src

diff --git a/nix/modules/docker.nix b/nix/modules/docker.nix
index dbe4326e748f05edec609bce72c7ec4d7f244ebf..11683416c9da3bfdc0f0c6cb333b06b53eb42e50 100644 (file)
--- a/nix/modules/docker.nix
+++ b/nix/modules/docker.nix
@@ -1,4 +1,16 @@
 { lib, config, vars, ... }:
 {
-  virtualisation.docker.enable = true;
+  virtualisation = {
+    oci-containers = {
+      backend = "podman";
+      containers = {};
+    };
+    containers.enable = true;
+    docker.enable = true;
+    podman = {
+      enable = true;
+      dockerCompat = true;
+      defaultNetwork.settings.dns_enabled = true;
+    };
+  };
 }

diff --git a/nix/modules/impermanence.nix b/nix/modules/impermanence.nix
index 73bccdc0faea3524329044f736f55d9bb67f6025..aceb6fc60ec0119b5dd06bc23800c08290679233 100644 (file)
--- 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/commits.nix b/nix/systems/installer/commits.nix
index b6c8be391316cf5990d96eda3c25118178f9d05d..83e35ed5a60cc455b73e155855c86529666a1ac2 100644 (file)
--- a/nix/systems/installer/commits.nix
+++ b/nix/systems/installer/commits.nix
@@ -1,5 +1,5 @@
 {
   diskoCommitHash = "c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a";
-  monorepoCommitHash = "bb31a5a879154432e11a75e69070b58004ddc07b";
+  monorepoCommitHash = "e2fbfac7ad7c0b4d438179b31d2ed53d884313a0";
   monorepoUrl = "https://github.com/ret2pop/monorepo";
 }