From 83fbe7e22049bc29ab60a46e390018ff6ae340da Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 29 Sep 2023 20:51:59 +0300
Subject: cleanup: remove old docker-desktop hacks

---
 modules/default.nix               |  3 +--
 modules/docker-desktop.nix        | 41 +++++++++++++++++++++++++++++++++++++++
 modules/docker/default.nix        |  6 ------
 modules/docker/docker-desktop.nix | 41 ---------------------------------------
 modules/docker/native.nix         | 34 --------------------------------
 5 files changed, 42 insertions(+), 83 deletions(-)
 create mode 100644 modules/docker-desktop.nix
 delete mode 100644 modules/docker/default.nix
 delete mode 100644 modules/docker/docker-desktop.nix
 delete mode 100644 modules/docker/native.nix

diff --git a/modules/default.nix b/modules/default.nix
index 0278634..0e5c58f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,8 +1,7 @@
 { ... }: {
   imports = [
     ./build-tarball.nix
-    ./docker
-    ./installer.nix
+    ./docker-desktop.nix
     ./interop.nix
     ./recovery.nix
     ./systemd
diff --git a/modules/docker-desktop.nix b/modules/docker-desktop.nix
new file mode 100644
index 0000000..e2ae076
--- /dev/null
+++ b/modules/docker-desktop.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+with builtins; with lib; {
+
+  imports = [
+    (mkRenamedOptionModule [ "wsl" "docker" ] [ "wsl" "docker-desktop" ])
+  ];
+
+  options.wsl.docker-desktop = with types; {
+    enable = mkEnableOption "Docker Desktop integration";
+  };
+
+  config =
+    let
+      cfg = config.wsl.docker-desktop;
+    in
+    mkIf (config.wsl.enable && cfg.enable) {
+
+      environment.systemPackages = with pkgs; [
+        docker
+        docker-compose
+      ];
+
+      systemd.services.docker-desktop-proxy = {
+        description = "Docker Desktop proxy";
+        script = ''
+          ${config.wsl.wslConf.automount.root}/wsl/docker-desktop/docker-desktop-user-distro proxy --docker-desktop-root ${config.wsl.wslConf.automount.root}/wsl/docker-desktop
+        '';
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          Restart = "on-failure";
+          RestartSec = "30s";
+        };
+      };
+
+      users.groups.docker.members = [
+        config.wsl.defaultUser
+      ];
+
+    };
+
+}
diff --git a/modules/docker/default.nix b/modules/docker/default.nix
deleted file mode 100644
index 176b95b..0000000
--- a/modules/docker/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }: {
-  imports = [
-    ./docker-desktop.nix
-    ./native.nix
-  ];
-}
diff --git a/modules/docker/docker-desktop.nix b/modules/docker/docker-desktop.nix
deleted file mode 100644
index e2ae076..0000000
--- a/modules/docker/docker-desktop.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ config, lib, pkgs, ... }:
-with builtins; with lib; {
-
-  imports = [
-    (mkRenamedOptionModule [ "wsl" "docker" ] [ "wsl" "docker-desktop" ])
-  ];
-
-  options.wsl.docker-desktop = with types; {
-    enable = mkEnableOption "Docker Desktop integration";
-  };
-
-  config =
-    let
-      cfg = config.wsl.docker-desktop;
-    in
-    mkIf (config.wsl.enable && cfg.enable) {
-
-      environment.systemPackages = with pkgs; [
-        docker
-        docker-compose
-      ];
-
-      systemd.services.docker-desktop-proxy = {
-        description = "Docker Desktop proxy";
-        script = ''
-          ${config.wsl.wslConf.automount.root}/wsl/docker-desktop/docker-desktop-user-distro proxy --docker-desktop-root ${config.wsl.wslConf.automount.root}/wsl/docker-desktop
-        '';
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig = {
-          Restart = "on-failure";
-          RestartSec = "30s";
-        };
-      };
-
-      users.groups.docker.members = [
-        config.wsl.defaultUser
-      ];
-
-    };
-
-}
diff --git a/modules/docker/native.nix b/modules/docker/native.nix
deleted file mode 100644
index 88f48d9..0000000
--- a/modules/docker/native.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ config, lib, pkgs, ... }:
-with builtins; with lib; {
-
-  options.wsl.docker-native = with types; {
-    enable = mkEnableOption "Native Docker integration in NixOS.";
-
-    addToDockerGroup = mkOption {
-      type = bool;
-      default = config.security.sudo.wheelNeedsPassword;
-      description = ''
-        Wether to add the default user to the docker group.
-
-        This is not recommended, if you have a password, because it essentially permits unauthenticated root access.
-      '';
-    };
-  };
-
-  config =
-    let
-      cfg = config.wsl.docker-native;
-    in
-    mkIf (config.wsl.enable && cfg.enable) {
-      environment.systemPackages = with pkgs; [
-        docker-compose
-      ];
-
-      virtualisation.docker.package = (pkgs.docker.override { iptables = pkgs.iptables-legacy; });
-      virtualisation.docker.enable = true;
-
-      users.groups.docker.members = lib.mkIf cfg.addToDockerGroup [
-        config.wsl.defaultUser
-      ];
-    };
-}
-- 
cgit v1.2.3