Merge pull request #295 from nix-community/prep-release

New release preparation

3 files changed, 0 insertions, 81 deletions

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
-      ];
-    };
-}