home/default.nix

@@ -56,7 +56,7 @@
         User notoh
         IdentityFile ~/.ssh/arashi
       Host sora
-        HostName 100.104.42.96
+        HostName 100.87.54.48
         User notoh
         IdentityFile ~/.ssh/sora
       Host daphbot

hosts/ame/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./hardware-configuration.nix
     ./services
-    ./networking.nix
     ../../modules
     ../../modules/fonts.nix
   ];

hosts/ame/home.nix

@@ -3,6 +3,7 @@
     ../../home
     ../../home/wezterm
     ../../home/zathura
+    ../../home/lf
     ../../home/zellij
     ../../home/mako
     ../../home/gtk/catppuccin-red.nix

hosts/ame/networking.nix

@@ -1,17 +0,0 @@
-_: {
-  networking = {
-    networkmanager.enable = true;
-    nameservers = ["192.168.1.221"];
-    firewall = {
-      enable = true;
-    };
-  };
-  environment.etc = {
-    "resolv.conf".text = ''
-      nameserver 192.168.1.221
-      nameserver 192.168.1.153
-    '';
-  };
-
-  services.tailscale.enable = true;
-}

hosts/arashi/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./hardware-configuration.nix
     ./services
-    ./networking.nix
     ../../modules
     ../../modules/prometheus/exporters/postgres.nix
   ];

hosts/arashi/networking.nix

@@ -1,17 +0,0 @@
-_: {
-  networking = {
-    networkmanager.enable = true;
-    nameservers = ["192.168.1.221"];
-    firewall = {
-      enable = true;
-    };
-  };
-  environment.etc = {
-    "resolv.conf".text = ''
-      nameserver 192.168.1.221
-      nameserver 192.168.1.153
-    '';
-  };
-
-  services.tailscale.enable = true;
-}

hosts/deploy.nix

@@ -41,7 +41,7 @@ inputs: {
       magicRollback = true;
     };
     sora = {
-      hostname = "100.104.42.96";
+      hostname = "100.87.54.48";
       profiles.system = {
         user = "root";
         path = activate.nixos inputs.self.nixosConfigurations.sora;

hosts/kariru/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./hardware-configuration.nix
     ./services
-    ./networking.nix
     ../../modules
   ];
 

hosts/kariru/networking.nix

@@ -1,17 +0,0 @@
-_: {
-  networking = {
-    networkmanager.enable = true;
-    nameservers = ["192.168.1.221"];
-    firewall = {
-      enable = true;
-    };
-  };
-  environment.etc = {
-    "resolv.conf".text = ''
-      nameserver 192.168.1.221
-      nameserver 192.168.1.153
-    '';
-  };
-
-  services.tailscale.enable = true;
-}

hosts/sakura/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./hardware-configuration.nix
     ./services
-    ./networking.nix
     ../../modules
   ];
 

hosts/sakura/networking.nix

@@ -1,17 +0,0 @@
-_: {
-  networking = {
-    networkmanager.enable = true;
-    nameservers = ["192.168.1.221"];
-    firewall = {
-      enable = true;
-    };
-  };
-  environment.etc = {
-    "resolv.conf".text = ''
-      nameserver 192.168.1.221
-      nameserver 192.168.1.153
-    '';
-  };
-
-  services.tailscale.enable = true;
-}

hosts/sakura/services/grafana.nix

@@ -52,7 +52,7 @@ _: {
           {
             name = "Prometheus-sora";
             type = "prometheus";
-            url = "http://100.104.42.96:9090";
+            url = "http://100.87.54.48:9090";
             orgId = 1;
           }
         ];

hosts/sora/hardware-configuration.nix

