Move docker into options

home-manager/desktop.nix

@@ -34,6 +34,7 @@ in
     username = nixosConfig.az-username;
     packages = with pkgs; [
       digikam
+      docker-compose
       exercism
       freetube
       chromium

home-manager/management.nix

@@ -15,6 +15,7 @@ in
 
   home.username = nixosConfig.az-username;
   home.packages = with pkgs; [
+    docker-compose
     exercism
     nodePackages.prettier # formatting files
     rclone

modules/default.nix

@@ -4,6 +4,7 @@
     ./common
     ./common-x86
     ./data-share
+    ./docker
     ./eog
     ./lockscreen
     ./makemkv

modules/desktop/default.nix

@@ -1,7 +1,6 @@
 { inputs, pkgs, ... }:
 {
   imports = [
-    "${inputs.self}/modules/docker"
     "${inputs.self}/modules/email"
     "${inputs.self}/modules/hunspell"
     "${inputs.self}/modules/libimobiledevice"
@@ -57,6 +56,9 @@
 
   # Enable Flatpack
   services.flatpak.enable = true;
+
+  services.az-docker.enable = true;
+
   xdg = {
     portal = {
       enable = true;

modules/docker-mailserver/default.nix

@@ -42,6 +42,9 @@ in
   environment.systemPackages = [
     mailserver-setup
   ];
+
+  services.az-docker.enable = true;
+
   virtualisation.oci-containers = {
     backend = "docker";
     containers."mailserver" = {

modules/docker/default.nix

@@ -1,13 +1,21 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.services.az-docker;
+in
 {
-  virtualisation.docker =
-    {
-      enable = true;
-      autoPrune.enable = true;
-    };
-  users.users.${config.az-username}.extraGroups = [ "docker" ];
-  environment.systemPackages = with pkgs; [
-    docker-compose
-    lazydocker
-  ];
+  options = {
+    services.az-docker.enable = lib.mkEnableOption "DESCRIPTION";
+  };
+
+  config = lib.mkIf cfg.enable {
+    virtualisation.docker =
+      {
+        enable = true;
+        autoPrune.enable = true;
+      };
+    users.users.${config.az-username}.extraGroups = [ "docker" ];
+    environment.systemPackages = with pkgs; [
+      lazydocker
+    ];
+  };
 }

modules/gitea/default.nix

@@ -2,6 +2,8 @@
 {
   age.secrets.giteaEnv.file = "${inputs.self}/scrts/gitea_env.age";
 
+  services.az-docker.enable = true;
+
   virtualisation.oci-containers = {
     backend = "docker";
     containers."gitea" = {

modules/grav/default.nix

@@ -1,5 +1,7 @@
 { ... }:
 {
+  services.az-docker.enable = true;
+
   virtualisation.oci-containers = {
     backend = "docker";
     containers."grav" = {

modules/heimdall/default.nix

@@ -1,5 +1,7 @@
 { ... }:
 {
+  services.az-docker.enable = true;
+
   virtualisation.oci-containers = {
     backend = "docker";
     containers."heimdall" = {

modules/nextcloud/default.nix

@@ -28,6 +28,8 @@ in
     };
   };
 
+  services.az-docker.enable = true;
+
   virtualisation.oci-containers = {
     backend = "docker";
     containers."nextcloud" = {

modules/plex/default.nix

@@ -15,6 +15,9 @@
       32469 # Plex DLNA Server
     ];
   };
+
+  services.az-docker.enable = true;
+
   virtualisation.oci-containers = {
     backend = "docker";
     containers."plex" = {

modules/rss-bridge/default.nix

@@ -3,6 +3,8 @@ let
   whitelist = builtins.toFile "whitelist.txt" ''*'';
 in
 {
+  services.az-docker.enable = true;
+
   virtualisation.oci-containers = {
     backend = "docker";
     containers."rss-bridge" = {

modules/ttrss-postgres/default.nix

@@ -34,6 +34,7 @@ in
     }];
   };
 
+  services.az-docker.enable = true;
   virtualisation.oci-containers = {
     backend = "docker";
     containers."ttrss" = {

systems/git/default.nix

@@ -18,7 +18,6 @@ in
     (import "${inputs.self}/modules/gitea" {
       inherit domain;
     })
-    "${inputs.self}/modules/docker"
     "${inputs.self}/modules/mariadb"
   ];
 }

systems/loki-test/default.nix

@@ -5,7 +5,7 @@
       ip = "10.7.89.10";
       inherit hostname;
     })
-    "${inputs.self}/modules/docker"
     "${inputs.self}/modules/tmux"
   ];
+  services.az-docker.enable = true;
 }

systems/mail/default.nix

@@ -12,7 +12,6 @@
     (import "${inputs.self}/modules/nginx-proxy" {
       domain = "mail.zweili.org";
     })
-    "${inputs.self}/modules/docker"
     "${inputs.self}/modules/docker-mailserver"
   ];
 }

systems/management/default.nix

@@ -5,7 +5,6 @@
       ip = "10.7.89.150";
       inherit hostname;
     })
-    "${inputs.self}/modules/docker"
     "${inputs.self}/modules/logs-share"
     "${inputs.self}/modules/nix-direnv"
     "${inputs.self}/modules/rclone-webdav"
@@ -24,4 +23,5 @@
     };
   };
   services.az-data-share.enable = true;
+  services.az-docker.enable = true;
 }

systems/mobile/default.nix

@@ -6,7 +6,6 @@ in
   imports = [
     inputs.nixos-hardware.nixosModules.raspberry-pi-4
     "${inputs.self}/modules/log-to-ram"
-    "${inputs.self}/modules/docker"
     "${inputs.self}/modules/nix-direnv"
     "${inputs.self}/modules/tmux"
   ];
@@ -125,4 +124,6 @@ in
   };
   systemd.services.dhcpd4.after = [ "usb-otg.service" ];
   systemd.services."network-addresses-usb0".after = [ "usb-otg.service" ];
+
+  services.az-docker.enable = true;
 }

systems/nextcloud/default.nix

@@ -8,7 +8,6 @@ in
       ip = "10.7.89.103";
       inherit hostname;
     })
-    "${inputs.self}/modules/docker"
     "${inputs.self}/modules/mariadb"
     (import "${inputs.self}/modules/nextcloud" {
       inherit domain;

systems/plex/default.nix

@@ -10,7 +10,6 @@
       tag = "plex";
       time = "02:30";
     })
-    "${inputs.self}/modules/docker"
     "${inputs.self}/modules/media-share"
     "${inputs.self}/modules/plex"
   ];

systems/proxy/default.nix

@@ -10,7 +10,6 @@
       time = "00:00";
     })
     "${inputs.self}/modules/nginx-acme-base"
