refactor: move some unlikely to be shared config into hosts

This commit is contained in:
Youwen Wu 2024-08-07 07:06:41 -07:00
parent 098cbdd9f1
commit f0c424b39a
4 changed files with 31 additions and 35 deletions

View file

@ -48,10 +48,8 @@
system = "x86_64-linux";
modules = [
./hosts/nixos
./modules/nixos/secureboot.nix
./modules/nixos/gaming.nix
./modules/nixos/audio.nix
./modules/nixos/nvidia.nix
./modules/nixos/networking.nix
./modules/common/fonts.nix

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, inputs, pkgs, ... }:
{ config, inputs, pkgs, lib, ... }:
{
imports = [ # Include the results of the hardware scan.
@ -19,6 +19,22 @@
};
};
environment.systemPackages = [
# For debugging and troubleshooting Secure Boot.
pkgs.sbctl
];
# Lanzaboote currently replaces the systemd-boot module.
# This setting is usually set to true in configuration.nix
# generated at installation time. So we force it to false
# for now.
boot.loader.systemd-boot.enable = lib.mkForce false;
boot.lanzaboote = {
enable = true;
pkiBundle = "/etc/secureboot";
};
networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -69,6 +85,20 @@
package = pkgs.kdePackages.sddm;
};
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
powerManagement.finegrained = false;
open = false;
nvidiaSettings = true;
};
hardware.graphics.enable = true;
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
services.xserver.videoDrivers = [ "nvidia" ];
# services.desktopManager.plasma6.enable = true;
# Configure keymap in X11

View file

@ -1,15 +0,0 @@
{ config, ... }: {
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
powerManagement.finegrained = false;
open = false;
nvidiaSettings = true;
};
hardware.graphics.enable = true;
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
services.xserver.videoDrivers = [ "nvidia" ];
}

View file

@ -1,17 +0,0 @@
({ pkgs, lib, ... }: {
environment.systemPackages = [
# For debugging and troubleshooting Secure Boot.
pkgs.sbctl
];
# Lanzaboote currently replaces the systemd-boot module.
# This setting is usually set to true in configuration.nix
# generated at installation time. So we force it to false
# for now.
boot.loader.systemd-boot.enable = lib.mkForce false;
boot.lanzaboote = {
enable = true;
pkiBundle = "/etc/secureboot";
};
})