dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions

fix flake inputs

Browse source
This commit is contained in:
Tim Schubert 2023-03-18 14:17:07 +01:00
parent 1f9e544478
commit 59a9326729
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/configurations.nix
View file

@ -7,6 +7,7 @@
, recipemd , recipemd
, helix , helix
, nixos-generators , nixos-generators
, flake-registry
, ... , ...
}@inputs: }@inputs:
let let
@ -15,7 +16,10 @@ let
nixosSystem = { system ? "x86_64-linux", extraModules ? [ ] }: nixpkgs.lib.nixosSystem { nixosSystem = { system ? "x86_64-linux", extraModules ? [ ] }: nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules; modules = [{
# Add flakes to registry and nix path.
dadada.inputs = inputs // { dadada = self; };
}] ++ (nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules;
}; };
in in
{ {
@ -28,9 +32,6 @@ in
dadada.pkgs = (getDefaultPkgs system { dadada.pkgs = (getDefaultPkgs system {
inherit recipemd; inherit recipemd;
}) // self.packages.${system}; }) // self.packages.${system};
# Add flakes to registry and nix path.
dadada.inputs = inputs // { dadada = self; };
} }
nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1 nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1

1
outputs.nix
View file

@ -1,6 +1,7 @@
# Adapted from Mic92/dotfiles # Adapted from Mic92/dotfiles
{ self { self
, flake-utils , flake-utils
, flake-registry
, homePage , homePage
, nixpkgs , nixpkgs
, home-manager , home-manager