diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix index c82e867..b442e99 100644 --- a/modules/nixos/desktop/hyprland/default.nix +++ b/modules/nixos/desktop/hyprland/default.nix @@ -21,31 +21,10 @@ in }; config = mkIf cfg.enable { - programs.hyprland = { - enable = true; - }; - - xdg.portal = { - enable = true; - - # xdg-desktop-portal 1.17 reworked how portal implementations are loaded, you - # should either set `xdg.portal.config` or `xdg.portal.configPackages` - # to specify which portal backend to use for the requested interface. - - # https://github.com/flatpak/xdg-desktop-portal/blob/1.18.1/doc/portals.conf.rst.in + programs.hyprland.enable = true; - # If you simply want to keep the behaviour in < 1.17, which uses the first - # portal implementation found in lexicographical order, use the following: - - # xdg.portal.config.common.default = "*"; - config.common.default = "*"; - - # See https://github.com/NixOS/nixpkgs/issues/239886 - # Enable xdg-desktop-portal-gtk unless we already have it from Gnome DE - extraPortals = lib.optionals (!config.services.xserver.desktopManager.gnome.enable) [ - pkgs.xdg-desktop-portal-gtk - ]; - }; + # Fixes bugs I guess? https://github.com/NixOS/nixpkgs/issues/160923 + xdg.portal.xdgOpenUsePortal = true; elementary = { services.udiskie = enabled; @@ -53,13 +32,18 @@ in desktop = { hyprland.extraHomeManagerOptions = { enable = true; + package = null; + portalPackage = null; extraConfig = let applyVibrance = '' exec-once = ${lib.getExe pkgs.hyprshade} on vibrance ''; + screenshareDiscord = '' + exec-once = ${lib.getExe pkgs.kdePackages.xwaylandvideobridge} + ''; in - builtins.readFile ./hyprland.conf + applyVibrance; + builtins.readFile ./hyprland.conf + applyVibrance + screenshareDiscord; }; addons = { waybar = enabled // { @@ -81,6 +65,7 @@ in }; home.sessionVariables = { + MOZ_ENABLE_WAYLAND = 1; WLR_NO_HARDWARE_CURSORS = 1; # FIXME: remove when https://github.com/nix-community/home-manager/issues/4486 is fixed NIXOS_OZONE_WL = 1; diff --git a/modules/nixos/desktop/hyprland/hyprland.conf b/modules/nixos/desktop/hyprland/hyprland.conf index b8a0316..15e328b 100644 --- a/modules/nixos/desktop/hyprland/hyprland.conf +++ b/modules/nixos/desktop/hyprland/hyprland.conf @@ -1,5 +1,5 @@ # Prefer high refresh rate -monitor=,highrr,auto,1,bitdepth,10 +monitor=,highrr,auto,1,bitdepth,8 input { # 0 - Cursor movement will not change focus. diff --git a/modules/nixos/programs/firefox/default.nix b/modules/nixos/programs/firefox/default.nix index 950b78a..114ce2f 100644 --- a/modules/nixos/programs/firefox/default.nix +++ b/modules/nixos/programs/firefox/default.nix @@ -19,8 +19,6 @@ cfg = config.elementary.programs.firefox; in mkIf cfg.enable { - elementary.home.sessionVariables.MOZ_ENABLE_WAYLAND = 1; - elementary.home.programs.firefox = { enable = true; package = pkgs.firefox-wayland;