x: update to follow upstream
This commit is contained in:
parent
21ae2e1752
commit
5dc7bfc64d
machines/x
|
@ -22,7 +22,7 @@
|
|||
../../2configs/hw/switch.nix
|
||||
# ../../2configs/hw/rad1o.nix
|
||||
../../2configs/hw/cc2531.nix
|
||||
../../2configs/hw/droidcam.nix
|
||||
# ../../2configs/hw/droidcam.nix
|
||||
../../2configs/hw/smartcard.nix
|
||||
../../2configs/hw/upower.nix
|
||||
#../../2configs/hw/ps4-compat.nix
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
{
|
||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||
#boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
hardware.opengl.driSupport = true;
|
||||
#hardware.opengl.driSupport = true;
|
||||
hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocm-opencl-icd pkgs.rocm-opencl-runtime ];
|
||||
# For 32 bit applications
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ pkgs, lib, nixos-hardware, self, ... }:
|
||||
{ pkgs, config, lib, nixos-hardware, self, ... }:
|
||||
# new zfs deployment
|
||||
{
|
||||
imports = [
|
||||
./input.nix
|
||||
|
||||
((import ../../../2configs/fs/disko/single-disk-encrypted-zfs.nix ) { disks ="/dev/nvme0n1"; hostId = "f8b8e0a3"; })
|
||||
((import ../../../2configs/fs/disko/single-disk-encrypted-zfs.nix ) { disks ="/dev/nvme0n1"; hostId = "f8b8e0a3"; inherit config; })
|
||||
./battery.nix
|
||||
./amdgpu.nix
|
||||
../../../2configs/hw/bluetooth.nix
|
||||
|
@ -26,7 +26,7 @@
|
|||
];
|
||||
|
||||
|
||||
boot.kernelPackages = lib.mkForce pkgs.linuxPackages;
|
||||
# boot.kernelPackages = lib.mkForce pkgs.linuxPackagesLatest;
|
||||
|
||||
services.fwupd.enable = true;
|
||||
programs.light.enable = true;
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
# xinput disable 'ETPS/2 Elantech Touchpad'
|
||||
#'';
|
||||
|
||||
services.xserver.libinput.enable = true;
|
||||
services.libinput.enable = true;
|
||||
boot.kernelParams = [
|
||||
#"psmouse.proto=imps"
|
||||
#"psmouse.proto=bare"
|
||||
|
|
Loading…
Reference in a new issue