From d8b97ed1ca6f89427f14619a7a8894098a130b60 Mon Sep 17 00:00:00 2001
From: emily <ek@kyouma.net>
Date: Tue, 27 Feb 2024 16:47:43 +0100
Subject: [PATCH] fixes

---
 config/hosts/base/configuration.nix           |  3 +-
 config/hosts/ryuuko/configuration.nix         |  3 +-
 config/hosts/ryuuko/disko.nix                 |  1 -
 .../hosts/ryuuko/hardware-configuration.nix   | 32 +++++++++----------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/config/hosts/base/configuration.nix b/config/hosts/base/configuration.nix
index 80bfee9..48a3b29 100644
--- a/config/hosts/base/configuration.nix
+++ b/config/hosts/base/configuration.nix
@@ -2,6 +2,7 @@
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     (modulesPath + "/profiles/qemu-guest.nix")
+    ./config/common/users
   ];
 
   boot.loader = {
@@ -11,7 +12,7 @@
 
   services.openssh.enable = true;
 
-  environment.systemPackages = map lib.lowPrio [
+  environment.systemPackages = [
     pkgs.curl
     pkgs.gitMinimal
   ];
diff --git a/config/hosts/ryuuko/configuration.nix b/config/hosts/ryuuko/configuration.nix
index 123f8da..8a0db51 100644
--- a/config/hosts/ryuuko/configuration.nix
+++ b/config/hosts/ryuuko/configuration.nix
@@ -4,6 +4,7 @@
     ../../common
     ../../profiles/graphical
     ./hardware-configuration.nix
+    ./disko.nix
   ];
 
   boot.extraModprobeConfig = ''
@@ -25,7 +26,7 @@
   };
 
   deployment = {
-    targetHost = "192.168.122.159";
+    targetHost = "192.168.122.152";
     targetUser = "emily";
   };
 
diff --git a/config/hosts/ryuuko/disko.nix b/config/hosts/ryuuko/disko.nix
index 160ba73..e2ea5ee 100644
--- a/config/hosts/ryuuko/disko.nix
+++ b/config/hosts/ryuuko/disko.nix
@@ -24,7 +24,6 @@
             name = "nixos";
             type = "luks";
             settings.allowDiscards = true;
-            settings.keyFile = "/tmp/disk.key";
             content = {
               type = "btrfs";
               extraArgs = [ "-f" ];
diff --git a/config/hosts/ryuuko/hardware-configuration.nix b/config/hosts/ryuuko/hardware-configuration.nix
index 94ada37..9be4f9c 100644
--- a/config/hosts/ryuuko/hardware-configuration.nix
+++ b/config/hosts/ryuuko/hardware-configuration.nix
@@ -10,22 +10,22 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
-      fsType = "btrfs";
-      options = [ "subvol=nixos" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/DB0D-757F";
-      fsType = "vfat";
-    };
+#  fileSystems."/" =
+#    { device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
+#      fsType = "btrfs";
+#      options = [ "subvol=nixos" ];
+#    };
+#
+#  fileSystems."/home" =
+#    { device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
+#      fsType = "btrfs";
+#      options = [ "subvol=home" ];
+#    };
+#
+#  fileSystems."/boot" =
+#    { device = "/dev/disk/by-uuid/DB0D-757F";
+#      fsType = "vfat";
+#    };
 
   swapDevices = [ ];