diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 7a6d356..e77f1a9 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -454,7 +454,7 @@ bind = CTRL+ALT,2,pass,^(com\.obsproject\.Studio)$ #windowrulev2=opacity 0.9,class:Code #windowrulev2=opacity 0.9,class:Spotify -windowrulev2 = suppress_event maximize,class:^(vesktop)$ +#windowrulev2 = suppress_event maximize,class:^(vesktop)$ #windowrulev2=workspace 10,class:Code # Open Code on secondary monitor diff --git a/servers/ui-mode/configuration.nix b/servers/ui-mode/configuration.nix index 10aa0ce..22f8acb 100644 --- a/servers/ui-mode/configuration.nix +++ b/servers/ui-mode/configuration.nix @@ -228,6 +228,8 @@ in programs.hyprland = { enable = true; + # Installs UWSM's user units required by the Hyprland (uwsm-managed) session. + withUWSM = true; # package = hyprland.packages.${pkgs.system}.hyprland; # portalPackage = hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland.override # { diff --git a/servers/ui-mode/home.nix b/servers/ui-mode/home.nix index 35c2095..0eba2a7 100644 --- a/servers/ui-mode/home.nix +++ b/servers/ui-mode/home.nix @@ -26,7 +26,9 @@ let allowUnfree = true; }; }; - activitywatchPackages = pkgs.qt6Packages.callPackage "${pkgs.path}/pkgs/applications/office/activitywatch" { }; + activitywatchPackages = + pkgs.qt6Packages.callPackage "${pkgs.path}/pkgs/applications/office/activitywatch" + { }; activitywatchFixed = pkgs.activitywatch.override { aw-server-rust = pkgs.aw-server-rust.overrideAttrs (oldAttrs: { env = (oldAttrs.env or { }) // { @@ -52,15 +54,15 @@ let ${codexbar.packages.${pkgs.system}.default}/bin/codexbar "$@" ''; }; - vesktopWrapped = pkgs.symlinkJoin { - name = "vesktop-pipewire"; - paths = [ pkgs.vesktop ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; - postBuild = '' + vesktopWrapped = pkgs.vesktop.overrideAttrs (oldAttrs: { + nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ]; + postFixup = (oldAttrs.postFixup or "") + '' wrapProgram $out/bin/vesktop \ - --add-flags "--enable-features=WebRTCPipeWireCapturer,WaylandWindowDecorations" + --prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath [ pkgs.pipewire ]}" \ + --add-flags "--ozone-platform=wayland --enable-features=WebRTCPipeWireCapturer,WaylandWindowDecorations" ''; - }; + }); + # system = stdenv.hostPlatform.system; in { @@ -431,6 +433,9 @@ in ]; zen-browser = { enable = true; + extraPrefs = '' + user_pref("media.webrtc.camera.allow-pipewire", true); + ''; extraPrefsFiles = [ # (builtins.fetchurl { # url = "https://raw.githubusercontent.com/MrOtherGuy/fx-autoconfig/master/program/config.js";