@@ -1,14 +1,6 @@
 {modulesPath, ...}: {
   imports = [(modulesPath + "/profiles/qemu-guest.nix")];
-  boot.loader.grub = {
+  boot.loader.grub.device = "/dev/sda";
-    efiSupport = true;
-    efiInstallAsRemovable = true;
-    device = "nodev";
-  };
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B793-1B2C";
-    fsType = "vfat";
-  };
   boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
   boot.initrd.kernelModules = ["nvme"];
   fileSystems."/" = {

hosts/sora/networking.nix

@@ -1,12 +1,14 @@
 {lib, ...}: {
+  environment.etc = {
+    "resolv.conf".text = "nameserver 1.1.1.1\n";
+  };
   networking = {
     nameservers = [
-      "185.12.64.2"
+      "1.1.1.1"
-      "185.12.64.1"
     ];
     defaultGateway = "172.31.1.1";
     defaultGateway6 = {
-      address = "";
+      address = "fe80::1";
       interface = "eth0";
     };
     dhcpcd.enable = false;
@@ -15,21 +17,36 @@
       eth0 = {
         ipv4.addresses = [
           {
-            address = "5.161.102.107";
+            address = "5.161.181.184";
             prefixLength = 32;
           }
         ];
+        ipv6.addresses = [
+          {
+            address = "2a01:4ff:f0:337a::1";
+            prefixLength = 64;
+          }
+          {
+            address = "fe80::9400:2ff:fe4e:83c1";
+            prefixLength = 64;
+          }
+        ];
         ipv4.routes = [
           {
             address = "172.31.1.1";
             prefixLength = 32;
           }
         ];
+        ipv6.routes = [
+          {
+            address = "fe80::1";
+            prefixLength = 128;
+          }
+        ];
       };
     };
   };
   services.udev.extraRules = ''
-    ATTR{address}=="96:00:02:c2:dc:83", NAME="eth0"
+    ATTR{address}=="96:00:02:4e:83:c1", NAME="eth0"
-
   '';
 }

hosts/sora/services/default.nix

@@ -4,6 +4,5 @@
     ./uptimekuma.nix
     ./gotify.nix
     ./tailscale.nix
-    ./neko.nix
   ];
 }

hosts/tsuki/default.nix

@@ -9,7 +9,6 @@
     inputs.nix-gaming.nixosModules.pipewireLowLatency
     ./hardware-configuration.nix
     ./services
-    ./networking.nix
     ../../home/wayland/hyprland/wayland.nix
     ../../modules
     ../../modules/fonts.nix

hosts/tsuki/networking.nix

@@ -1,17 +0,0 @@
-_: {
-  networking = {
-    networkmanager.enable = true;
-    nameservers = ["192.168.1.221"];
-    firewall = {
-      enable = true;
-    };
-  };
-  environment.etc = {
-    "resolv.conf".text = ''
-      nameserver 192.168.1.221
-      nameserver 192.168.1.153
-    '';
-  };
-
-  services.tailscale.enable = true;
-}

hosts/tsuru/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./hardware-configuration.nix
     ./services
-    ./networking.nix
     ../../modules
   ];
 

hosts/tsuru/networking.nix

@@ -1,17 +0,0 @@
-_: {
-  networking = {
-    networkmanager.enable = true;
-    nameservers = ["192.168.1.221"];
-    firewall = {
-      enable = true;
-    };
-  };
-  environment.etc = {
-    "resolv.conf".text = ''
-      nameserver 192.168.1.221
-      nameserver 192.168.1.153
-    '';
-  };
-
-  services.tailscale.enable = true;
-}

hosts/yuki/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./hardware-configuration.nix
     ./services
-    ./networking.nix
     ../../modules
   ];
 

hosts/yuki/networking.nix

@@ -1,17 +0,0 @@
-_: {
-  networking = {
-    networkmanager.enable = true;
-    nameservers = ["192.168.1.221"];
-    firewall = {
-      enable = true;
-    };
-  };
-  environment.etc = {
-    "resolv.conf".text = ''
-      nameserver 192.168.1.221
-      nameserver 192.168.1.153
-    '';
-  };
-
-  services.tailscale.enable = true;
-}

modules/networking.nix

@@ -1,3 +1,17 @@
 _: {
+  networking = {
+    networkmanager.enable = true;
+    nameservers = ["192.168.1.221"];
+    firewall = {
+      enable = true;
+    };
+  };
+  environment.etc = {
+    "resolv.conf".text = ''
+      nameserver 192.168.1.221
+      nameserver 192.168.1.153
+    '';
+  };
+
   services.tailscale.enable = true;
 }