diff --git a/home/christoph/default.nix b/home/christoph/default.nix index 67e45c60..e82d4780 100644 --- a/home/christoph/default.nix +++ b/home/christoph/default.nix @@ -60,7 +60,7 @@ rec { firefox = { enable = true; wayland = true; - vaapi = false; # NOTE: Crashes AMDGPU driver fairly often (don't know why exactly) + vaapi = true; # NOTE: Crashes AMDGPU driver fairly often (don't know why exactly) disableTabBar = true; defaultBookmarks = true; gnomeTheme = true; @@ -303,7 +303,8 @@ rec { tokei # Text file statistics in a project poppler_utils # pdfunite # ffmpeg # Convert video (magic), v4 - ffmpeg_5-full # v5, including ffplay + ffmpeg_5-full # I love ffmpeg (v5, including ffplay) + x265 imagemagick # Convert image (magic) ueberzugpp # Display images in terminal (alacritty) (ripgrep.override {withPCRE2 = true;}) # fast as fuck @@ -360,6 +361,7 @@ rec { httpie # Cool http client # suricata cifs-utils # Mount samba shares + nfs-utils appimage-run @@ -383,6 +385,7 @@ rec { clinfo # OpenCL info vulkan-tools # vulkaninfo libva-utils # vainfo + vdpauinfo rocminfo # radeon comptute platform info hwloc lm_sensors diff --git a/home/modules/firefox/default.nix b/home/modules/firefox/default.nix index 1e594ec8..37498175 100644 --- a/home/modules/firefox/default.nix +++ b/home/modules/firefox/default.nix @@ -35,6 +35,7 @@ in { (optionalAttrs cfg.wayland { MOZ_ENABLE_WAYLAND = 1; EGL_PLATFORM = "wayland"; + # XDG_CURRENT_DESKTOP = "Hyprland"; # TODO: Or "sway"? # Already set by hyprland }) (optionalAttrs cfg.vaapi { @@ -153,16 +154,17 @@ in { (optionalAttrs cfg.vaapi { # Firefox wayland hardware video acceleration # https://github.com/elFarto/nvidia-vaapi-driver/#firefox= - "gfx.canvas.accelerated" = true; - "gfx.webrender.enabled" = true; # Should be set on gnome anyway + # TODO: Disable and check if it works by default + # "gfx.canvas.accelerated" = true; # Default value + # "gfx.webrender.enabled" = true; # Does not exist? "gfx.x11-egl.force-enabled" = true; "layers.acceleration.force-enabled" = true; - "media.av1.enabled" = false; + # "media.av1.enabled" = false; "media.ffmpeg.vaapi.enabled" = true; "media.hardware-video-decoding.force-enabled" = true; - "media.rdd-ffmpeg.enabled" = true; - "widget.dmabuf.force-enabled" = true; - "widget.wayland-dmabuf-vaapi.enabled" = true; + # "media.rdd-ffmpeg.enabled" = true; # Default value + # "widget.dmabuf.force-enabled" = true; + # "widget.wayland-dmabuf-vaapi.enabled" = true; # Does not exist? }) (let diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix index 389448d7..1364ed5b 100644 --- a/system/nixinator/hardware-configuration.nix +++ b/system/nixinator/hardware-configuration.nix @@ -42,37 +42,6 @@ fsType = "vfat"; }; - # TODO: Figure out those mount options, it makes many operations (e.g. filepicker) extremely slow as the gvs stuff hangs - # fileSystems."/media/Picture" = { - # device = "//192.168.86.100/Picture"; - # fsType = "cifs"; - # options = let - # # this line prevents hanging on network split - # automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; - - # in ["${automount_opts},credentials=/home/christoph/samba.login" "uid=1000" "gid=1000"]; - # }; - - # fileSystems."/media/Video" = { - # device = "//192.168.86.100/Video"; - # fsType = "cifs"; - # options = let - # # this line prevents hanging on network split - # automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; - - # in ["${automount_opts},credentials=/home/christoph/samba.login" "uid=1000" "gid=1000"]; - # }; - - # fileSystems."/media/Usenet" = { - # device = "//192.168.86.100/Usenet"; - # fsType = "cifs"; - # options = let - # # this line prevents hanging on network split - # automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; - - # in ["${automount_opts},credentials=/home/christoph/samba.login" "uid=1000" "gid=1000"]; - # }; - swapDevices = lib.mkForce [ # { # device = "/var/swap"; @@ -105,28 +74,31 @@ # nvidia.modesetting.enable = true; # Not officially supported by NVidia but needed for wayland # video.hidpi.enable = lib.mkDefault true; # No longer has any effect - opengl.enable = true; + opengl = { + enable = true; - # Vulkan - opengl.driSupport = true; - opengl.driSupport32Bit = true; + # Vulkan + driSupport = true; + driSupport32Bit = true; - # AMD: https://nixos.wiki/wiki/AMD_GPU - opengl.extraPackages = with pkgs; [ - # amdvlk # RADV (mesa) and AMDVLK (amd) can be used simultaneously + # AMD: https://nixos.wiki/wiki/AMD_GPU + extraPackages = with pkgs; [ + # amdvlk # RADV (mesa) and AMDVLK (amd) can be used simultaneously - # OpenCL - # rocm-opencl-icd - # rocm-opencl-runtime - # rocm-runtime # Wiki doesn't mention this, but it exists... + # OpenCL + rocm-opencl-icd + rocm-opencl-runtime + # rocm-runtime # Wiki doesn't mention this, but it exists... - # TODO: Disabled for the moment, because hardware acceleration crashes AMDGPU driver - # VAAPI/VDPAU: https://nixos.wiki/wiki/Accelerated_Video_Playback - # vaapiVdpau # Taken from wiki - # libvdpau-va-gl # Taken from wiki - # libvdpau # NOTE: Don't know if needed/where it belongs... - # libva # NOTE: Don't know if needed/where it belongs... - ]; + # TODO: Disabled for the moment, because hardware acceleration crashes AMDGPU driver + # VAAPI/VDPAU: https://nixos.wiki/wiki/Accelerated_Video_Playback + vaapiVdpau # Taken from wiki + libvdpau-va-gl # Taken from wiki + libvdpau # NOTE: Don't know if needed/where it belongs... + libva # NOTE: Don't know if needed/where it belongs... + ]; + + }; sane.enable = true; # Scanning