diff --git a/flake.lock b/flake.lock
index 7c45579..fdc9e14 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,6 +21,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1731797098,
+        "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1731954261,
@@ -56,6 +72,7 @@
     "root": {
       "inputs": {
         "disko": "disko",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "pkgsUnstable": "pkgsUnstable"
       }
diff --git a/flake.nix b/flake.nix
index 55b3d66..1ab3629 100755
--- a/flake.nix
+++ b/flake.nix
@@ -21,14 +21,14 @@
         inherit system;
         specialArgs = { inherit unstable; };
         modules = [
-          ./system/vincents-hp/configuration.nix
+          ./system/my-hp/configuration.nix
         ];
       };
       old-hp = lib.nixosSystem {
         inherit system;
         specialArgs = { inherit unstable; };
         modules = [
-          ./system/vincents-old-hp/configuration.nix
+          ./system/old-hp/configuration.nix
         ];
       };
       macmini = lib.nixosSystem {
@@ -37,14 +37,14 @@
         modules = [
           # add your model from this list: https://github.com/NixOS/nixos-hardware/blob/master/flake.nix
           nixos-hardware.nixosModules.apple-macmini-4-1
-          ./system/2012macmini/configuration.nix
+          ./system/macmini/configuration.nix
         ];
       };
       moms-hp = lib.nixosSystem {
         inherit system;
         specialArgs = { inherit unstable; };
         modules = [
-          ./system/susans-hp/configuration.nix
+          ./system/moms-hp/configuration.nix
         ];
       };
     };
diff --git a/install.sh b/install.sh
index 3fcbde1..4254790 100755
--- a/install.sh
+++ b/install.sh
@@ -2,7 +2,8 @@ echo "enter config name"
 read HOST
 
 sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode destroy system/$HOST/disk.nix
-sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode format system/$HOST/disk.nix
+sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode disko system/$HOST/disk.nix
+#sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode format system/$HOST/disk.nix
 sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode mount system/$HOST/disk.nix
 
 sudo nixos-install --flake .#$HOST
diff --git a/system/2012macmini/configuration.nix b/system/macmini/configuration.nix
similarity index 100%
rename from system/2012macmini/configuration.nix
rename to system/macmini/configuration.nix
diff --git a/system/2012macmini/disk.nix b/system/macmini/disk.nix
similarity index 100%
rename from system/2012macmini/disk.nix
rename to system/macmini/disk.nix
diff --git a/system/2012macmini/hardware-configuration.nix b/system/macmini/hardware-configuration.nix
similarity index 100%
rename from system/2012macmini/hardware-configuration.nix
rename to system/macmini/hardware-configuration.nix
diff --git a/system/susans-hp/configuration.nix b/system/moms-hp/configuration.nix
similarity index 100%
rename from system/susans-hp/configuration.nix
rename to system/moms-hp/configuration.nix
diff --git a/system/susans-hp/disk.nix b/system/moms-hp/disk.nix
similarity index 100%
rename from system/susans-hp/disk.nix
rename to system/moms-hp/disk.nix
diff --git a/system/susans-hp/hardware-configuration.nix b/system/moms-hp/hardware-configuration.nix
similarity index 100%
rename from system/susans-hp/hardware-configuration.nix
rename to system/moms-hp/hardware-configuration.nix
diff --git a/system/vincents-hp/configuration.nix b/system/my-hp/configuration.nix
similarity index 100%
rename from system/vincents-hp/configuration.nix
rename to system/my-hp/configuration.nix
diff --git a/system/vincents-hp/disk.nix b/system/my-hp/disk.nix
similarity index 100%
rename from system/vincents-hp/disk.nix
rename to system/my-hp/disk.nix
diff --git a/system/vincents-hp/hardware-configuration.nix b/system/my-hp/hardware-configuration.nix
similarity index 100%
rename from system/vincents-hp/hardware-configuration.nix
rename to system/my-hp/hardware-configuration.nix
diff --git a/system/vincents-old-hp/configuration.nix b/system/old-hp/configuration.nix
similarity index 100%
rename from system/vincents-old-hp/configuration.nix
rename to system/old-hp/configuration.nix
diff --git a/system/vincents-old-hp/disk.nix b/system/old-hp/disk.nix
similarity index 100%
rename from system/vincents-old-hp/disk.nix
rename to system/old-hp/disk.nix
diff --git a/system/vincents-old-hp/hardware-configuration.nix b/system/old-hp/hardware-configuration.nix
similarity index 100%
rename from system/vincents-old-hp/hardware-configuration.nix
rename to system/old-hp/hardware-configuration.nix