Summary Files Commits Branches @commit @diff @stats
diff options
context:
space:
mode:
Commit98440b959f914b5a0be15d419adbb84523787541 (patch)
Author
 Syndamia <kamen@syndamia.com>
2026-01-27 20:35:42 +0200
Committer
 Syndamia <kamen@syndamia.com>
2026-01-27 20:35:58 +0200
Files5b0db07ab83d6e73692190de25bd5c1ecaabb6a2
nix-98440b959f914b5a0be15d419adbb84523787541.tar
nix-98440b959f914b5a0be15d419adbb84523787541.tar.gz
nix-98440b959f914b5a0be15d419adbb84523787541.zip
Parent9f9f8c5287634540997107096ae4eca4f072bcca (diff)
feat(machines): Use sldsImport with home servers
2 files changed, 3 insertions, 31 deletions
-rw-r--r--machines/marduk/configuration.nix1
-rw-r--r--machines/uttu/configuration.nix33
diff --git a/machines/marduk/configuration.nix b/machines/marduk/configuration.nix
index b99840f..11fff30 100644
--- a/machines/marduk/configuration.nix
+++ b/machines/marduk/configuration.nix
@@ -18,6 +18,7 @@
# "original" gTLDs, introduced in 1988, so every device will always
# work with it.
tld = "int";
+ slds = [ "marduk" ];
};
# This improves SSH speed via server.int
diff --git a/machines/uttu/configuration.nix b/machines/uttu/configuration.nix
index e3a1d5c..8cf0160 100644
--- a/machines/uttu/configuration.nix
+++ b/machines/uttu/configuration.nix
@@ -15,6 +15,8 @@
# "original" gTLDs, introduced in 1988, so every device will always
# work with it.
tld = "int";
+ slds = [ "uttu" ];
+ sldsImport = [ ../marduk/configuration.nix ];
};
# This improves SSH speed via server.int
@@ -33,35 +35,4 @@
"myhostname"
"dns"
];
-
- # Redirect all domains, defined by marduk, to marduk
- services.dnsmasq.settings.address = let
- configurationPath = ../marduk/configuration.nix;
-
- importModule = path:
- let
- module = import path;
- in
- if builtins.isFunction module
- then module { config = {}; lib = {}; pkgs = {}; }
- else module;
-
- inherit (importModule configurationPath) srv;
-
- extractAttrs = moduleImport:
- let
- module = importModule moduleImport;
- in
- (module.srv.slds or []) ++
- (builtins.foldl'
- (acc: x:
- acc ++ extractAttrs x)
- []
- (module.imports or []));
-
- slds = extractAttrs configurationPath;
- in
- builtins.map
- (sld: "/${sld}.${srv.tld}/${srv.static.ip}")
- slds;
}