diff options
| author | Preston Pan <ret2pop@gmail.com> | 2025-09-18 23:42:23 -0700 |
|---|---|---|
| committer | Preston Pan <ret2pop@gmail.com> | 2025-09-18 23:42:23 -0700 |
| commit | 6800e6022fdafbc236097dc90ad128363d6fcd1d (patch) | |
| tree | 2faabe0384a340ffcb186302eb3e4150530a7389 /nix | |
| parent | e2fbfac7ad7c0b4d438179b31d2ed53d884313a0 (diff) | |
fix bug in continuity
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/modules/docker.nix | 14 | ||||
| -rw-r--r-- | nix/modules/impermanence.nix | 2 | ||||
| -rw-r--r-- | nix/systems/installer/commits.nix | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/nix/modules/docker.nix b/nix/modules/docker.nix index dbe4326..1168341 100644 --- 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 73bccdc..aceb6fc 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/commits.nix b/nix/systems/installer/commits.nix index b6c8be3..83e35ed 100644 --- 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"; } |