From de79166be8f29d4ffa49661f8161af07fd60ce63 Mon Sep 17 00:00:00 2001
From: Steven <specCon18@gmail.com>
Date: Sat, 25 Mar 2023 20:30:46 -0400
Subject: [PATCH] added framework hardware modules

---
 .modules/base/framework.nix | 8 +++++++-
 flake.nix                   | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.modules/base/framework.nix b/.modules/base/framework.nix
index 3563406..4f0fcdf 100644
--- a/.modules/base/framework.nix
+++ b/.modules/base/framework.nix
@@ -10,6 +10,12 @@
     initrd = {
       availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; 
       kernelModules = [ "dm-snapshot" ];
+      luks.devices = {
+        crypted = {
+          device = "";
+          preLVM = true;
+        };
+      };
     };
     kernelModules = [ "kvm-intel" ];
     kernelParams = [ "acpi_osi=linux" "module_blacklist=hid_sensor_hub" ];
@@ -26,7 +32,7 @@
       };
     };
   };
-  
+
   # 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
   # still possible to use this option, but it's recommended to use it in conjunction
diff --git a/flake.nix b/flake.nix
index 7a01a7b..7ab7b1b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,7 @@
             url = "github:nix-community/home-manager/release-22.11";
             inputs.nixpkgs.follows = "nixpkgs";
         };
+        nixos-hardware.url = "github:NixOS/nixos-hardware/master";
         nixos-generators = {
             url = "github:nix-community/nixos-generators";
             inputs.nixpkgs.follows = "nixpkgs";
@@ -39,6 +40,7 @@
             creatorforge-framework = nixpkgs.lib.nixosSystem {
                 system = "x86_64-linux";
                 modules = [
+                    nixos-hardware.nixosModules.framework-12th-gen-intel
                     disko.nixosModules.disko
                     ./hosts/creatorforge.nix
                     ./.modules/base/proxmox-vm-hardware.nix