From f892f1a55707599d45394ca30a319ad34140927b Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Thu, 15 Dec 2022 19:50:49 -0800 Subject: [PATCH] Move nixos-wsl module import to flake def This avoids having to use specialArgs to pass it down to the configuration file to import there --- flake.nix | 8 +++++--- machine/stagirite/default.nix | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 567ff43..45885c2 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixos-wsl.url = github:nix-community/NixOS-WSL; }; - outputs = { self, nixpkgs, nixos-wsl }@attrs: { + outputs = { self, nixpkgs, nixos-wsl }: { nixosConfigurations.catacomb = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; modules = [ ./machine/catacomb ]; @@ -15,8 +15,10 @@ }; nixosConfigurations.stagirite = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = attrs; - modules = [ ./machine/stagirite ]; + modules = [ + nixos-wsl.nixosModules.wsl + ./machine/stagirite + ]; }; }; } diff --git a/machine/stagirite/default.nix b/machine/stagirite/default.nix index 1eddf4c..7551de6 100644 --- a/machine/stagirite/default.nix +++ b/machine/stagirite/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, modulesPath, nixos-wsl, ... }: +{ lib, pkgs, config, modulesPath, ... }: with lib; let @@ -7,8 +7,6 @@ in { imports = [ "${modulesPath}/profiles/minimal.nix" - - nixos-wsl.nixosModules.wsl ]; wsl = {