about summary refs log tree commit diff
path: root/users
diff options
context:
space:
mode:
authorAspen Smith <root@gws.fyi>2024-08-04T00·48-0400
committerclbot <clbot@tvl.fyi>2024-08-04T01·31+0000
commit9c01ab3e841eb67d7d2b6efc7675040b646a7b76 (patch)
tree5c3e8028607c66cbd2ddf05f4f22b64236c45bec /users
parent66c75ef69422a171a7b7cac1bec965a41d65ec78 (diff)
feat(aspen/system): Switch to podman r/8440
Change-Id: Ifc5e724f455627d34b784509c62900fd112cb492
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12134
Autosubmit: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
Reviewed-by: aspen <root@gws.fyi>
Diffstat (limited to 'users')
-rw-r--r--users/aspen/system/system/modules/containers.nix12
-rw-r--r--users/aspen/system/system/modules/development.nix5
2 files changed, 15 insertions, 2 deletions
diff --git a/users/aspen/system/system/modules/containers.nix b/users/aspen/system/system/modules/containers.nix
new file mode 100644
index 000000000000..587e7426b582
--- /dev/null
+++ b/users/aspen/system/system/modules/containers.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+{
+  virtualisation.podman = {
+    enable = true;
+    defaultNetwork.settings = { dns_enabled = true; };
+    dockerCompat = true;
+    dockerSocket.enable = true;
+  };
+
+  users.users.aspen.extraGroups = [ "docker" ];
+}
diff --git a/users/aspen/system/system/modules/development.nix b/users/aspen/system/system/modules/development.nix
index bd5e326b2ea6..6e96ae3c8e7f 100644
--- a/users/aspen/system/system/modules/development.nix
+++ b/users/aspen/system/system/modules/development.nix
@@ -1,8 +1,9 @@
 { config, lib, pkgs, ... }:
 
 {
-  virtualisation.docker.enable = true;
-  users.users.aspen.extraGroups = [ "docker" ];
+  imports = [
+    ./containers.nix
+  ];
 
   security.pam.loginLimits = [
     {