working on refactor getting parzival setup

README.md

@@ -16,9 +16,11 @@
   - `dariwn` - machine specific configurations for darwin-based hosts
     - Currently not using any darwin hosts
   - `nixos` - machine specific configurations for NixOS-based hosts
-    - `Parzival` - Primary Box - Ryzen 5 7600 - 32GB DDR5 - RX 7800 XT
+    - `Parzival` - Primary Box - Ryzen 5 7600 - RX 7800 XT - 32GB DDR5
     - `Incarceron` - Work issued framework 13 - AMD Ryzen 7 7840U - 32GB DDR5
+    - `Dragneel` - Partner's Box - AMD Ryzen 5 3600 - RTX 2070 - 32GB - DDR4
     - `Bulwark` - Forensics and RE VM
+    - `Infiltrator` - Pentesting VM
 - `home/<user>` - Home-manager configurations, built automatically during host
   rebuilds.
   - `common` - Shared home-manager configurations consumed the user's machine

flake.lock

@@ -56,6 +56,21 @@
         "type": "github"
       }
     },
+    "hardware": {
+      "locked": {
+        "lastModified": 1750431636,
+        "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=",
+        "owner": "nixos",
+        "repo": "nixos-hardware",
+        "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -364,6 +379,7 @@
     "root": {
       "inputs": {
         "disko": "disko",
+        "hardware": "hardware",
         "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
         "nix-secrets": "nix-secrets",

flake.nix

@@ -83,6 +83,8 @@
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    hardware.url = "github:nixos/nixos-hardware";
+
     nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin";
     nix-darwin = {
       url = "github:lnl7/nix-darwin";

hosts/nixos/Incarceron/default.nix

@@ -12,10 +12,19 @@
 }: {
   imports = lib.flatten [
     # Hardware
+    inputs.hardware.nixosModules.framework-13-7040-amd
     ./hardware-configuration.nix # I want to use factor if possible
 
     # Disks
     inputs.disko.nixosModules.disko
+    (lib.custom.relativeToRoot "hosts/common/disks/btrfs-impermanence-disk.nix")
+    {
+      _module.args = {
+        disk = "/dev/nvme0n1";
+        withSwap = true;
+        swapSize = 8;
+      };
+    }
 
     # Misc
 
@@ -27,4 +36,21 @@
       "hosts/common/optional/keyd.nix"
     ])
   ];
+
+  hostSpec = {
+    hostName = "Incarceron";
+    persistFolder = "/persist";
+  };
+
+  networking = {
+    networkmanager.enable = true;
+    enableIPv6 = false;
+  };
+
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi = {
+      canTouchEfiVariables = true;
+    };
+  };
 }