From 59a932672907cc5df3305ef7953701960a7e279a Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sat, 18 Mar 2023 14:17:07 +0100
Subject: [PATCH] fix flake inputs
---
nixos/configurations.nix | 9 +++++----
outputs.nix | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index 9c32756..9081b2f 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -7,6 +7,7 @@
, recipemd
, helix
, nixos-generators
+, flake-registry
, ...
}@inputs:
let
@@ -15,7 +16,10 @@ let
nixosSystem = { system ? "x86_64-linux", extraModules ? [ ] }: nixpkgs.lib.nixosSystem {
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
{
@@ -28,9 +32,6 @@ in
dadada.pkgs = (getDefaultPkgs system {
inherit recipemd;
}) // self.packages.${system};
-
- # Add flakes to registry and nix path.
- dadada.inputs = inputs // { dadada = self; };
}
nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
diff --git a/outputs.nix b/outputs.nix
index 960cb90..3393da0 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -1,6 +1,7 @@
# Adapted from Mic92/dotfiles
{ self
, flake-utils
+, flake-registry
, homePage
, nixpkgs
, home-manager