gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Passing sources through to pkgs and modules.

Browse source
This commit is contained in:
kat witch 2021-03-03 03:05:50 +00:00
parent 9ece41ee80
commit 75041dd68c
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
5 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
default.nix
View file

@ -1,6 +1,6 @@
rec { rec {
sources = import ./nix/sources.nix; sources = import ./nix/sources.nix;
pkgs = import ./pkgs { }; pkgs = import ./pkgs { inherit sources; };
witch = import ./lib/witch.nix { lib = pkgs.lib; }; witch = import ./lib/witch.nix { lib = pkgs.lib; };
hosts = import ./lib/hosts.nix { inherit pkgs sources witch; }; hosts = import ./lib/hosts.nix { inherit pkgs sources witch; };

2
lib/hosts.nix
View file

@ -28,7 +28,7 @@ rec {
networking = { networking = {
inherit hostName; inherit hostName;
}; };
nixpkgs.pkgs = import pkgsPath { inherit (config.nixpkgs) config; }; nixpkgs.pkgs = import pkgsPath { inherit (config.nixpkgs) config; inherit sources; };
}; };

5
modules/home/default.nix
View file

@ -1,7 +1,6 @@
{ ... }: { sources, ... }:
let sources = import ../../nix/sources.nix; {
in {
home-manager.users = { home-manager.users = {
imports = [ imports = [
(sources.tf-nix + "/modules/home/secrets.nix") (sources.tf-nix + "/modules/home/secrets.nix")

5
modules/nixos/default.nix
View file

@ -1,7 +1,6 @@
{ ... }: { sources, ... }:
let sources = import ../../nix/sources.nix; {
in {
imports = [ imports = [
./deploy ./deploy
(sources.tf-nix + "/modules/nixos/secrets.nix") (sources.tf-nix + "/modules/nixos/secrets.nix")

4
pkgs/default.nix
View file

@ -1,9 +1,7 @@
{ config ? { }, system ? builtins.currentSystem, ... }@args: { config ? { }, sources, system ? builtins.currentSystem, ... }@args:
let let
sources = import ../nix/sources.nix;
pkgs = import sources.nixpkgs args; pkgs = import sources.nixpkgs args;
overlay = self: super: rec { overlay = self: super: rec {
dino = super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" { dino = super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
inherit (super) dino; inherit (super) dino;