summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Vink <mike1994vink@gmail.com>2023-10-12 09:50:47 +0000
committerMike Vink <mike1994vink@gmail.com>2023-10-12 09:50:47 +0000
commita73532c19d9fa547a6330421e3093256e9d65b3c (patch)
treef35ce084d388bbf3a20977483770c12d796b1237
parent4380cb33da707aaf2c2df9f023c23b213c85b27d (diff)
change flake
-rw-r--r--flake.nix3
-rw-r--r--machines/wsl.nix4
2 files changed, 4 insertions, 3 deletions
diff --git a/flake.nix b/flake.nix
index e0f21eb..764acd8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,7 +45,7 @@
])));
};
- nixosConfigurations.wsl = nixpkgs.lib.nixosSystem {
+ nixosConfigurations.core = nixpkgs.lib.nixosSystem {
inherit lib system;
specialArgs = {inherit inputs;};
modules = [
@@ -54,7 +54,6 @@
(import ./overlays/vimPlugins.nix {inherit pkgs;})
])];
})
- ./achines/wsl.nix
] ++ (attrValues
(attrsets.mergeAttrsList (map modulesIn [
./profiles/core
diff --git a/machines/wsl.nix b/machines/wsl.nix
index 09e674b..d2b7b58 100644
--- a/machines/wsl.nix
+++ b/machines/wsl.nix
@@ -52,7 +52,7 @@ in
enable = true;
defaultUser = "mike";
wslConf.network = {
- generateResolvConf = true;
+ generateResolvConf = false;
};
};
@@ -125,6 +125,8 @@ in
EnvironmentFile = "/wsl/dockerd/environmentfile";
};
# TODO: why does this not work with etc."resolv.conf"??
+
+ networking.resolvconf.enable = false;
environment.etc."/resolv.conf".source = "/wsl/etc/resolv.conf";
environment.etc."profile.local".source = "/wsl/etc/profile";
security.pki.certificateFiles = [