summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-02-20 00:20:01 +0100
committerlassulus <lassulus@lassul.us>2022-02-20 00:20:01 +0100
commit442319c8949c85b32071fc4e694938b480637770 (patch)
tree2ead30b499aeb18f662345f00cafef1469bd2e01 /makefu/1systems
parent639472d948f5da119c791f5ff80c1c150b1bf98b (diff)
parentee9c23c4bb5737b77df0fed9385e7b30604da0de (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/latte/1blu/network.nix1
-rw-r--r--makefu/1systems/latte/config.nix51
2 files changed, 34 insertions, 18 deletions
diff --git a/makefu/1systems/latte/1blu/network.nix b/makefu/1systems/latte/1blu/network.nix
index 065a69013..0a0eac972 100644
--- a/makefu/1systems/latte/1blu/network.nix
+++ b/makefu/1systems/latte/1blu/network.nix
@@ -27,5 +27,6 @@ in
};
defaultGateway6 = { address = external-gw6; interface = ext-if; };
defaultGateway = external-gw;
+ nameservers = [ "1.1.1.1" ];
};
}
diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix
index 27df80fbf..fdd3df192 100644
--- a/makefu/1systems/latte/config.nix
+++ b/makefu/1systems/latte/config.nix
@@ -10,24 +10,39 @@ let
in {
imports = [
- ./1blu
- <stockholm/makefu>
- #<stockholm/makefu/2configs/home-manager>
- # configure your hw:
- #<stockholm/makefu/2configs/hw/CAC.nix>
- <stockholm/makefu/2configs/tinc/retiolum.nix>
- #<stockholm/makefu/2configs/save-diskspace.nix>
-
- # Security
- <stockholm/makefu/2configs/sshd-totp.nix>
- # <stockholm/makefu/2configs/stats/client.nix>
-
- # Tools
- <stockholm/makefu/2configs/tools/core.nix>
- <stockholm/makefu/2configs/zsh-user.nix>
- # Services
- <stockholm/makefu/2configs/remote-build/slave.nix>
- # <stockholm/makefu/2configs/torrent.nix>
+ ./1blu
+ <stockholm/makefu>
+
+ # common
+ <stockholm/makefu/2configs/nur.nix>
+ <stockholm/makefu/2configs/home-manager>
+ <stockholm/makefu/2configs/home-manager/cli.nix>
+
+ # Security
+ <stockholm/makefu/2configs/sshd-totp.nix>
+
+ # Tools
+ <stockholm/makefu/2configs/tools/core.nix>
+ <stockholm/makefu/2configs/zsh-user.nix>
+
+ # NixOS Build
+ <stockholm/makefu/2configs/remote-build/slave.nix>
+
+ # Storage
+ <stockholm/makefu/2configs/share/hetzner-client.nix>
+
+ # Services:
+ <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
+
+ # Supervision
+ <stockholm/makefu/2configs/nix-community/supervision.nix>
+
+ # Krebs
+ <stockholm/makefu/2configs/tinc/retiolum.nix>
+
+ #<stockholm/makefu/2configs/home-manager>
+ # configure your hw:
+ # <stockholm/makefu/2configs/torrent.nix>
];
krebs = {