Compare commits

...

2 commits

Author SHA1 Message Date
1720db718a
wayland: remove nvidia vars 2024-04-30 20:29:20 -04:00
2f71bd9233
tsuki: switch to amd 2024-04-30 20:29:05 -04:00
4 changed files with 5 additions and 41 deletions

View file

@ -16,17 +16,14 @@
wlr-randr
];
sessionVariables = {
GBM_BACKEND = "nvidia-drm";
__GL_GSYNC_ALLOWED = "0";
__GL_VRR_ALLOWED = "0";
WLR_DRM_NO_ATOMIC = "1";
XDG_SESSION_TYPE = "wayland";
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
_JAVA_AWT_WM_NONREPARENTING = "1";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
GDK_BACKEND = "wayland";
WLR_NO_HARDWARE_CURSORS = "1";
MOZ_ENABLE_WAYLAND = "1";
WLR_BACKEND = "vulkan";
WLR_RENDERER = "vulkan";

View file

@ -11,11 +11,7 @@
monitor = DP-2,2560x1440@144, 0x0, auto
monitor = DP-3,disable
env = LIBVA_DRIVER_NAME,nvidia
env = XDG_SESSION_TYPE,wayland
env = GBM_BACKEND,nvidia-drm
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
env = WLR_NO_HARDWARE_CURSORS,1
exec-once = ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE
exec-once = ${lib.getExe pkgs.greetd.regreet}; hyprctl dispatch exit

View file

@ -35,7 +35,7 @@
};
xserver = {
enable = true;
videoDrivers = ["nvidia"];
videoDrivers = ["amdgpu"];
xkb = {
layout = "us";
variant = "";
@ -63,19 +63,10 @@
hardware = {
pulseaudio.enable = false;
nvidia = {
powerManagement.enable = true;
modesetting.enable = true;
package = config.boot.kernelPackages.nvidiaPackages.stable.overrideAttrs {
src = pkgs.fetchurl {
url = "https://download.nvidia.com/XFree86/Linux-x86_64/535.171.04/NVIDIA-Linux-x86_64-535.171.04.run";
sha256 = "0yj38aljmnr0c533d4hl5xjf9b3xm620fix4cp6qlpf99cxn9wg8";
};
};
};
opengl = {
enable = true;
extraPackages = [pkgs.nvidia-vaapi-driver];
driSupport = true;
driSupport32Bit = true;
};
opentabletdriver = {
enable = true;

View file

@ -10,7 +10,7 @@
];
boot = {
kernelModules = ["v4l2loopback" "kvm-intel"];
kernelModules = ["v4l2loopback" "kvm-amd"];
extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out];
loader = {
systemd-boot = {
@ -29,22 +29,6 @@
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/7d098aab-1968-4605-a9a7-b1627941c1ff";
fsType = "ext4";
};
"/boot/efi" = {
device = "/dev/disk/by-uuid/C356-B67C";
fsType = "vfat";
};
"/hdd" = {
device = "/dev/disk/by-uuid/e2e4c4f3-51df-4020-b557-a7cf684de85b";
fsType = "ext4";
};
"/ssd" = {
device = "/dev/disk/by-uuid/9e5a189d-7435-45d7-aef6-cdee4de2428d";
fsType = "ext4";
};
"/nas/restic" = {
device = "192.168.1.199:/mnt/Sutoreji/nix-restic-data/tsuki";
fsType = "nfs";
@ -59,13 +43,9 @@
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/2f5e2c64-99b8-4fa0-943c-c9dd45c84fdc";}
];
networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}