From e4f1f35b0ece66e264ea4dad68d0138299098d80 Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 15 Dec 2025 21:51:07 +0100 Subject: [PATCH] hosts/carbon: Remove unused modules --- hosts/carbon/configuration.nix | 4 -- hosts/carbon/net-gastnetz.nix | 69 ---------------------- hosts/carbon/net-lte.nix | 11 ---- hosts/carbon/net-voip.nix | 105 --------------------------------- hosts/carbon/scan-to-gpg.nix | 11 ---- 5 files changed, 200 deletions(-) delete mode 100644 hosts/carbon/net-gastnetz.nix delete mode 100644 hosts/carbon/net-lte.nix delete mode 100644 hosts/carbon/net-voip.nix delete mode 100644 hosts/carbon/scan-to-gpg.nix diff --git a/hosts/carbon/configuration.nix b/hosts/carbon/configuration.nix index 8b50085..3dc3fc7 100644 --- a/hosts/carbon/configuration.nix +++ b/hosts/carbon/configuration.nix @@ -9,16 +9,12 @@ ./ds-lite-ncfttb.nix ./mdns.nix ./net-dsl.nix - ./net-gastnetz.nix ./net-heimnetz.nix ./net-iot.nix - ./net-lte.nix ./net-mgmt.nix ./net-printer.nix - ./net-voip.nix ./ntp.nix ./ppp-ncfttb.nix - ./scan-to-gpg.nix ./wg-clerie.nix ]; diff --git a/hosts/carbon/net-gastnetz.nix b/hosts/carbon/net-gastnetz.nix deleted file mode 100644 index 1ddab6c..0000000 --- a/hosts/carbon/net-gastnetz.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ ... }: - -{ - - ## Gastnetz - networking.vlans."enp1s0.202" = { - id = 202; - interface = "enp1s0"; - }; - networking.bridges."net-gastnetz".interfaces = [ - "enp1s0.202" - ]; - networking.interfaces."net-gastnetz".ipv6.addresses = [ - { address = "fd00:3214:9453:4920::1"; prefixLength = 64; } - ]; - networking.interfaces."net-gastnetz".ipv4.addresses = [ - { address = "192.168.32.1"; prefixLength = 24; } - ]; - - services.radvd.config = '' - interface net-gastnetz { - AdvSendAdvert on; - MaxRtrAdvInterval 30; - prefix ::/64 { - AdvValidLifetime 300; - AdvPreferredLifetime 120; - }; - RDNSS 2620:fe::fe 2620:fe::9 {}; # Quad 9 - }; - ''; - - services.kea.dhcp4 = { - settings = { - interfaces-config = { - interfaces = [ "net-gastnetz" ]; - }; - subnet4 = [ - # Gastnetz - { - id = 202; - subnet = "192.168.32.0/24"; - pools = [ - { - pool = "192.168.32.100 - 192.168.32.240"; - } - ]; - option-data = [ - { - name = "routers"; - data = "192.168.32.1"; - } - { - name = "domain-name-servers"; - data = "9.9.9.9,149.112.112.112"; # Quad 9 - } - ]; - } - ]; - }; - }; - - # net-gastnetz can only access internet - clerie.firewall.extraForwardFilterCommands = '' - ip46tables -A forward-filter -i net-gastnetz -o ppp-ncfttb -j ACCEPT - ip46tables -A forward-filter -i net-gastnetz -j DROP - ip46tables -A forward-filter -o net-gastnetz -j DROP - ''; - -} diff --git a/hosts/carbon/net-lte.nix b/hosts/carbon/net-lte.nix deleted file mode 100644 index 3a6f2d0..0000000 --- a/hosts/carbon/net-lte.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: - -{ - - ## LTE-Uplink - networking.vlans."enp1s0.102" = { - id = 102; - interface = "enp1s0"; - }; - -} diff --git a/hosts/carbon/net-voip.nix b/hosts/carbon/net-voip.nix deleted file mode 100644 index 3a816fc..0000000 --- a/hosts/carbon/net-voip.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ ... }: - -{ - - ## VoIP - networking.vlans."enp1s0.204" = { - id = 204; - interface = "enp1s0"; - }; - networking.interfaces."enp1s0.204".ipv4.addresses = [ - { address = "10.152.33.1"; prefixLength = 24; } - ]; - - services.kea.dhcp4 = { - settings = { - interfaces-config = { - interfaces = [ "enp1s0.204" ]; - }; - option-def = [ - { - space = "dhcp4"; - name = "vendor-encapsulated-options"; - code = 43; - type = "empty"; - encapsulate = "sipdect"; - } - { - space = "sipdect"; - name = "ommip1"; - code = 10; - type = "ipv4-address"; - } - { - space = "sipdect"; - name = "ommip2"; - code = 19; - type = "ipv4-address"; - } - { - space = "sipdect"; - name = "syslogip"; - code = 14; - type = "ipv4-address"; - } - { - space = "sipdect"; - name = "syslogport"; - code = 15; - type = "int16"; - } - { - space = "dhcp4"; - name = "magic_str"; - code = 224; - type = "string"; - } - ]; - subnet4 = [ - # VoIP - { - id = 204; - subnet = "10.152.33.0/24"; - pools = [ - { - pool = "10.152.33.10 - 10.152.33.200"; - } - ]; - option-data = [ - { - name = "routers"; - data = "10.152.33.1"; - } - ]; - - reservations = [ - { - hostname = "iridium"; - hw-address = "00:30:42:1B:8C:7C"; - ip-address = "10.152.33.11"; - option-data = [ - { - name = "host-name"; - data = "iridium"; - } - { - name = "vendor-encapsulated-options"; - } - { - space = "sipdect"; - name = "ommip1"; - data = "10.152.33.11"; - } - { - name = "magic_str"; - data = "OpenMobilitySIP-DECT"; - } - ]; - } - ]; - } - ]; - }; - }; - -} diff --git a/hosts/carbon/scan-to-gpg.nix b/hosts/carbon/scan-to-gpg.nix deleted file mode 100644 index 3df8019..0000000 --- a/hosts/carbon/scan-to-gpg.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: - -{ - - services.scan-to-gpg = { - enable = true; - gpgkey = "${pkgs.clerie-keys}/gpg/clerie@clerie.de.asc"; - }; - - users.users."clerie".extraGroups = [ "scan-to-gpg" ]; -}