update docker to program besides torus

provision/hosts/kestrel/configuration.nix

@@ -22,10 +22,6 @@
     nvidiaSettings = true;
   };
   
-  # Enable docker 
-  virtualisation.docker.enable = true;
-  virtualisation.docker.storageDriver = "btrfs";
-  
   # Secrets
   age.secrets."wireguard/kestrel".file = ../../secrets/wireguard/kestrel.age;
 
@@ -48,6 +44,10 @@
       pc.enable = true;
     };
     programs = {
+      docker = {
+        enable = true;
+        storageDriver = "btrfs";
+      };
       virt-manager.enable = true;
     };
     services = {

provision/hosts/shivan/configuration.nix

@@ -7,10 +7,6 @@
   networking.firewall.checkReversePath = "loose";
   networking.firewall.enable = false;
   
-  # Enable docker 
-  virtualisation.docker.enable = true;
-  virtualisation.docker.storageDriver = "btrfs";
-  
   # Modules
   modules = {
     base-plus.enable = true;
@@ -26,6 +22,10 @@
       programming.enable = true;
     };
     programs = {
+      docker = {
+        enable = true;
+        storageDriver = "btrfs";
+      };
       virt-manager.enable = false;
     };
     services = {

provision/hosts/torus/configuration.nix

@@ -25,6 +25,7 @@
     "net.ipv4.conf.all.forwarding" = true; # Needed for wireguard-server
   };
 
+  # TODO: Update to docker from modules and ensure docker containers still work
   # Enable virtualisation
   virtualisation.docker = {
     enable = true;

provision/hosts/wsl/configuration.nix

@@ -39,9 +39,6 @@ in
   # Don't allow emergency mode, because we don't have a console.
   systemd.enableEmergencyMode = false;
 
-  # Enable docker 
-  virtualisation.docker.enable = true;
-
   environment.systemPackages = with pkgs; [
     firefox
     wget
@@ -63,6 +60,7 @@ in
   modules = {
     devel.programming.enable = true;
     programs = {
+      docker.enable = true;
       git.keys = false;
     };
     services.ssh.enable = true;

provision/modules/programs/default.nix

@@ -6,6 +6,7 @@
     ./borg.nix
     ./chezmoi.nix
     ./chrome.nix
+    ./docker.nix
     ./firefox.nix
     ./git.nix
     ./kitty.nix

provision/modules/programs/docker.nix

@@ -0,0 +1,24 @@
+{ config, lib, pkgs, user, ... }:
+
+let cfg = config.modules.programs.docker;
+in {
+  options.modules.programs.docker = with lib; {
+    enable = lib.mkOption {
+      type = types.bool;
+      default = false;
+    };
+    keyPath = mkOption {
+      type = types.path;
+      default = ./key.pem;
+    };
+    storageDriver = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    virtualisation.docker.enable = true;
+    virtualisation.docker.storageDriver = lib.mkIf (cfg.storageDriver != null) "${cfg.storageDriver}";
+  };
+}