diff --git a/flake.nix b/flake.nix index 6fe8cad2..e245fc4b 100644 --- a/flake.nix +++ b/flake.nix @@ -25,9 +25,9 @@ theme = "io"; # selcted theme from my themes directory (./themes/) wm = "hyprland"; # Selected window manager or desktop environment; must select one in both ./user/wm/ and ./system/wm/ # window manager type (hyprland or x11) translator - wmType = if ((wm == "hyprland") || (wm == "plasma")) then "wayland" else "x11"; + wmType = if (wm == "hyprland") then "wayland" else "x11"; browser = "qutebrowser"; # Default browser; must select one from ./user/app/browser/ - spawnBrowser = if ((browser == "qutebrowser") && (wm == "hyprland")) then "qutebrowser-hyprprofile" else (if (browser == "qutebrowser") then "qutebrowser --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag num-raster-threads=4" else browser); # Browser spawn command must be specail for qb, since it doesn't gpu accelerate by default (why?) + spawnBrowser = if ((browser == "qutebrowser") && (wm == "hyprland")) then "qutebrowser-hyprprofile" else (if (browser == "qutebrowser") then "qutebrowser --qt-flag ignore-gpu-blacklist --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag enable-accelerated-2d-canvas --qt-flag num-raster-threads=4" else browser); # Browser spawn command must be specail for qb, since it doesn't gpu accelerate by default (why?) defaultRoamDir = "Personal.p"; # Default org roam directory relative to ~/Org term = "alacritty"; # Default terminal command; font = "Intel One Mono"; # Selected font diff --git a/user/app/browser/qute-containers.nix b/user/app/browser/qute-containers.nix index 3bb1fd01..54066808 100644 --- a/user/app/browser/qute-containers.nix +++ b/user/app/browser/qute-containers.nix @@ -16,7 +16,7 @@ in phases = "installPhase"; - postPatch = ''sed -i "s/qutebrowser/qutebrowser --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag num-raster-threads=4/g" container-open''; + postPatch = ''sed -i "s/qutebrowser/qutebrowser --qt-flag ignore-gpu-blacklist --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag enable-accelerated-2d-canvas --qt-flag num-raster-threads=4/g" container-open''; installPhase = '' mkdir -p $out $out/bin diff --git a/user/app/browser/qutebrowser.nix b/user/app/browser/qutebrowser.nix index 0717c417..7e79a8e4 100644 --- a/user/app/browser/qutebrowser.nix +++ b/user/app/browser/qutebrowser.nix @@ -116,7 +116,8 @@ if (os.path.isfile(secretFile)): secretsExists = True config.set('scrolling.smooth',True) -config.set('qt.args',['ignore-gpu-blacklist','enable-gpu-rasterization','enable-native-gpu-memory-buffers','num-raster-threads=4']) +config.set('qt.args',['ignore-gpu-blacklist','enable-gpu-rasterization','enable-accelerated-video-decode','enable-quic','enable-zero-copy','enable-native-gpu-memory-buffers','num-raster-threads=4']) +config.set('qt.workarounds.disable_accelerated_2d_canvas','never') config.load_autoconfig(True) base00 = "#''+config.lib.stylix.colors.base00+''" diff --git a/user/wm/hyprland/hyprprofiles/hyprprofiles.nix b/user/wm/hyprland/hyprprofiles/hyprprofiles.nix index adad903d..e73b4025 100644 --- a/user/wm/hyprland/hyprprofiles/hyprprofiles.nix +++ b/user/wm/hyprland/hyprprofiles/hyprprofiles.nix @@ -32,7 +32,7 @@ in if [[ $profile ]]; then container-open $profile $1; else - qutebrowser --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag num-raster-threads=4 $1; + qutebrowser --qt-flag ignore-gpu-blacklist --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag enable-accelerated-2d-canvas --qt-flag num-raster-threads=4 $1; fi '') (pkgs.makeDesktopItem {