2 files changed, 59 insertions, 66 deletions
diff --git a/hosts/kansai/configuration.nix b/hosts/kansai/configuration.nix
index b2c40db..2aefa15 100644
--- a/hosts/kansai/configuration.nix
+++ b/hosts/kansai/configuration.nix
@@ -13,7 +13,12 @@
       primaryUser = "ebisu";
       mosh.enable = true;
       nix.extendedSupport = true;
-      mounts.kioku.enable = true;
+
+      mounts.kioku = {
+        enable = true;
+        name = "kioku";
+        device = "/dev/disk/by-uuid/67BF-FE53";
+      };
     };
 
     networking.hostName = "kansai";
diff --git a/hosts/kansai/hardware-configuration.nix b/hosts/kansai/hardware-configuration.nix
index c253822..a4129c7 100644
--- a/hosts/kansai/hardware-configuration.nix
+++ b/hosts/kansai/hardware-configuration.nix
@@ -7,7 +7,6 @@
 }:
 let
   nixosDevice = "/dev/disk/by-uuid/59148bdd-ecb1-49a0-beec-89d0adf909ae";
-  plexMountName = "plex";
 
   commonOptions = [
     "noatime"
@@ -26,80 +25,69 @@ in
     (import "${self}/hosts/shared/hardware-configuration.nix")
   ];
 
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "nvme"
-        "xhci_pci"
-        "ahci"
-        "usb_storage"
-        "usbhid"
-        "sd_mod"
-      ];
+  config = {
+    boot = {
+      initrd = {
+        availableKernelModules = [
+          "nvme"
+          "xhci_pci"
+          "ahci"
+          "usb_storage"
+          "usbhid"
+          "sd_mod"
+        ];
 
-      kernelModules = [ ];
-    };
-
-    kernelModules = [ "kvm-amd" ];
-    extraModulePackages = [ ];
-  };
+        kernelModules = [ ];
+      };
 
-  fileSystems = {
-    "/" = {
-      device = nixosDevice;
-      fsType = "btrfs";
-      options = commonBtrfsOptions ++ [ "subvol=@" ];
+      kernelModules = [ "kvm-amd" ];
+      extraModulePackages = [ ];
     };
 
-    "/home" = {
-      device = nixosDevice;
-      fsType = "btrfs";
-      options = commonBtrfsOptions ++ [ "subvol=@home" ];
-    };
+    fileSystems = {
+      "/" = {
+        device = nixosDevice;
+        fsType = "btrfs";
+        options = commonBtrfsOptions ++ [ "subvol=@" ];
+      };
 
-    "/var" = {
-      device = nixosDevice;
-      fsType = "btrfs";
-      options = commonBtrfsOptions ++ [ "subvol=@var" ];
-    };
+      "/home" = {
+        device = nixosDevice;
+        fsType = "btrfs";
+        options = commonBtrfsOptions ++ [ "subvol=@home" ];
+      };
 
-    "/nix" = {
-      device = nixosDevice;
-      fsType = "btrfs";
-      options = commonBtrfsOptions ++ [ "subvol=@nix" ];
-    };
+      "/var" = {
+        device = nixosDevice;
+        fsType = "btrfs";
+        options = commonBtrfsOptions ++ [ "subvol=@var" ];
+      };
 
-    "/boot" = {
-      device = "/dev/disk/by-uuid/C675-43E1";
-      fsType = "vfat";
+      "/nix" = {
+        device = nixosDevice;
+        fsType = "btrfs";
+        options = commonBtrfsOptions ++ [ "subvol=@nix" ];
+      };
 
-      options = [
-        "fmask=0022"
-        "dmask=0022"
-      ];
-    };
-
-    "/mnt/${plexMountName}" = {
-      device = "/dev/mapper/${plexMountName}";
-      fsType = "exfat";
+      "/boot" = {
+        device = "/dev/disk/by-uuid/C675-43E1";
+        fsType = "vfat";
 
-      options = [
-        "rw"
-        "nofail"
-        "uid=1000"
-        "gid=1000"
-        "dmask=027"
-        "fmask=137"
-      ] ++ commonOptions;
+        options = [
+          "fmask=0022"
+          "dmask=0022"
+        ];
+      };
     };
-  };
 
-  environment.etc.crypttab.text = ''
-    ${plexMountName} /dev/disk/by-partlabel/WD_BLACK ${config.sops.secrets.plex_drive_bitlocker_recovery_key.path} bitlk
-  '';
+    modules.mounts.plex = {
+      enable = true;
+      extraOptions = commonOptions;
+    };
 
-  swapDevices = [ ];
-  networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    swapDevices = [ ];
+    networking.useDHCP = lib.mkDefault true;
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+    hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  };
 }