From 19520eae7f5cd69c2303296559dc084c451256fa Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 5 Dec 2022 22:51:46 +0100
Subject: [PATCH] system/docker: modularize

---
 legacy/modules/docker.nix           | 13 -------------
 machines/serverle/configuration.nix |  3 +--
 machines/serverle/system.nix        | 10 ++++++++++
 modules/system/default.nix          |  7 +++++++
 modules/system/docker/default.nix   | 22 ++++++++++++++++++++++
 5 files changed, 40 insertions(+), 15 deletions(-)
 delete mode 100644 legacy/modules/docker.nix
 create mode 100644 machines/serverle/system.nix
 create mode 100644 modules/system/default.nix
 create mode 100644 modules/system/docker/default.nix

diff --git a/legacy/modules/docker.nix b/legacy/modules/docker.nix
deleted file mode 100644
index 0bfb851..0000000
--- a/legacy/modules/docker.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    docker
-    docker-compose
-  ];
-
-  virtualisation.docker = {
-    enable = true;
-    autoPrune.enable = true;
-  };
-}
diff --git a/machines/serverle/configuration.nix b/machines/serverle/configuration.nix
index 0357ec4..aee0659 100644
--- a/machines/serverle/configuration.nix
+++ b/machines/serverle/configuration.nix
@@ -6,10 +6,9 @@
     ./dyndns.nix
     ./services.nix
     ./syncthing.nix
+    ./system.nix
     ./wifi.nix
     ../../legacy/modules/avahi.nix
-    ../../legacy/modules/docker.nix
-    ../../legacy/modules/nix.nix
     ../../legacy/modules/webapps/bazarr.nix
     ../../legacy/modules/webapps/prowlarr.nix
     ../../legacy/modules/webapps/radarr.nix
diff --git a/machines/serverle/system.nix b/machines/serverle/system.nix
new file mode 100644
index 0000000..b0d2bd3
--- /dev/null
+++ b/machines/serverle/system.nix
@@ -0,0 +1,10 @@
+# enabled system services
+{ config, lib, ... }:
+let
+  secrets = config.sops.secrets;
+in
+{
+  my.system = {
+    docker.enable = true;
+  };
+}
diff --git a/modules/system/default.nix b/modules/system/default.nix
new file mode 100644
index 0000000..4c290a4
--- /dev/null
+++ b/modules/system/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+  imports = [
+    ./docker
+  ];
+}
+
diff --git a/modules/system/docker/default.nix b/modules/system/docker/default.nix
new file mode 100644
index 0000000..f3f5683
--- /dev/null
+++ b/modules/system/docker/default.nix
@@ -0,0 +1,22 @@
+# Docker related settings
+{ config, inputs, lib, options, pkgs, ... }:
+let
+  cfg = config.my.system.docker;
+in
+{
+  options.my.system.docker = with lib; {
+    enable = mkEnableOption "docker configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      docker
+      docker-compose
+    ];
+
+    virtualisation.docker = {
+      enable = true;
+      autoPrune.enable = true;
+    };
+  };
+}