DGNum/infrastructure
13
6
Fork 3
Code Issues 20 Pull requests 8 Projects 1 Releases Packages Wiki Activity Actions

feat(nix-lib): Update to 0.1.5 and switch to using mkConfig

Browse source
This commit is contained in:
Tom Hubrecht 2023-10-02 13:53:20 +02:00
parent 37137ca20b
commit 56cd177d3e
4 changed files with 18 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
machines/compute01/_configuration.nix
View file

@ -1,19 +1,14 @@
{ dgn-lib, ... }: { dgn-lib, ... }:
let dgn-lib.mkConfig {
inherit (dgn-lib)
enableModules
mkImports
recursiveFuse;
# List of modules to enable
enabledModules = [ enabledModules = [
# List of modules to enable
"dgn-dns" "dgn-dns"
"dgn-web" "dgn-web"
]; ];
# List of services to enable
enabledServices = [ enabledServices = [
# List of services to enable
"ds-fr" "ds-fr"
"kanidm" "kanidm"
"mastodon" "mastodon"
@ -22,12 +17,6 @@ let
"satosa" "satosa"
"zammad" "zammad"
]; ];
in
recursiveFuse [ root = ./.;
(enableModules enabledModules) }
{
imports = mkImports ./. enabledServices;
}
]

21
machines/storage01/_configuration.nix
View file

@ -1,29 +1,18 @@
{ dgn-lib, ... }: { dgn-lib, ... }:
let dgn-lib.mkConfig {
inherit (dgn-lib)
enableModules
mkImports
recursiveFuse;
# List of modules to enable
enabledModules = [ enabledModules = [
# List of modules to enable
"dgn-web" "dgn-web"
]; ];
# List of services to enable
enabledServices = [ enabledServices = [
# List of services to enable
"atticd" "atticd"
"forgejo" "forgejo"
"garage" "garage"
"peertube" "peertube"
]; ];
in
recursiveFuse [ root = ./.;
(enableModules enabledModules) }
{
imports = mkImports ./. enabledServices;
}
]

21
machines/web01/_configuration.nix
View file

@ -1,29 +1,18 @@
{ dgn-lib, ... }: { dgn-lib, ... }:
let dgn-lib.mkConfig {
inherit (dgn-lib)
enableModules
mkImports
recursiveFuse;
# List of modules to enable
enabledModules = [ enabledModules = [
# List of modules to enable
"dgn-web" "dgn-web"
]; ];
# List of services to enable
enabledServices = [ enabledServices = [
# List of services to enable
"metis" "metis"
"linkal" "linkal"
"plausible" "plausible"
# "wordpress" # "wordpress"
]; ];
in
recursiveFuse [ root = ./.;
(enableModules enabledModules) }
{
imports = mkImports ./. enabledServices;
}
]

6
npins/sources.json
View file

@ -84,10 +84,10 @@
}, },
"pre_releases": false, "pre_releases": false,
"version_upper_bound": null, "version_upper_bound": null,
"version": "0.1.4", "version": "0.1.5",
"revision": "7f41fb168f0a97481d06019b3de305ebff9ee348", "revision": "5260bfd4e8aaffef455bfa0edf3d0a2db81de989",
"url": null, "url": null,
"hash": "1ymx3ayi189xcinpc6r71qvwgqsvz96y7dwdxzlrjawr08c95wm2" "hash": "18c9mcjx1v4zlgl91dgiq4rrcayz05fy8v5pq00dlyfm3chrqvxx"
}, },
"nix-patches": { "nix-patches": {
"type": "GitRelease", "type": "GitRelease",