From 3efc57590276533c08b62723fb59248914a7c1aa Mon Sep 17 00:00:00 2001 From: clerie <git@clerie.de> Date: Wed, 19 Mar 2025 16:48:11 +0100 Subject: [PATCH] hosts/astatine: Remove unused services --- hosts/astatine/configuration.nix | 13 +---- hosts/astatine/ppp.nix | 90 -------------------------------- hosts/astatine/programs.nix | 9 ---- hosts/astatine/users.nix | 10 ---- 4 files changed, 1 insertion(+), 121 deletions(-) delete mode 100644 hosts/astatine/ppp.nix delete mode 100644 hosts/astatine/programs.nix delete mode 100644 hosts/astatine/users.nix diff --git a/hosts/astatine/configuration.nix b/hosts/astatine/configuration.nix index bb19fa7..1540759 100644 --- a/hosts/astatine/configuration.nix +++ b/hosts/astatine/configuration.nix @@ -4,29 +4,18 @@ imports = [ ./hardware-configuration.nix - - ./ppp.nix - ./programs.nix - ./users.nix ]; boot.kernelParams = [ "console=ttyS0,115200n8" ]; - # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; - # boot.loader.grub.efiSupport = true; - # boot.loader.grub.efiInstallAsRemovable = true; - # boot.loader.efi.efiSysMountPoint = "/boot/efi"; - # Define on which hard drive you want to install Grub. - boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only + boot.loader.grub.device = "/dev/sda"; boot.loader.grub.extraConfig = " serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 terminal_input serial terminal_output serial "; - #networking.firewall.enable = false; - services.wg-clerie = { enable = true; ipv6s = [ "2a01:4f8:c0c:15f1::8108/128" ]; diff --git a/hosts/astatine/ppp.nix b/hosts/astatine/ppp.nix deleted file mode 100644 index 84d7b07..0000000 --- a/hosts/astatine/ppp.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ pkgs, ... }: - -{ - # Make space for VLAN header in containing ethernet segment - networking.interfaces."enp1s0".mtu = 1518; - - ## DSL-Uplink - networking.vlans."enp1s0.7" = { - id = 7; - interface = "enp1s0"; - }; - - services.pppd = { - enable = true; - peers.lns-test = { - config = '' - plugin pppoe.so enp1s0.7 - user "criese#regiotest@bsa-vdsl" - ifname ppp-lns-test - persist - maxfail 0 - holdoff 5 - noipdefault - lcp-echo-interval 20 - lcp-echo-failure 3 - hide-password - nodefaultroute - +ipv6 - debug - ''; - }; - }; - - /* - networking.interfaces.lo.useDHCP = true; - networking.interfaces.ppp-lns-test.useDHCP = true; - - networking.dhcpcd = { - enable = true; - extraConfig = '' - interface ppp-lns-test - ipv6rs - ia_pd 0 lo/0 - ''; - };*/ - - environment.etc."ppp/ip-up" = { - text = '' - #! ${pkgs.runtimeShell} -e - - ${pkgs.iproute2}/bin/ip route flush table 20001 || true - ${pkgs.iproute2}/bin/ip route add default dev ppp-lns-test table 20001 - ''; - mode = "555"; - }; - environment.etc."ppp/ip-down" = { - text = '' - #! ${pkgs.runtimeShell} -e - - ${pkgs.iproute2}/bin/ip route flush table 20001 || true - ''; - mode = "555"; - }; - environment.etc."ppp/ipv6-up" = { - text = '' - #! ${pkgs.runtimeShell} -e - - ${pkgs.iproute2}/bin/ip -6 route flush table 20001 || true - ${pkgs.iproute2}/bin/ip -6 route add default dev ppp-lns-test table 20001 - ''; - mode = "555"; - }; - environment.etc."ppp/ipv6-down" = { - text = '' - #! ${pkgs.runtimeShell} -e - - ${pkgs.iproute2}/bin/ip -6 route flush table 20001 || true - ''; - mode = "555"; - }; - - petabyte.policyrouting = { - enable = true; - rules4 = [ - { rule = "from 212.218.16.237/32 lookup 20001"; prio = 19000; } - { rule = "from 212.218.16.237/32 unreachable"; prio = 19001; } - ]; - }; - -} diff --git a/hosts/astatine/programs.nix b/hosts/astatine/programs.nix deleted file mode 100644 index f1e97de..0000000 --- a/hosts/astatine/programs.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: - -{ - - environment.systemPackages = with pkgs; [ - tcpdump # for remote wireshark - ]; - -} diff --git a/hosts/astatine/users.nix b/hosts/astatine/users.nix deleted file mode 100644 index 3ccf4ad..0000000 --- a/hosts/astatine/users.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: - -{ - users.users.criese-nethinks = { - extraGroups = [ - "wheel" - ]; - }; - -}