sarien: move to nixos-hardware
Signed-off-by: unexplrd <unexplrd@linerds.us>
This commit is contained in:
@ -39,7 +39,6 @@
|
||||
];
|
||||
initrd = {
|
||||
availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
|
||||
kernelModules = ["i915"];
|
||||
systemd.enable = true; # needed for auto-unlocking with TPM
|
||||
};
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
@ -53,9 +52,4 @@
|
||||
};
|
||||
plymouth.enable = true;
|
||||
};
|
||||
console = {
|
||||
earlySetup = true;
|
||||
packages = [pkgs.terminus_font];
|
||||
font = "${pkgs.terminus_font}/share/consolefonts/ter-c18n.psf.gz";
|
||||
};
|
||||
}
|
||||
|
@ -8,11 +8,10 @@
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
common-cpu-amd-pstate
|
||||
common-gpu-intel
|
||||
common-hidpi
|
||||
common-pc-ssd
|
||||
];
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
hardware.intelgpu.vaapiDriver = "intel-media-driver";
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware = {
|
||||
enableRedistributableFirmware = true;
|
||||
intelgpu.vaapiDriver = "intel-media-driver";
|
||||
};
|
||||
}
|
||||
|
@ -11,11 +11,6 @@
|
||||
# kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelPackages = pkgs.linuxPackages_cachyos;
|
||||
kernelModules = ["kvm-intel"];
|
||||
kernelParams = [
|
||||
"i915.enable_guc=2"
|
||||
"i915.enable_fbc=1"
|
||||
"i915.enable_psr=2"
|
||||
];
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
loader.systemd-boot = {
|
||||
enable = true;
|
||||
|
@ -1,56 +1,52 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
imports = with inputs.nixos-hardware.nixosModules; [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
common-cpu-intel
|
||||
common-gpu-intel-kaby-lake
|
||||
common-hidpi
|
||||
common-pc-laptop-ssd
|
||||
];
|
||||
services.logind = {
|
||||
lidSwitch = "ignore";
|
||||
powerKey = "suspend";
|
||||
};
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver
|
||||
vaapiIntel
|
||||
vpl-gpu-rt
|
||||
];
|
||||
};
|
||||
services = {
|
||||
logind = {
|
||||
lidSwitch = "ignore";
|
||||
powerKey = "suspend";
|
||||
};
|
||||
|
||||
services.udev.extraHwdb = ''
|
||||
evdev:input:b0011v0001p0001eAB83*
|
||||
KEYBOARD_KEY_d5=sysrq
|
||||
KEYBOARD_KEY_d4=leftmeta
|
||||
KEYBOARD_KEY_95=brightnessdown
|
||||
KEYBOARD_KEY_91=brightnessup
|
||||
'';
|
||||
udev.extraHwdb = ''
|
||||
evdev:input:b0011v0001p0001eAB83*
|
||||
KEYBOARD_KEY_d5=sysrq
|
||||
KEYBOARD_KEY_d4=leftmeta
|
||||
KEYBOARD_KEY_95=brightnessdown
|
||||
KEYBOARD_KEY_91=brightnessup
|
||||
'';
|
||||
|
||||
services.keyd = {
|
||||
enable = true;
|
||||
keyboards = {
|
||||
default = {
|
||||
ids = ["0001:0001"];
|
||||
settings = {
|
||||
main = {
|
||||
camera = "brightnessdown";
|
||||
prog1 = "brightnessup";
|
||||
# home row mods
|
||||
a = "lettermod(alt, a, 200, 150)";
|
||||
s = "lettermod(meta, s, 200, 150)";
|
||||
d = "lettermod(control, d, 200, 150)";
|
||||
f = "lettermod(shift, f, 200, 150)";
|
||||
j = "lettermod(shift, j, 200, 150)";
|
||||
k = "lettermod(control, k, 200, 150)";
|
||||
l = "lettermod(meta, l, 200, 150)";
|
||||
";" = "lettermod(alt, ;, 200, 150)";
|
||||
keyd = {
|
||||
enable = true;
|
||||
keyboards = {
|
||||
default = {
|
||||
ids = ["0001:0001"];
|
||||
settings = {
|
||||
main = {
|
||||
camera = "brightnessdown";
|
||||
prog1 = "brightnessup";
|
||||
# home row mods
|
||||
a = "lettermod(alt, a, 200, 150)";
|
||||
s = "lettermod(meta, s, 200, 150)";
|
||||
d = "lettermod(control, d, 200, 150)";
|
||||
f = "lettermod(shift, f, 200, 150)";
|
||||
j = "lettermod(shift, j, 200, 150)";
|
||||
k = "lettermod(control, k, 200, 150)";
|
||||
l = "lettermod(meta, l, 200, 150)";
|
||||
";" = "lettermod(alt, ;, 200, 150)";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
Reference in New Issue
Block a user