mandarin,mauville: migrate to nixhw

This commit is contained in:
Aly Raffauf 2024-07-06 18:05:20 -04:00
parent 2c6cfaa41a
commit 18c5686d18
4 changed files with 21 additions and 23 deletions

View file

@ -479,11 +479,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720302727, "lastModified": 1720303103,
"narHash": "sha256-yVm+9LDzFpZNJIS0fuvm4Xjhn4o0gQjTlxWz+NZs4bQ=", "narHash": "sha256-gKShXeXvBkmVBk7gSmOe4dpQTfnPqUxq0NpJflOS89o=",
"owner": "alyraffauf", "owner": "alyraffauf",
"repo": "nixhw", "repo": "nixhw",
"rev": "a63a1fa3443b8ba62a0db5bd2830717ac09d182e", "rev": "3c03f237fbd6d43c536bc0303986023cd06e9405",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -5,6 +5,13 @@
pkgs, pkgs,
... ...
}: { }: {
imports = [
inputs.nixhw.nixosModules.common-amd-cpu
inputs.nixhw.nixosModules.common-amd-gpu
inputs.nixhw.nixosModules.common-bluetooth
inputs.nixhw.nixosModules.common-ssd
];
boot = { boot = {
initrd.availableKernelModules = ["nvme" "sd_mod" "usb_storage" "usbhid" "xhci_pci"]; initrd.availableKernelModules = ["nvme" "sd_mod" "usb_storage" "usbhid" "xhci_pci"];
@ -12,13 +19,4 @@
}; };
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
ar.hardware = {
enable = true;
cpu.amd = true;
gpu.amd = true;
laptop = false;
ssd = true;
sound = true;
};
} }

View file

@ -5,16 +5,14 @@
pkgs, pkgs,
... ...
}: { }: {
imports = [
inputs.nixhw.nixosModules.common-amd-cpu
inputs.nixhw.nixosModules.common-amd-gpu
inputs.nixhw.nixosModules.common-bluetooth
inputs.nixhw.nixosModules.common-ssd
];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"];
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
ar.hardware = {
enable = true;
cpu.amd = true;
gpu.amd = true;
laptop = false;
ssd = true;
sound = true;
};
} }

View file

@ -36,6 +36,8 @@
}; };
}; };
hardware.keyboard.qmk.enable = true;
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
@ -46,14 +48,14 @@
rtkit.enable = true; rtkit.enable = true;
}; };
hardware.keyboard.qmk.enable = true;
services.logind.extraConfig = '' services.logind.extraConfig = ''
# Don't shutdown when power button is short-pressed # Don't shutdown when power button is short-pressed
HandlePowerKey=suspend HandlePowerKey=suspend
HandlePowerKeyLongPress=poweroff HandlePowerKeyLongPress=poweroff
''; '';
sound.enable = true;
system.autoUpgrade = { system.autoUpgrade = {
allowReboot = true; allowReboot = true;
dates = "04:00"; dates = "04:00";