Skip to content

Commit c0dd7c8

Browse files
committed
add an overlay so that our custom caddy package is in there
1 parent e8b309f commit c0dd7c8

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

flake.nix

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,15 @@
5050
};
5151
in
5252
{
53+
packages = forEachSystem (feSystem: import ./packages inputs.unstable.legacyPackages.${feSystem});
54+
55+
overlays = import ./overlays { };
56+
5357
nixosConfigurations = {
5458
pete = nixpkgs.lib.nixosSystem {
5559
inherit system;
5660
specialArgs = {
61+
inherit inputs;
5762
inherit unstable;
5863
};
5964
modules = [
@@ -65,6 +70,7 @@
6570
maple = nixpkgs.lib.nixosSystem {
6671
inherit system;
6772
specialArgs = {
73+
inherit inputs;
6874
inherit unstable;
6975
};
7076
modules = [
@@ -76,6 +82,7 @@
7682
bay = nixpkgs.lib.nixosSystem {
7783
inherit system;
7884
specialArgs = {
85+
inherit inputs;
7986
inherit unstable;
8087
};
8188
modules = [
@@ -92,6 +99,7 @@
9299
yeehaw = nixpkgs.lib.nixosSystem {
93100
inherit system;
94101
specialArgs = {
102+
inherit inputs;
95103
inherit unstable;
96104
};
97105
modules = [
@@ -103,6 +111,7 @@
103111
kier = nixpkgs.lib.nixosSystem {
104112
inherit system;
105113
specialArgs = {
114+
inherit inputs;
106115
inherit unstable;
107116
};
108117
modules = [
@@ -114,6 +123,7 @@
114123
nova = nixpkgs.lib.nixosSystem {
115124
inherit system;
116125
specialArgs = {
126+
inherit inputs;
117127
inherit unstable;
118128
};
119129
modules = [
@@ -125,6 +135,7 @@
125135
strudel = nixpkgs.lib.nixosSystem {
126136
inherit system;
127137
specialArgs = {
138+
inherit inputs;
128139
inherit unstable;
129140
};
130141
modules = [
@@ -136,6 +147,7 @@
136147
tulip = nixpkgs.lib.nixosSystem {
137148
inherit system;
138149
specialArgs = {
150+
inherit inputs;
139151
inherit unstable;
140152
};
141153
modules = [
@@ -147,6 +159,7 @@
147159
falaise = nixpkgs.lib.nixosSystem {
148160
inherit system;
149161
specialArgs = {
162+
inherit inputs;
150163
inherit unstable;
151164
};
152165
modules = [
@@ -156,8 +169,6 @@
156169
};
157170
};
158171

159-
packages = forEachSystem (feSystem: import ./packages inputs.unstable.legacyPackages.${feSystem});
160-
161172
deploy = {
162173
fastConnection = true;
163174
remoteBuild = true;

modules/common.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
pkgs,
44
config,
5+
inputs,
56
...
67
}:
78
let
@@ -54,7 +55,12 @@ in
5455
};
5556
};
5657

57-
nixpkgs.config.allowUnfree = true;
58+
nixpkgs = {
59+
config.allowUnfree = true;
60+
overlays = with inputs; [
61+
outputs.overlays.packages
62+
];
63+
};
5864

5965
time.timeZone = lib.mkDefault "America/New_York";
6066
i18n.defaultLocale = "en_US.UTF-8";

overlays/default.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{ ... }:
2+
{
3+
packages = final: _prev: import ../packages { pkgs = final; };
4+
}

0 commit comments

Comments
 (0)