move hardware-modules into systems files

This commit is contained in:
jopejoe1 2023-12-30 23:53:21 +01:00
parent aa515f3498
commit 6b06523162
5 changed files with 28 additions and 20 deletions

View file

@ -77,7 +77,7 @@
}; };
}; };
outputs = inputs@{ nixpkgs, nixos-hardware, ... }: { outputs = inputs@{ nixpkgs, ... }: {
nixosConfigurations = { nixosConfigurations = {
kami = nixpkgs.lib.nixosSystem { kami = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
@ -86,12 +86,6 @@
./systems/kami ./systems/kami
./modules ./modules
./overlays ./overlays
nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-gpu-intel
nixos-hardware.nixosModules.common-gpu-nvidia
nixos-hardware.nixosModules.common-pc
nixos-hardware.nixosModules.common-hidpi
nixos-hardware.nixosModules.common-pc-ssd
]; ];
}; };
yokai = nixpkgs.lib.nixosSystem { yokai = nixpkgs.lib.nixosSystem {
@ -101,7 +95,6 @@
./systems/yokai ./systems/yokai
./modules ./modules
./overlays ./overlays
nixos-hardware.nixosModules.pine64-pinebook-pro
]; ];
}; };
inugami = nixpkgs.lib.nixosSystem { inugami = nixpkgs.lib.nixosSystem {
@ -111,7 +104,6 @@
./systems/inugami ./systems/inugami
./modules ./modules
./overlays ./overlays
nixos-hardware.nixosModules.raspberry-pi-4
]; ];
}; };
tuny = nixpkgs.lib.nixosSystem { tuny = nixpkgs.lib.nixosSystem {
@ -120,10 +112,6 @@
modules = [ modules = [
./systems/tuny ./systems/tuny
./modules ./modules
nixos-hardware.nixosModules.common-cpu-intel
#nixos-hardware.nixosModules.common-gpu-nvidia
nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-hdd
]; ];
}; };
steamdeck = nixpkgs.lib.nixosSystem { steamdeck = nixpkgs.lib.nixosSystem {

View file

@ -1,7 +1,10 @@
{ modulesPath, lib, ... }: { modulesPath, lib, nixos-hardware, ... }:
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [
(modulesPath + "/installer/scan/not-detected.nix")
nixos-hardware.nixosModules.raspberry-pi-4
];
boot = { boot = {
initrd = { availableKernelModules = [ "xhci_pci" ]; }; initrd = { availableKernelModules = [ "xhci_pci" ]; };

View file

@ -1,7 +1,15 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, nixos-hardware, ... }:
{ {
imports = [ ./hardware.nix ]; imports = [
./hardware.nix
nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-gpu-intel
nixos-hardware.nixosModules.common-gpu-nvidia
nixos-hardware.nixosModules.common-pc
nixos-hardware.nixosModules.common-hidpi
nixos-hardware.nixosModules.common-pc-ssd
];
jopejoe1 = { jopejoe1 = {
audio = { audio = {

View file

@ -1,7 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ./hardware-configuration.nix ]; imports = [
./hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-gpu-nvidia
nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-hdd
];
jopejoe1 = { jopejoe1 = {
audio = { enable = true; }; audio = { enable = true; };

View file

@ -1,7 +1,10 @@
{ config, pkgs, ... }: { config, pkgs, nixos-hardware, ... }:
{ {
imports = [ ./hardware.nix ]; imports = [
./hardware.nix
nixos-hardware.nixosModules.pine64-pinebook-pro
];
jopejoe1 = { jopejoe1 = {
audio = { enable = true; }; audio = { enable = true; };