hosts: update himeji

3 files changed, 5 insertions, 72 deletions

diff --git a/hosts/himeji/default.nix b/hosts/himeji/default.nix
index 0ce7861..e04b07f 100644
--- a/hosts/himeji/default.nix
+++ b/hosts/himeji/default.nix
@@ -2,8 +2,8 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./networking.nix
     ../../modules/networking/vpn/tailscale.nix
+    ../../disks/himeji.nix
   ];
 
   boot.tmp.cleanOnBoot = true;
@@ -26,16 +26,16 @@
 
   virtualisation = {
     containers.enable = true;
-    docker.enable = true;
+    # docker.enable = true;
 
     podman = {
-      enable = false;
+      enable = true;
       dockerCompat = true;
       defaultNetwork.settings.dns_enabled = true;
     };
 
     oci-containers = {
-      backend = "docker";
+      backend = "podman"; # "docker"
 
       containers = {
         september = {
diff --git a/hosts/himeji/hardware-configuration.nix b/hosts/himeji/hardware-configuration.nix
index 3fca545..6d6a7b0 100644
--- a/hosts/himeji/hardware-configuration.nix
+++ b/hosts/himeji/hardware-configuration.nix
@@ -1,7 +1,7 @@
 { modulesPath, lib, ... }:
 {
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
   boot = {
     kernelParams = [ "console=tty" ];
@@ -31,16 +31,4 @@
       ];
     };
   };
-
-  fileSystems = {
-    "/boot" = {
-      device = "/dev/disk/by-uuid/82F0-EC7D";
-      fsType = "vfat";
-    };
-
-    "/" = {
-      device = "/dev/sda1";
-      fsType = "ext4";
-    };
-  };
 }
diff --git a/hosts/himeji/networking.nix b/hosts/himeji/networking.nix
deleted file mode 100644
index 75bbae1..0000000
--- a/hosts/himeji/networking.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib, ... }:
-{
-  networking = {
-    nameservers = [ "8.8.8.8" ];
-
-    defaultGateway = "172.31.1.1";
-    dhcpcd.enable = false;
-    usePredictableInterfaceNames = lib.mkForce false;
-
-    defaultGateway6 = {
-      address = "fe80::1";
-      interface = "eth0";
-    };
-
-    interfaces = {
-      eth0 = {
-        ipv4.addresses = [
-          {
-            address = "95.217.11.228";
-            prefixLength = 32;
-          }
-        ];
-
-        ipv6.addresses = [
-          {
-            address = "2a01:4f9:c010:c768::1";
-            prefixLength = 64;
-          }
-          {
-            address = "fe80::9400:3ff:feb6:f8a8";
-            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:03:b6:f8:a8", NAME="eth0"
-  '';
-}