flake: update lock; change all configInputs.inputs to configInputs

This commit is contained in:
2024-03-02 19:51:38 +01:00
parent a7ad639465
commit c5a5265557
6 changed files with 38 additions and 38 deletions
+3 -3
View File
@@ -33,13 +33,13 @@ let
stable = false;
inherit materusFlake;
host = "Generic";
hm = inputs.configInputs.inputs.home-manager;
nixerus = inputs.configInputs.inputs.nixerus;
hm = inputs.configInputs.home-manager;
nixerus = inputs.configInputs.nixerus;
configInputs = inputs.configInputs;
path = materusFlake.selfPath;
isHm = true;
}; in
inputs.configInputs.inputs.home-manager.lib.homeManagerConfiguration {
inputs.configInputs.home-manager.lib.homeManagerConfiguration {
pkgs = import inputs.nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; };
extraSpecialArgs = { inherit materusCfg; };
modules = [
+2 -2
View File
@@ -6,13 +6,13 @@ let
makeSystem = { host, arch ? "x86_64-linux", extraModules ? [ ], stable ? true }:
let
nixosSystem = if stable then inputs.nixpkgs-stable.lib.nixosSystem else inputs.nixpkgs.lib.nixosSystem;
hm = if stable then inputs.configInputs-stable.inputs.home-manager else inputs.configInputs.inputs.home-manager;
hm = if stable then inputs.configInputs-stable.home-manager else inputs.configInputs.home-manager;
materusCfg = {
inherit stable;
inherit materusFlake;
inherit host;
inherit hm;
nixerus = if stable then inputs.configInputs-stable.inputs.nixerus else inputs.configInputs.inputs.nixerus;
nixerus = if stable then inputs.configInputs-stable.nixerus else inputs.configInputs.nixerus;
configInputs = if stable then inputs.configInputs-stable else inputs.configInputs;
path = materusFlake.selfPath;
isHm = false;
+1 -1
View File
@@ -2,7 +2,7 @@
{
imports = [
materusCfg.configInputs.inputs.nixos-hardware.nixosModules.raspberry-pi-4
materusCfg.configInputs.nixos-hardware.nixosModules.raspberry-pi-4
./configuration.nix
];
}
+1 -1
View File
@@ -18,5 +18,5 @@ in
joypixels.acceptLicense = lib.mkDefault true;
firefox.enablePlasmaBrowserIntegration = true;
};
config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [materusArg.cfg.configInputs.inputs.emacs-overlay.overlay];
config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [materusArg.cfg.configInputs.emacs-overlay.overlay];
}
@@ -6,7 +6,7 @@ with materusArg.pkgs.lib;
];
#Single Packages
options.materus.profile.packages.home-manager = mkPrivateVar materusArg.cfg.configInputs.inputs.home-manager.packages.${pkgs.system}.home-manager;
options.materus.profile.packages.home-manager = mkPrivateVar materusArg.cfg.configInputs.home-manager.packages.${pkgs.system}.home-manager;
options.materus.profile.packages.firefox = mkPrivateVar pkgs.firefox;
#Package Lists