From c28efb453df4d7f125dc69a6c89bef9c66f69500 Mon Sep 17 00:00:00 2001 From: Soispha Date: Mon, 10 Apr 2023 12:32:27 +0200 Subject: Fix(treewide): Make system compile again --- flake/nixosConfigurations/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'flake') diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index d8663f85..d47c89aa 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -2,6 +2,7 @@ { system, pkgs, + nixpkgs, sysLib, yambar_cpu, yambar_memory, @@ -52,19 +53,21 @@ }; }; ageConfig = import ../../secrets; + impermanenceConfig = import ../../system/impermanence; defaultModules = [ agenix.nixosModules.default ageConfig home-manager.nixosModules.home-manager - #(import "${inputs.home-manager}/nixos") - # inputs.impermanence.nixosModules.home-manager.impermanence homeManagerConfig + + impermanence.nixosModules.impermanence + impermanenceConfig ]; in { - tiamat = pkgs.lib.nixosSystem { - inherit system; + tiamat = nixpkgs.lib.nixosSystem { + inherit system pkgs; modules = [ ../../hosts/tiamat/configuration.nix @@ -72,23 +75,23 @@ in { ++ defaultModules; }; - mammun = pkgs.lib.nixosSystem { - inherit system; + mammun = nixpkgs.lib.nixosSystem { + inherit system pkgs; modules = [ ../../hosts/mammun/configuration.nix ] ++ defaultModules; }; - lahmu = pkgs.lib.nixosSystem { - inherit system; + lahmu = nixpkgs.lib.nixosSystem { + inherit system pkgs; modules = [ ../../hosts/lahmu/configuration.nix ] ++ defaultModules; }; - spawn = pkgs.lib.nixosSystem { + spawn = nixpkgs.lib.nixosSystem { modules = [../../hosts/spawn/configuration.nix]; }; } -- cgit 1.4.1