From 45da45023ae2b00f9c3440d94035943551b67cb0 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Fri, 29 Jul 2022 00:36:45 +0200 Subject: [PATCH] Make nat configuration optional and remove home-manager-config --- flake.lock | 8 ++++---- flake.nix | 3 +-- host/bachtel/networking.nix | 1 - qois-infrastructure | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index c529cae..a4528ba 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1656617144, - "narHash": "sha256-1drrElYlRtGEeyk4sedVR+5ORoQK/Cuha8Ulch1dYn8=", + "lastModified": 1659047680, + "narHash": "sha256-sRll2Zw0wfuZc0cJ7wGi5z2+IBYVOQYQSAIHG/qzPjE=", "ref": "master", - "rev": "95f26667be5d2bcbfbc52b31d45b5957fbc7d4fb", - "revCount": 223, + "rev": "d11969a1dbcdb217f51321bb1322e90066ca9213", + "revCount": 224, "type": "git", "url": "file:///etc/nixos/qois-infrastructure" }, diff --git a/flake.nix b/flake.nix index bf3e48d..bf17907 100644 --- a/flake.nix +++ b/flake.nix @@ -63,9 +63,8 @@ modules = [ qois-infrastructure.nixosModule home-manager.nixosModules.home-manager - home-manager-config ./host/${host}/default.nix - ]; + ] ++ (if host == "bachtel" then [ ] else [ home-manager-config ]); }; in pkgsUnstable.lib.genAttrs hosts mapHostnameToAttr; diff --git a/host/bachtel/networking.nix b/host/bachtel/networking.nix index d9bc18e..e511937 100644 --- a/host/bachtel/networking.nix +++ b/host/bachtel/networking.nix @@ -8,7 +8,6 @@ services.qois.router = { enable = true; - wanInterface = "enp1s0"; wirelessInterfaces = [ "wlp5s0" ]; lanInterfaces = [ "enp2s0" "enp3s0" "enp4s0" ]; internalRouterIP = "10.2.1.1"; diff --git a/qois-infrastructure b/qois-infrastructure index 95f2666..d11969a 160000 --- a/qois-infrastructure +++ b/qois-infrastructure @@ -1 +1 @@ -Subproject commit 95f26667be5d2bcbfbc52b31d45b5957fbc7d4fb +Subproject commit d11969a1dbcdb217f51321bb1322e90066ca9213