flake.lock

@@ -37,27 +37,6 @@
         "type": "github"
       }
     },
-    "disko": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1690751248,
-        "narHash": "sha256-al5+aqPKL2VtCnuMccafyl4hQqZn+xIaG7vLuhGWfvE=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "67c4508ce9a778f429a5af3571f49733fd3e8a05",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "make-disk-image",
-        "repo": "disko",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -305,7 +284,6 @@
     },
     "root": {
       "inputs": {
-        "disko": "disko",
         "home-manager": "home-manager",
         "hy3": "hy3",
         "hyprland": [

hosts/Zephyrus/hardware-configuration.nix

@@ -4,6 +4,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {
@@ -12,22 +13,10 @@
     ./disko-config.nix
   ];
 
-  boot = {
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid" "sdhci_pci"];
-    kernelModules = ["kvm-amd"];
+  boot.initrd.kernelModules = [];
-    extraModulePackages = [];
+  boot.kernelModules = ["kvm-amd"];
-    initrd = {
+  boot.extraModulePackages = [];
-      availableKernelModules = ["nvme" "xhci_pci" "usbhid" "sdhci_pci"];
-      kernelModules = [];
-    };
-    loader = {
-      efi.canTouchEfiVariables = true;
-      grub = {
-        enable = true;
-        device = "nodev";
-        efiSupport = true;
-      };
-    };
-  };
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's