diff options
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | nixos/configurations/binky.nix | 8 | ||||
| -rw-r--r-- | nixos/configurations/zd-mox.nix | 20 | ||||
| -rw-r--r-- | nixos/modules/hosts.nix | 2 |
4 files changed, 25 insertions, 17 deletions
@@ -428,11 +428,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1755529547, - "narHash": "sha256-p8/c1Vf3jpz/un9vSMhYg5OZ9JKclAiUL5tqNoURBks=", + "lastModified": 1764584903, + "narHash": "sha256-IJXb/5NojT8DpBHEHzX6ixAFCP0haJI6WHDrKcvyMEQ=", "owner": "cynerd", "repo": "nixturris", - "rev": "7323f9aa5c20824861e137b90d5ba10729224ae5", + "rev": "d3b008494e50ac2914525cab1fe9a34fd26d432c", "type": "gitlab" }, "original": { @@ -768,11 +768,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1764110872, - "narHash": "sha256-uZhVLzNVXEEztyG5okuH8DVbWYVPDGSiAapRmerueZY=", + "lastModified": 1764705427, + "narHash": "sha256-SSSYQQ74CsW1NXd0rYZx/YkfmaWXTiPa3GFGrXadsPE=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "f6919d00dfd15faec276d6a0ac95668b2c1e3a28", + "rev": "c998f1eec79ce2ce082278ffbd6c58575e95e2c9", "type": "github" }, "original": { diff --git a/nixos/configurations/binky.nix b/nixos/configurations/binky.nix index 6d8e5c3..dba1114 100644 --- a/nixos/configurations/binky.nix +++ b/nixos/configurations/binky.nix @@ -1,10 +1,4 @@ -{ - lib, - pkgs, - ... -}: let - inherit (lib) mkDefault; -in { +{pkgs, ...}: { system.stateVersion = "24.05"; nixpkgs.hostPlatform.system = "x86_64-linux"; deploy = { diff --git a/nixos/configurations/zd-mox.nix b/nixos/configurations/zd-mox.nix index 3796af0..bba9010 100644 --- a/nixos/configurations/zd-mox.nix +++ b/nixos/configurations/zd-mox.nix @@ -1,4 +1,8 @@ -{config, ...}: let +{ + config, + pkgs, + ... +}: let hosts = config.cynerd.hosts.zd; in { system.stateVersion = "25.05"; @@ -110,9 +114,12 @@ in { # user and password added in secrets ''; }; - systemd.services."pppd-wan" = { - after = ["sys-subsystem-net-devices-end0.848.device"]; - partOf = ["systemd-networkd.service"]; + systemd.services = { + "pppd-wan" = { + requires = ["sys-subsystem-net-devices-end0.848.device"]; + partOf = ["systemd-networkd.service"]; + }; + "systemd-networkd".environment.SYSTEMD_LOG_LEVEL = "debug"; }; # TODO limit NSS clamping to just pppoe-wan networking.firewall.extraForwardRules = '' @@ -140,4 +147,9 @@ in { certs."zd.cynerd.cz" = {}; }; networking.firewall.allowedTCPPorts = [80 443]; + + environment.systemPackages = with pkgs; [ + nmap + tcpdump + ]; } diff --git a/nixos/modules/hosts.nix b/nixos/modules/hosts.nix index bd5a5ab..81bd844 100644 --- a/nixos/modules/hosts.nix +++ b/nixos/modules/hosts.nix @@ -32,6 +32,8 @@ in { # Network "mox" = "10.8.0.1"; "one0" = "10.8.0.2"; + "camera1" = "10.8.0.21"; + "camera2" = "10.8.0.22"; # Local "ridcully" = "10.8.0.59"; "tc" = "10.8.0.99"; |