Skip to content

Commit 46cf3f1

Browse files
committed
wire nixos-hardware existing modules for the ninja/windy hosts
1 parent 0fd286b commit 46cf3f1

5 files changed

Lines changed: 34 additions & 1 deletion

File tree

flake.lock

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
url = "github:izaac/nix-packages";
2121
inputs.nixpkgs.follows = "nixpkgs";
2222
};
23+
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
2324
disko = {
2425
url = "github:nix-community/disko";
2526
inputs.nixpkgs.follows = "nixpkgs";

home/shell/packages.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
lftp
4040

4141
# --- CLOUD & CONTAINERS ---
42+
gh
4243
kubernetes-helm
4344
kubectl
4445
lazydocker

hosts/ninja/configuration.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
pkgs,
33
lib,
4+
inputs,
45
...
56
}: {
67
# --- VIRTUALIZATION VARIANT ---
@@ -35,6 +36,10 @@
3536
../../modules/gaming
3637
../../modules/desktop
3738
../../users/izaac
39+
# nixos-hardware: AMD pstate, NVIDIA (nonprime/desktop), SSD trim
40+
inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
41+
inputs.nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
42+
inputs.nixos-hardware.nixosModules.common-pc-ssd
3843
];
3944

4045
# --- CORE FEATURES ---

hosts/windy/configuration.nix

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
{pkgs, ...}: {
1+
{
2+
pkgs,
3+
inputs,
4+
...
5+
}: {
26
imports = [
37
./hardware.nix
48
./nvidia.nix
@@ -7,6 +11,11 @@
711
../../modules/gaming
812
../../modules/desktop
913
../../users/izaac
14+
# nixos-hardware: Intel CPU, NVIDIA Prime offload, laptop power, SSD trim
15+
inputs.nixos-hardware.nixosModules.common-cpu-intel
16+
inputs.nixos-hardware.nixosModules.common-gpu-nvidia
17+
inputs.nixos-hardware.nixosModules.common-pc-laptop
18+
inputs.nixos-hardware.nixosModules.common-pc-ssd
1019
];
1120

1221
# Custom Feature Flags

0 commit comments

Comments
 (0)