aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--machines/nixos/x86_64-linux/do-rproxy/default.nix1
-rw-r--r--machines/nixos/x86_64-linux/synology-vm/default.nix1
-rw-r--r--profiles/admin-user/user.nix1
-rw-r--r--profiles/server.nix3
-rw-r--r--profiles/services/podman.nix5
5 files changed, 7 insertions, 4 deletions
diff --git a/machines/nixos/x86_64-linux/do-rproxy/default.nix b/machines/nixos/x86_64-linux/do-rproxy/default.nix
index 9c61dc9..d6b357e 100644
--- a/machines/nixos/x86_64-linux/do-rproxy/default.nix
+++ b/machines/nixos/x86_64-linux/do-rproxy/default.nix
@@ -29,6 +29,7 @@
"${self}/profiles/core/motd.nix"
"${self}/profiles/nix/gc.nix"
"${self}/profiles/network/networkd.nix"
+ "${self}/profiles/services/podman.nix"
];
# do not use DHCP, as DigitalOcean provisions IPs using cloud-init
diff --git a/machines/nixos/x86_64-linux/synology-vm/default.nix b/machines/nixos/x86_64-linux/synology-vm/default.nix
index 3480706..7309285 100644
--- a/machines/nixos/x86_64-linux/synology-vm/default.nix
+++ b/machines/nixos/x86_64-linux/synology-vm/default.nix
@@ -43,6 +43,7 @@
"${self}/profiles/core/motd.nix"
"${self}/profiles/nix/gc.nix"
"${self}/profiles/network/networkd.nix"
+ "${self}/profiles/services/podman.nix"
];
# Use the systemd-boot EFI boot loader.
diff --git a/profiles/admin-user/user.nix b/profiles/admin-user/user.nix
index 1a6b1dc..d500650 100644
--- a/profiles/admin-user/user.nix
+++ b/profiles/admin-user/user.nix
@@ -16,7 +16,6 @@
];
extraGroups = [
"wheel"
- "docker"
];
};
};
diff --git a/profiles/server.nix b/profiles/server.nix
index 9f9e01c..6fe6f22 100644
--- a/profiles/server.nix
+++ b/profiles/server.nix
@@ -8,9 +8,6 @@
./default.nix
];
- #Virtualization settings
- virtualisation.docker.enable = true;
-
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernel.sysctl = {
diff --git a/profiles/services/podman.nix b/profiles/services/podman.nix
new file mode 100644
index 0000000..4a132d2
--- /dev/null
+++ b/profiles/services/podman.nix
@@ -0,0 +1,5 @@
+{
+ virtualisation.podman = {
+ enable = true;
+ };
+}