Commiting to save progress, currently broken

flake.lock

@@ -536,6 +536,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1769302137,
+        "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1769461804,
@@ -644,6 +660,7 @@
         "hyprland": "hyprland",
         "nix-citizen": "nix-citizen",
         "nix-darwin": "nix-darwin",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix"

flake.nix

@@ -5,6 +5,8 @@
     # NixPKGS unstable
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    
     # Hyprland
     hyprland.url = "github:hyprwm/Hyprland";
 
@@ -47,6 +49,7 @@
     nixosConfigurations.framework = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs; };
       modules = [
+      	inputs.nixos-hardware.nixosModules.framework-16-7040-amd
         ./hosts/framework/configuration.nix
         inputs.home-manager.nixosModules.default
         inputs.sops-nix.nixosModules.sops

hosts/common/home.nix

@@ -1,12 +1,15 @@
 { config, pkgs, inputs, ... }:
 
+let 
+  modules = import ../../modules;
+in
 {
 
   imports = [
     inputs.spicetify-nix.homeManagerModules.spicetify
-    ../../modules/home-manager/spicetify.nix
+    modules.hm.spicetify
     #../../modules/home-manager/zed.nix
-    ../../modules/home-manager/shell.nix
+    modules.hm.shell
   ];
 
 

hosts/framework/home.nix

@@ -6,7 +6,7 @@ in
 {
   imports = [
     ../common/home.nix
-    modules.hm.hyprland.nix
+    modules.hm.hyprland
   ];
 
   home = {

hosts/laptop/home.nix

@@ -7,8 +7,8 @@ in
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   imports = [
-    ../common/home.nix
+    modules.common.home
-    ../../modules/home-manager/hyprland.nix
+    modules.hm.hyprland
   ];
   # This value determines the Home Manager release that your configuration is
   # compatible with. This helps avoid breakage when a new Home Manager release

hosts/light/modules.nix

@@ -1,7 +1,12 @@
+{pkgs, ...}:
+
+let
+  modules = import ../../modules;
+in
 {
   imports = [
-    ./hardware-configuration.nix
+    #./hardware-configuration.nix
-    ../common/modules.nix
+    modules.common.module
-    ../../modules/nixos/xfce.nix # Desktop Enviroment 
+    modules.nixos.xfce # Desktop Enviroment 
   ];
 }

hosts/nixos/home.nix

@@ -7,8 +7,8 @@ in
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   imports = [
-    ../common/home.nix
+    modules.common.home
-    modules.hm.hyprland.nix
+    modules.hm.hyprland
   ];
   # This value determines the Home Manager release that your configuration is
   # compatible with. This helps avoid breakage when a new Home Manager release

hosts/nixos/modules.nix

@@ -1,12 +1,14 @@
 { pkgs, inputs, ... }:
-
+let
+  modules = import ../../modules;
+in
 {
   # This file is used to import all modules required by this setup.
   imports =
     [
       inputs.sops-nix.nixosModules.sops
-      ../common/modules.nix
+      modules.common.module
-      ../../modules/nixos/secrets.nix # Sops
+      modules.nixos.secrets # Sops
 #     ../../modules/nixos/wireless.nix # For the wifi
       ../../modules/nixos/gaming/nvidia.nix # Nvidia (Drivers and Settings)
       ../../modules/nixos/gaming/starCitizen.nix

modules/home-manager/Hyprland/scripts.nix

@@ -2,7 +2,7 @@
 
 pkgs.writeShellApplication {
   name = "VolumeManager";
-  runtinmeInputs = [
+  runtimeInputs = [
     pkgs.wireplumber
   ];