flake.lock

@@ -90,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1707317562,
+        "lastModified": 1707178626,
-        "narHash": "sha256-0wj5AS8RLVr+S/QWWxCsMvmVjmXUWGfR9kPaZimJEss=",
+        "narHash": "sha256-dWjRyJ6bN7Ku9MmE1xsnCB8jOtFoGiK+HjS/EgI149A=",
         "owner": "wobcom",
         "repo": "fernglas",
-        "rev": "25020466957dbe0e193f7857d827020f5c1aa996",
+        "rev": "70146ddd80a4c8ebd0c2f522f7bd556bd5b2f1b0",
         "type": "github"
       },
       "original": {
@@ -127,11 +127,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1694529238,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {

flake.nix

@@ -72,12 +72,7 @@
       porter = { name = "porter"; };
       storage-2 = { name = "storage-2"; };
       web-2 = { name = "web-2"; };
-      zinc = {
+      zinc = { name = "zinc"; };
-        name = "zinc";
-        modules = [
-          nixos-hardware.nixosModules.common-cpu-intel
-        ];
-      };
       # nixfiles-auto-install: add new host above
       _iso = { name = "_iso"; };
     };

hosts/carbon/configuration.nix

@@ -264,7 +264,7 @@
     ip46tables -A forward-filter -o enp1s0.202 -j DROP
   '';
   clerie.firewall.extraForwardMangleCommands = ''
-    ip46tables -t mangle -A forward-mangle -p tcp -m tcp --tcp-flags SYN,RST SYN -j TCPMSS --set-mss 1416
+    ip46tables -t mangle -A forward-mangle -p tcp -m tcp --tcp-flags SYN,RST SYN -j TCPMSS --set-mss 1452
   '';
 
   services.pppd = {
@@ -280,7 +280,7 @@
         noipdefault
         lcp-echo-interval 20
         lcp-echo-failure 3
-        mtu 1456
+        mtu 1492
         hide-password
         defaultroute
         +ipv6

hosts/zinc/configuration.nix

@@ -8,7 +8,6 @@
       ../../configuration/desktop
 
       ./initrd.nix
-      ./programs.nix
     ];
 
   # Use the systemd-boot EFI boot loader.

hosts/zinc/initrd.nix

@@ -1,31 +1,6 @@
-{ config, pkgs, lib, ... }:
+{ config, ... }:
 
-with lib;
+{
-
-let
-
-  configure_network = pkgs.writeScriptBin "configure-network" ''
-    ifdisplay=""
-    while true; do
-      ifdisplay_new=$(ipconfig -t 10 all)
-      ipconfig_status=$?
-
-      # Only show network config if something changes
-      if [[ "$ifdisplay" != "$ifdisplay_new" ]]; then
-        ifdisplay=$ifdisplay_new
-        echo
-        echo "$ifdisplay"
-        echo
-      fi
-
-      # Wait a little before checking again
-      if [[ $ipconfig_status == 0 ]]; then
-        sleep 5
-      fi
-    done
-  '';
-
-in {
 
   boot.initrd.network.enable = true;
   boot.initrd.network.ssh = {
@@ -37,30 +12,11 @@ in {
       "/var/src/secrets/initrd/ssh_host_ed25519_key"
     ];
   };
-
-  boot.initrd.extraFiles."/root/.ash_history".source = pkgs.writeText ".ash_history" ''
-    cryptsetup-askpass
-  '';
-
   boot.initrd.kernelModules = [
     "igc" # integrated rj45 network interface
     "cdc_ether" # external 5G modem via usb
   ];
-
+  boot.kernelParams = [ "ip=dhcp" ];
-  boot.initrd.extraUtilsCommands = ''
-    copy_bin_and_libs ${configure_network}/bin/configure-network
-  '';
-
-  boot.initrd.network.postCommands = mkBefore ''
-    configure-network &
-  '';
-
-  boot.initrd.postMountCommands = mkBefore ''
-    pkill -x configure-network
-
-    # Override the previously set interfaces with the ones that really exist
-    ifaces=$(ip -o link show | grep "link/ether" | cut -d: -f2 | xargs -n 1)
-  '';
 
   boot.initrd.network.wireguard = {
     enable = true;

hosts/zinc/programs.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-{
-
-  users.users.clerie.packages = with pkgs; [
-    firefox
-
-    blender
-    cura
-  ];
-
-}

modules/wireguard-initrd/default.nix

@@ -41,7 +41,6 @@ in
 
     boot.initrd.network.postCommands = ''
       ip link add dev "wg-initrd" type wireguard
-      ip link set "wg-initrd" mtu 1280
 
       ${concatMapStringsSep "\n" (ip: ''
         ip address add "${ip}" dev "wg-initrd"