-    "${inputs.self}/modules/docker"
     "${inputs.self}/modules/grav"
     "${inputs.self}/modules/haproxy"
     "${inputs.self}/modules/heimdall"

systems/staubfinger/default.nix

@@ -5,7 +5,6 @@
     inputs.nixos-hardware.nixosModules.common-pc-laptop
     inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
     "${inputs.self}/modules/desktop"
-    "${inputs.self}/modules/docker"
     "${inputs.self}/modules/restic-client-desktop"
     "${inputs.self}/modules/tlp"
     "${inputs.self}/modules/tmux"
@@ -50,7 +49,10 @@
     az-lockscreen.enable = true;
     az-makemkv.enable = true;
   };
-  services.az-x86.enable = true;
+  services = {
+    az-docker.enable = true;
+    az-x86.enable = true;
+  };
 
   virtualisation.virtualbox.host.enable = true;
 }

systems/test-raspi/default.nix

@@ -5,8 +5,8 @@
       ip = "10.7.89.40";
       inherit hostname;
     })
-    "${inputs.self}/modules/docker"
     "${inputs.self}/modules/nix-direnv"
     "${inputs.self}/modules/tmux"
   ];
+  services.az-docker.enable = true;
 }

systems/ttrss/default.nix

@@ -8,7 +8,6 @@ in
       ip = "10.7.89.115";
       inherit hostname;
     })
-    "${inputs.self}/modules/docker"
     (import "${inputs.self}/modules/nginx-proxy" {
       domain = "rss-bridge.2li.ch";
       port = "8082";