summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--1systems/tv/cd.nix1
-rw-r--r--1systems/tv/mkdir.nix1
-rw-r--r--1systems/tv/nomic.nix1
-rw-r--r--1systems/tv/rmdir.nix1
-rw-r--r--1systems/tv/wu.nix1
-rw-r--r--3modules/krebs/retiolum.nix40
6 files changed, 18 insertions, 27 deletions
diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index 2f8cf8197..bf556e017 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -89,7 +89,6 @@ in
imports = [ ../../3modules/krebs/retiolum.nix ];
krebs.retiolum = {
enable = true;
- hosts = ../../Zhosts;
connectTo = [
"fastpoke"
"pigstarter"
diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index 05d76c4cb..823f04430 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -32,7 +32,6 @@ with lib;
imports = [ ../../3modules/krebs/retiolum.nix ];
krebs.retiolum = {
enable = true;
- hosts = ../../Zhosts;
connectTo = [
"cd"
"fastpoke"
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index bae12d364..ef4a5ca34 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -40,7 +40,6 @@ with lib;
imports = [ ../../3modules/krebs/retiolum.nix ];
krebs.retiolum = {
enable = true;
- hosts = ../../Zhosts;
connectTo = [
"gum"
"pigstarter"
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index 2cf9668c8..f15c7902b 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.nix
@@ -32,7 +32,6 @@ with lib;
imports = [ ../../3modules/krebs/retiolum.nix ];
krebs.retiolum = {
enable = true;
- hosts = ../../Zhosts;
connectTo = [
"cd"
"mkdir"
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index c5678a193..0b5b8289b 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -148,7 +148,6 @@ in
imports = [ ../../3modules/krebs/retiolum.nix ];
krebs.retiolum = {
enable = true;
- hosts = ../../Zhosts;
connectTo = [
"gum"
"pigstarter"
diff --git a/3modules/krebs/retiolum.nix b/3modules/krebs/retiolum.nix
index 447592eef..1406f2fc4 100644
--- a/3modules/krebs/retiolum.nix
+++ b/3modules/krebs/retiolum.nix
@@ -57,9 +57,9 @@ let
};
hosts = mkOption {
- default = null;
+ type = with types; either package path;
+ default = ../../Zhosts;
description = ''
- Hosts package or path to use.
If a path is given, then it will be used to generate an ad-hoc package.
'';
};
@@ -127,24 +127,20 @@ let
};
tinc = cfg.tincPackage;
- hostsType = builtins.typeOf cfg.hosts;
- hosts =
- if hostsType == "package" then
- # use package as is
- cfg.hosts
- else if hostsType == "path" then
- # use path to generate a package
- pkgs.stdenv.mkDerivation {
- name = "custom-retiolum-hosts";
- src = cfg.hosts;
- installPhase = ''
- mkdir $out
- find . -name .git -prune -o -type f -print0 | xargs -0 cp --target-directory $out
- '';
- }
- else
- abort "The option `services.retiolum.hosts' must be set to a package or a path"
- ;
+
+ hosts = getAttr (typeOf cfg.hosts) {
+ package = cfg.hosts;
+ path = pkgs.stdenv.mkDerivation {
+ name = "custom-retiolum-hosts";
+ src = cfg.hosts;
+ installPhase = ''
+ mkdir $out
+ find . -name .git -prune -o -type f -print0 \
+ | xargs -0 cp --target-directory $out
+ '';
+ };
+ };
+
iproute = cfg.iproutePackage;
retiolumExtraHosts = import (pkgs.runCommand "retiolum-etc-hosts"
@@ -222,5 +218,5 @@ let
chmod +x $out/tinc-up
'';
-in
-out
+
+in out