diff options
author | makefu <github@syntax-fehler.de> | 2023-06-21 22:45:58 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2023-06-21 22:45:58 +0200 |
commit | 616de8e6096caedaab3d6860360017b7d6e804e4 (patch) | |
tree | a5ecba830de70fc5c7c346ac44400e6013788230 /1systems/x | |
parent | 53477675c8cf08de510ac4f0c0249cfe0a05c233 (diff) |
ma x13: move out amdgpu
Diffstat (limited to '1systems/x')
-rw-r--r-- | 1systems/x/x13/default.nix | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/1systems/x/x13/default.nix b/1systems/x/x13/default.nix index 32d15df1a..bd812c341 100644 --- a/1systems/x/x13/default.nix +++ b/1systems/x/x13/default.nix @@ -3,43 +3,22 @@ { imports = [ ./input.nix - ./disk.nix + + ((import ../../../2configs/fs/disko/single-disk-encrypted-zfs.nix ) { disks = ["/dev/nvme0n1" ]; hostId = "f8b8e0a3"; }) ./battery.nix - - (self + "/2configs/hw/bluetooth.nix") - (self + "/2configs/hw/tpm.nix") - (self + "/2configs/hw/ssd.nix") - # (self + "/2configs/hw/xmm7360.nix") - + ./amdgpu.nix + ../../../2configs/hw/bluetooth.nix + ../../../2configs/hw/tpm.nix + ../../../2configs/hw/ssd.nix + # ../../../2configs/hw/xmm7360.nix nixos-hardware.nixosModules.lenovo-thinkpad-l14-amd - ]; - boot.zfs.requestEncryptionCredentials = true; - networking.hostId = "f8b8e0a2"; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - # services.xserver.enable = lib.mkForce false; - - services.xserver.videoDrivers = [ "amdgpu" ]; - boot.initrd.kernelModules = [ "amdgpu" ]; - 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; - hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; - # is required for amd graphics support ( xorg wont boot otherwise ) - #boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = lib.mkForce pkgs.linuxPackages; services.fwupd.enable = true; - programs.light.enable = true; - users.groups.video = {}; - users.groups.render = {}; - users.users.makefu.extraGroups = [ "video" "render" ]; - boot.extraModprobeConfig = '' options thinkpad_acpi fan_control=1 ''; |