diff options
Diffstat (limited to 'systems/eldiron')
-rw-r--r-- | systems/eldiron/base.nix | 6 | ||||
-rw-r--r-- | systems/eldiron/flake.lock | 10 | ||||
-rw-r--r-- | systems/eldiron/flake.nix | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/systems/eldiron/base.nix b/systems/eldiron/base.nix index 1f894a5..24e05fe 100644 --- a/systems/eldiron/base.nix +++ b/systems/eldiron/base.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { config, pkgs, lib, php, name, secrets, ... }: | 1 | { config, pkgs, lib, ports, name, secrets, ... }: |
2 | { | 2 | { |
3 | # ssh-keyscan eldiron | nix-shell -p ssh-to-age --run ssh-to-age | 3 | # ssh-keyscan eldiron | nix-shell -p ssh-to-age --run ssh-to-age |
4 | secrets.ageKeys = [ "age1dxr5lhvtnjssfaqpnf6qx80h8gfwkxg3tdf35m6n9wljmk7wadfs3kmahj" ]; | 4 | secrets.ageKeys = [ "age1dxr5lhvtnjssfaqpnf6qx80h8gfwkxg3tdf35m6n9wljmk7wadfs3kmahj" ]; |
@@ -28,9 +28,7 @@ | |||
28 | "nodejs-16.20.2" # for landing page building | 28 | "nodejs-16.20.2" # for landing page building |
29 | ]; | 29 | ]; |
30 | 30 | ||
31 | nixpkgs.overlays = [ | 31 | nixpkgs.overlays = builtins.attrValues ports.overlays; |
32 | php.overlays.php | ||
33 | ]; | ||
34 | powerManagement.cpuFreqGovernor = "powersave"; | 32 | powerManagement.cpuFreqGovernor = "powersave"; |
35 | 33 | ||
36 | security.acme.certs."${name}".postRun = builtins.concatStringsSep "\n" [ | 34 | security.acme.certs."${name}".postRun = builtins.concatStringsSep "\n" [ |
diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock index 99a5c92..6611639 100644 --- a/systems/eldiron/flake.lock +++ b/systems/eldiron/flake.lock | |||
@@ -2141,7 +2141,7 @@ | |||
2141 | "type": "path" | 2141 | "type": "path" |
2142 | } | 2142 | } |
2143 | }, | 2143 | }, |
2144 | "private-php": { | 2144 | "private-ports": { |
2145 | "inputs": { | 2145 | "inputs": { |
2146 | "flake-utils": "flake-utils_11", | 2146 | "flake-utils": "flake-utils_11", |
2147 | "nixpkgs": "nixpkgs_14", | 2147 | "nixpkgs": "nixpkgs_14", |
@@ -2149,12 +2149,12 @@ | |||
2149 | }, | 2149 | }, |
2150 | "locked": { | 2150 | "locked": { |
2151 | "lastModified": 1, | 2151 | "lastModified": 1, |
2152 | "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", | 2152 | "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=", |
2153 | "path": "../../flakes/private/php", | 2153 | "path": "../../flakes/private/ports", |
2154 | "type": "path" | 2154 | "type": "path" |
2155 | }, | 2155 | }, |
2156 | "original": { | 2156 | "original": { |
2157 | "path": "../../flakes/private/php", | 2157 | "path": "../../flakes/private/ports", |
2158 | "type": "path" | 2158 | "type": "path" |
2159 | } | 2159 | } |
2160 | }, | 2160 | }, |
@@ -2496,7 +2496,7 @@ | |||
2496 | "private-openldap": "private-openldap", | 2496 | "private-openldap": "private-openldap", |
2497 | "private-paste": "private-paste", | 2497 | "private-paste": "private-paste", |
2498 | "private-peertube": "private-peertube", | 2498 | "private-peertube": "private-peertube", |
2499 | "private-php": "private-php", | 2499 | "private-ports": "private-ports", |
2500 | "private-ssh": "private-ssh", | 2500 | "private-ssh": "private-ssh", |
2501 | "private-system": "private-system", | 2501 | "private-system": "private-system", |
2502 | "public-copanier": "public-copanier", | 2502 | "public-copanier": "public-copanier", |
diff --git a/systems/eldiron/flake.nix b/systems/eldiron/flake.nix index 790b638..c126d0b 100644 --- a/systems/eldiron/flake.nix +++ b/systems/eldiron/flake.nix | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | private-peertube.url = "path:../../flakes/private/peertube"; | 28 | private-peertube.url = "path:../../flakes/private/peertube"; |
29 | private-buildbot.url = "path:../../flakes/private/buildbot"; | 29 | private-buildbot.url = "path:../../flakes/private/buildbot"; |
30 | private-php.url = "path:../../flakes/private/php"; | 30 | private-ports.url = "path:../../flakes/private/ports"; |
31 | private-environment.url = "path:../../flakes/private/environment"; | 31 | private-environment.url = "path:../../flakes/private/environment"; |
32 | private-openarc.url = "path:../../flakes/private/openarc"; | 32 | private-openarc.url = "path:../../flakes/private/openarc"; |
33 | private-openldap.url = "path:../../flakes/private/openldap"; | 33 | private-openldap.url = "path:../../flakes/private/openldap"; |
@@ -84,7 +84,7 @@ | |||
84 | openldap = private-openldap; | 84 | openldap = private-openldap; |
85 | monitoring = private-monitoring; | 85 | monitoring = private-monitoring; |
86 | peertube = private-peertube.packages.x86_64-linux; | 86 | peertube = private-peertube.packages.x86_64-linux; |
87 | php = private-php; | 87 | ports = private-ports; |
88 | }; | 88 | }; |
89 | }; | 89 | }; |
90 | } | 90 | } |