summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock10
-rw-r--r--flake.nix7
-rw-r--r--machines/wsl.nix11
3 files changed, 16 insertions, 12 deletions
diff --git a/flake.lock b/flake.lock
index 4f4b540..35f7ae8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -61,15 +61,15 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1696867472,
- "narHash": "sha256-L/PRTyWz5rZ1V6v1MPh3xWndlna9qNHLmNu8x3Y5+xg=",
- "owner": "ivi-vink",
+ "lastModified": 1696813828,
+ "narHash": "sha256-gmJZb8Zm0RyZA1pQwMVjFwjv0jnnNAyK5+WBFOvygq4=",
+ "owner": "nix-community",
"repo": "NixOS-WSL",
- "rev": "5939bc5ae845f629d74985668aede2055a9bc08b",
+ "rev": "9bdc429fc82e2fc884ccecd23240e87b4bb1688c",
"type": "github"
},
"original": {
- "owner": "ivi-vink",
+ "owner": "nix-community",
"repo": "NixOS-WSL",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index af1ee9d..fe38698 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-wsl = {
- url = "github:ivi-vink/NixOS-WSL";
+ url = "github:nix-community/NixOS-WSL";
};
};
@@ -55,10 +55,7 @@
])];
})
./machines/wsl.nix
- ] ++ (attrValues
- (attrsets.mergeAttrsList (map modulesIn [
- ./profiles/core
- ])));
+ ];
};
templates = {
diff --git a/machines/wsl.nix b/machines/wsl.nix
index 77c3c74..7d428a7 100644
--- a/machines/wsl.nix
+++ b/machines/wsl.nix
@@ -5,8 +5,15 @@
inputs.nixos-wsl.nixosModules.default
];
- wsl.enable = true;
- wsl.defaultUser = "mike";
+ environment.systemPackages = with pkgs; [
+ git
+ ];
+
+ wsl = {
+ enable = true;
+ defaultUser = "mike";
+ wslConf.generateResolveConf = false;
+ };
system.stateVersion = "23.05";
virtualisation.docker.enable = true;
}