Prepare home desktop computer and remove nixos-hardware

FaustXVI · Jan 4, 2025 · 26e6981 · 26e6981
1 parent 6d064c2
commit 26e6981
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 89 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,7 +4,6 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     unstable-pkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixos-hardware.url = "github:NixOS/nixos-hardware";
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
     disko = {
       url = "github:nix-community/disko";
@@ -25,7 +24,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, sops, nur, home-manager, nixos-hardware, disko,  ... }@inputs:
+  outputs = { self, nixpkgs, sops, nur, home-manager, disko,  ... }@inputs:
     let
       system = "x86_64-linux";
       targets = [

diff --git a/machines/asus.nix b/machines/asus.nix
diff --git a/machines/desktop-home.nix b/machines/desktop-home.nix
@@ -1,20 +1,14 @@
 { config, pkgs, inputs, ... }:
 
 let
-  nixos-hardware = inputs.nixos-hardware;
   LG = "HDMI-0";
   Samsung = "DP-3";
+  device = "/dev/todo";
 in
 {
   imports =
     [
-      nixos-hardware.nixosModules.common-cpu-amd
-      nixos-hardware.nixosModules.common-cpu-amd-pstate
-      nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
-      nixos-hardware.nixosModules.common-pc
-      nixos-hardware.nixosModules.common-pc-ssd
-      ./desktop-home-hardware.nix
-      ../modules
+      (import ./luks-interactive-login.nix {inherit device;})
     ];
   xadetComputer = {
     type = "desktop";

diff --git a/machines/new.nix.sample b/machines/new.nix.sample
diff --git a/machines/t470s.nix b/machines/t470s.nix