nixos/wsl: init

3 files changed, 43 insertions, 19 deletions

diff --git a/modules/nixos/mixins/default.nix b/modules/nixos/mixins/default.nix
index 2bad18c..7d66a47 100644
--- a/modules/nixos/mixins/default.nix
+++ b/modules/nixos/mixins/default.nix
@@ -22,6 +22,7 @@
     ./plasma.nix
     ./resolved.nix
     ./tailscale.nix
+    ./wsl.nix
     ./zram.nix
   ];
 }
diff --git a/modules/nixos/mixins/wsl.nix b/modules/nixos/mixins/wsl.nix
new file mode 100644
index 0000000..70e76c1
--- /dev/null
+++ b/modules/nixos/mixins/wsl.nix
@@ -0,0 +1,42 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
+
+{
+  imports = [
+    inputs.nixos-wsl.nixosModules.wsl
+  ];
+
+  config = lib.mkMerge [
+    {
+      wsl = {
+        interop = {
+          includePath = false; # this is so annoying
+          register = true;
+        };
+      };
+    }
+
+    (lib.mkIf config.wsl.enable {
+      environment.systemPackages = [
+        pkgs.wslu
+      ];
+
+      security = {
+        # Something, something `resolv.conf` error
+        # (nixos-wsl probably doesn't set it)
+        apparmor.enable = false;
+        # `run0` fails with `Failed to start transient service unit: Interactive authentication required.`
+        sudo.enable = true;
+      };
+
+      services = {
+        resolved.enable = false;
+      };
+    })
+  ];
+}
diff --git a/systems/glados-wsl/default.nix b/systems/glados-wsl/default.nix
index 9ca63ed..a19db06 100644
--- a/systems/glados-wsl/default.nix
+++ b/systems/glados-wsl/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    inputs.nixos-wsl.nixosModules.wsl
     inputs.self.nixosModules.default
   ];
 
@@ -21,27 +20,13 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    wget
-    wslu
-  ];
-
   networking.hostName = "glados-wsl";
 
   nix.package = pkgs.nixVersions.latest;
 
   nixpkgs.hostPlatform = "x86_64-linux";
 
-  security = {
-    # Something, something `resolv.conf` error
-    # (nixos-wsl probably doesn't set it)
-    apparmor.enable = false;
-    # `run0` fails with `Failed to start transient service unit: Interactive authentication required.`
-    sudo.enable = true;
-  };
-
   services = {
-    resolved.enable = false;
     tailscale.enable = false;
   };
 
@@ -50,9 +35,5 @@
   wsl = {
     enable = true;
     defaultUser = "seth";
-    interop = {
-      includePath = false; # this is so annoying
-      register = true;
-    };
   };
 }