change "docker-native" option to "docker", revise language, and forma…

…t code
nix-community · Apr 21, 2022 · 68bfec5 · 68bfec5
1 parent 2a9ce11
commit 68bfec5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/configuration.nix b/configuration.nix
@@ -17,11 +17,12 @@ in
     defaultUser = "nixos";
     startMenuLaunchers = true;
 
+    # Enable native Docker support
+    # docker.enable = true;
+
     # Enable integration with Docker Desktop (needs to be installed)
     # docker-desktop.enable = true;
 
-    # Enable native Docker support within NixOS
-    # docker-native.enable = true;
   };
 
   # Enable nix flakes

diff --git a/flake.nix b/flake.nix
@@ -18,9 +18,9 @@
         imports = [
           ./modules/build-tarball.nix
           ./modules/wsl-distro.nix
+          ./modules/docker.nix
           ./modules/docker-desktop.nix
           ./modules/installer.nix
-          ./modules/docker-native.nix
         ];
       };
 

diff --git a/modules/docker-native.nix → modules/docker.nix b/modules/docker-native.nix → modules/docker.nix
@@ -1,13 +1,13 @@
 { config, lib, pkgs, ... }:
 with builtins; with lib; {
 
-  options.wsl.docker-native = with types; {
-    enable = mkEnableOption "Native Docker integration in NixOS.";
+  options.wsl.docker = with types; {
+    enable = mkEnableOption "Enable native Docker support in NixOS.";
   };
 
   config =
     let
-      cfg = config.wsl.docker-native;
+      cfg = config.wsl.docker;
     in
     mkIf (config.wsl.enable && cfg.enable) {
       nixpkgs.overlays = [