xps9360: move hw config to nixos-hardware
parent
17cb322d24
commit
3e4aecccd5
|
@ -2,7 +2,6 @@
|
|||
gogitget = super.callPackage ./gogitget.nix {};
|
||||
shallot = super.callPackage ./shallot.nix {};
|
||||
yori-cc = super.callPackage ./yori-cc.nix {};
|
||||
firmware_qca6174 = super.callPackage ./firmware_qca6174.nix {};
|
||||
gitea =
|
||||
super.gitea.overrideDerivation (o: rec {
|
||||
version = "1.4.1";
|
||||
|
|
|
@ -1,49 +1,28 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./.
|
||||
"${import ./nixos-hardware.nix}/dell/xps/13-9360"
|
||||
./xps9360-hardware-config.nix
|
||||
];
|
||||
hardware.yorick = { cpu = "intel"; gpu = "intel"; laptop = true; };
|
||||
|
||||
hardware.enableRedistributableFirmware = true; # needed?
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelParams = [ "i915.enable_psr=0" ];
|
||||
fileSystems."/".options = ["defaults" "relatime" "discard"];
|
||||
|
||||
boot.initrd.luks.devices."nix-crypt".allowDiscards = true;
|
||||
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
};
|
||||
# intel huc, guc. qca6174 (older firmware)
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.blacklistedKernelModules = ["psmouse"];
|
||||
# hardware is thermal-limited
|
||||
services.thermald.enable = lib.mkDefault true;
|
||||
|
||||
services.xserver.libinput.enable = true;
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/a751e4ea-f1aa-48e1-9cbe-423878e29b62";
|
||||
fsType = "btrfs";
|
||||
options = ["defaults" "relatime" "discard"];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."nix-crypt" = {
|
||||
device = "/dev/disk/by-uuid/320ef81d-283f-4916-ac26-ecfb0f31e549";
|
||||
allowDiscards = true;
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/0E07-7805";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/d9c4c15b-0e9c-47f6-8675-93b1b8de5f9d"; }
|
||||
];
|
||||
|
||||
nix.maxJobs = lib.mkDefault 4;
|
||||
|
||||
# bigger console font
|
||||
i18n.consoleFont = "latarcyrheb-sun32";
|
||||
|
||||
hardware.firmware = lib.mkBefore [ pkgs.firmware_qca6174 ];
|
||||
networking.wireless.enable = true;
|
||||
hardware.bluetooth.enable = true;
|
||||
# gotta go faster
|
||||
networking.dhcpcd.extraConfig = ''
|
||||
noarp
|
||||
'';
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue