From a73532c19d9fa547a6330421e3093256e9d65b3c Mon Sep 17 00:00:00 2001 From: Mike Vink Date: Thu, 12 Oct 2023 09:50:47 +0000 Subject: change flake --- flake.nix | 3 +-- machines/wsl.nix | 4 +++- 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 = [ -- cgit v1.2.3