Re-enable AMD GPU

This commit is contained in:
Christopher Mühl 2025-10-13 11:58:06 +02:00
parent 8b4dacfc2b
commit ec24b532b9
No known key found for this signature in database
GPG key ID: E919B0F59E14FD47
11 changed files with 23 additions and 24 deletions

View file

@ -2,6 +2,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
zx # Tool for writing better scripts zx # Tool for writing better scripts
trurl # Parsing and manipulating URLs via CLI trurl # Parsing and manipulating URLs via CLI
dig # DNS
onefetch # Git information tool onefetch # Git information tool
tokei # Like cloc tokei # Like cloc
zeal # Offline documentation browser zeal # Offline documentation browser

View file

@ -87,7 +87,7 @@
(right))) (right)))
(defwindow spraggins (defwindow spraggins
:monitor 0 :monitor 1
:stacking "bg" :stacking "bg"
:windowtype "normal" :windowtype "normal"
:wm-ignore true :wm-ignore true

View file

@ -31,18 +31,18 @@ in {
extraConfig = '' extraConfig = ''
# See https://wiki.hyprland.org/Configuring/Monitors # See https://wiki.hyprland.org/Configuring/Monitors
monitor=desc:Samsung Electric Company C49HG9x HTRJ901269, 3840x1080, 0x0, 1 # Left monitor=desc:Samsung Electric Company C49HG9x HTRJ901269, 3840x1080, 0x0, 1 # Left
monitor=desc:Ancor Communications Inc ASUS VE278 C5LMTF047320, 1920x1080, 3840x-550, 1, transform, 1 # Right monitor=desc:Ancor Communications Inc ASUS VE278 C5LMTF047320, 1920x1080, 3840x-610, 1, transform, 1 # Right
# Any other random monitor # Any other random monitor
monitor=,preferred,auto,1 monitor=,preferred,auto,1
# Gaps for eww # Gaps for eww
monitor=DP-2,addreserved,40,0,0,0 monitor=DP-3,addreserved,40,0,0,0
# monitor=,addreserved,40,0,0,0 # monitor=,addreserved,40,0,0,0
# Single tiled windows in a workspace on my main monitor # Single tiled windows in a workspace on my main monitor
# should be displayed with a padding on both sides # should be displayed with a padding on both sides
workspace=w[t1] m[0],gapsout:15 840 15 840 workspace=w[t1] m[1],gapsout:15 840 15 840
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # See https://wiki.hyprland.org/Configuring/Keywords/ for more
@ -67,8 +67,8 @@ in {
env = HYPRCURSOR_SIZE,28 env = HYPRCURSOR_SIZE,28
# env = WLR_NO_HARDWARE_CURSORS,1 # env = WLR_NO_HARDWARE_CURSORS,1
env = NIXOS_OZONE_WL,1 env = NIXOS_OZONE_WL,1
env = LIBVA_DRIVER_NAME,nvidia env = LIBVA_DRIVER_NAME,radeonsi
env = __GLX_VENDOR_LIBRARY_NAME,nvidia env = __GLX_VENDOR_LIBRARY_NAME,radeonsi
env = NVD_BACKEND,direct env = NVD_BACKEND,direct
debug { debug {

View file

@ -29,6 +29,8 @@
vesktop # Discord Messenger vesktop # Discord Messenger
obs-studio # OBS Studio obs-studio # OBS Studio
wasistlos # WhatsApp client wasistlos # WhatsApp client
signal-desktop # Messaging
zulip # Self-hosted slack alternative
libreoffice # Productivity Suite (like Microsoft Office) libreoffice # Productivity Suite (like Microsoft Office)
onlyoffice-bin # libreoffice alternative onlyoffice-bin # libreoffice alternative
cider # Apple Music player cider # Apple Music player

View file

@ -4,10 +4,16 @@
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
tofi
fuzzel fuzzel
]; ];
programs.tofi = {
enable = true;
settings = {
font = "JetBrains Mono";
};
};
# Clear the tofi cache after each activation so that newly installed packages # Clear the tofi cache after each activation so that newly installed packages
# are immediately available using tofi-drun. # are immediately available using tofi-drun.
home.activation.cleanTofiCache = lib.hm.dag.entryAfter ["writeBoundary"] '' home.activation.cleanTofiCache = lib.hm.dag.entryAfter ["writeBoundary"] ''

View file

@ -47,7 +47,7 @@ in
npx themer -t wallpaper-circuits -o "$WALLPAPER_ROOT" --color-set "$THEME_JSON_PATH" -s 3840x1080 -s 1080x1920 npx themer -t wallpaper-circuits -o "$WALLPAPER_ROOT" --color-set "$THEME_JSON_PATH" -s 3840x1080 -s 1080x1920
find "$WALLPAPER_DIR" -type f -iname '*.svg' | sed 'p;s/\.svg/\.png/' | sed 's/.*/"&"/' | xargs -n2 magick find "$WALLPAPER_DIR" -type f -iname '*.svg' | sed 'p;s/\.svg/\.png/' | sed 's/.*/"&"/' | xargs -n2 magick
hyprctl hyprpaper reload DP-2,"$WALLPAPER_FILE-3840x1080.png" hyprctl hyprpaper reload DP-3,"$WALLPAPER_FILE-3840x1080.png"
hyprctl hyprpaper reload DP-4,"$WALLPAPER_FILE-1080x1920.png" hyprctl hyprpaper reload DP-1,"$WALLPAPER_FILE-1080x1920.png"
''; '';
} }

Binary file not shown.

View file

@ -221,20 +221,11 @@ with lib._elements; {
systemd.services.lactd.wantedBy = ["multi-user.target"]; systemd.services.lactd.wantedBy = ["multi-user.target"];
hardware = { hardware = {
nvidia = { amdgpu = {
modesetting.enable = true; opencl.enable = true;
powerManagement.enable = false; overdrive.enable = true;
powerManagement.finegrained = false;
open = true;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
}; };
# amdgpu = {
# opencl.enable = true;
# overdrive.enable = true;
# };
bluetooth = { bluetooth = {
enable = true; enable = true;
powerOnBoot = true; powerOnBoot = true;

View file

@ -13,9 +13,8 @@
]; ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = ["uinput"]; # nvidia boot.initrd.kernelModules = ["amdgpu" "uinput"];
# boot.initrd.kernelModules = ["amdgpu"]; boot.kernelModules = ["kvm-amd" "uinput"];
# boot.kernelModules = ["kvm-amd" "uinput"];
boot.supportedFilesystems = ["ntfs"]; boot.supportedFilesystems = ["ntfs"];
fileSystems."/mnt/games/ssd" = { fileSystems."/mnt/games/ssd" = {