sync

hosts/wsl2/default.nix

@@ -1,12 +1,13 @@
-{ lib, pkgs, config, modulesPath, ... }: {
+{ lib, pkgs, config, inputs,  ... }: {
 
-  # nixpkgs.overlays = overlays;
-  # Enable nix flakes
-  nix.package = pkgs.nixFlakes;
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-  system.stateVersion = "22.11";
+  imports = [
+    ../common
+    ../common/mnt-public.nix
+      inputs.nixos-wsl.nixosModules.wsl
+  ];
+
+  # system.stateVersion = "22.11";
+  nixpkgs.hostPlatform.system = "x86_64-linux";
 
   wsl = {
     enable = true;
@@ -17,22 +18,10 @@
     nativeSystemd = true;
     # Enable native Docker support
     docker-native.enable = true;
-
     # Enable integration with Docker Desktop (needs to be installed)
     # docker-desktop.enable = true;
   };
-  services.vscode-server.enable = true;
-
-  mymods = { user_sstent.enable = true; beets.enable = true;};
-  sops.defaultSopsFile = ./secrets.yaml;
-  sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-  sops.secrets.discogs_json = { };
-  sops.secrets.discogs_json.mode = "0440";
-  sops.secrets.discogs_json.owner = config.users.users.sstent.name;
-  sops.secrets.discogs_json.group = config.users.users.sstent.group;
-
-
-
+  
   environment.systemPackages = [
     pkgs.socat
     pkgs.npiperelay
@@ -44,13 +33,8 @@
       npiperelay = callPackage ../../pkgs/npiperelay { };
       #wsl-ssh-agent-relay = callPackage ../../pkgs/wsl-ssh-agent-relay { };
     };
-    fileSystems."/mnt/Public" = {
-        device = "//192.168.1.109/Public";
-        fsType = "cifs";
-        options = ["uid=0,gid=1000"];
-    };
 
-  systemd.services.nixs-wsl-systemd-fix = {
+   systemd.services.nixs-wsl-systemd-fix = {
     description = "Fix the /dev/shm symlink to be a mount";
     unitConfig = {
       DefaultDependencies = "no";