diff options
| -rw-r--r-- | flake.nix | 12 | ||||
| -rw-r--r-- | util/default.nix | 3 | ||||
| -rw-r--r-- | util/host.nix | 10 |
3 files changed, 12 insertions, 13 deletions
@@ -12,26 +12,28 @@ self, nixpkgs, nixpkgsUnstable, + lanzaboote, + nixos-wsl, ... }: let - util = import ./util; + util = import ./util/host.nix inputs; in { nixosConfigurations = { - glados = util.host.mkHost { + glados = util.mkHost { name = "glados"; modules = [ - self.lanzaboote.nixosModules.lanzaboote + lanzaboote.nixosModules.lanzaboote ./hosts/glados ]; pkgs = nixpkgsUnstable; }; - glados-wsl = util.host.mkHost { + glados-wsl = util.mkHost { name = "glados-wsl"; modules = [ ./hosts/glados-wsl - self.nixos-wsl.nixosModules.wsl + nixos-wsl.nixosModules.wsl ({lib, ...}: { environment.noXlibs = lib.mkForce false; wsl = { diff --git a/util/default.nix b/util/default.nix deleted file mode 100644 index adfffd7..0000000 --- a/util/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -_: { - host = import ./host.nix; -} diff --git a/util/host.nix b/util/host.nix index 18e87a9..6a58370 100644 --- a/util/host.nix +++ b/util/host.nix @@ -1,20 +1,20 @@ -{lib, ...}: -with lib; { +{nixpkgs, home-manager, ...}: + +{ mkHost = { name, modules, system ? "x86_64-linux", pkgs, }: - nixosSystem { + pkgs.lib.nixosSystem { inherit system; modules = [ ../hosts/common { - nixpkgs.pkgs = pkgs; - networking.hostName = mkDefault name; + networking.hostName = nixpkgs.lib.mkDefault name; } home-manager.nixosModules.home-manager |