From 92d976ff0f3eaf58dbd0b4a179583f29abdc9234 Mon Sep 17 00:00:00 2001 From: Andre Date: Sun, 5 May 2024 19:51:37 -0400 Subject: [PATCH] Add VRR in Gnome; try fixing Beeper Wayland usage --- flake.lock | 12 +++++------ flake.nix | 2 +- modules/apps/social.nix | 2 +- modules/ui/audio.nix | 24 ++++++++++----------- modules/users/common/home-manager/gnome.nix | 1 + 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index bfc1ab0..e04bd08 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1714900398, - "narHash": "sha256-H7XYHpjk1G6dkA3AnbYrKtaTFjcCE7ul6nUVlVQxtsA=", + "lastModified": 1714931954, + "narHash": "sha256-QXpLmgmisNK2Zgpnu9DiO9ScrKJuJ4zmiMTNpObVIuk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fdaaf543bad047639ef0b356ea2e6caec2f1215c", + "rev": "3dfe05aa9b5646995ace887931fa60269a039777", "type": "github" }, "original": { @@ -221,11 +221,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714763106, - "narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 37c3db4..5e88028 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ description = "Aires' system Flake"; inputs = { - # Track base packages against Nix unstable + # Track base packages against unstable nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # SecureBoot support diff --git a/modules/apps/social.nix b/modules/apps/social.nix index 4110363..9ef2e1f 100644 --- a/modules/apps/social.nix +++ b/modules/apps/social.nix @@ -15,7 +15,7 @@ with lib; # Install Beeper, but override the InstallPhase so it uses Wayland. # Check Flatpak status here: https://github.com/daegalus/beeper-flatpak-wip/issues/1 (beeper.overrideAttrs (oldAttrs: { - installPhase = '' + postInstall = '' wrapProgram $out/bin/beeper \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=wayland --enable-features=WaylandWindowDecorations}} --no-update" ''; diff --git a/modules/ui/audio.nix b/modules/ui/audio.nix index c8e4bd1..ab712d9 100644 --- a/modules/ui/audio.nix +++ b/modules/ui/audio.nix @@ -27,22 +27,22 @@ with lib; alsa.support32Bit = true; pulse.enable = true; jack.enable = true; + + # Reduce audio latency per https://nixos.wiki/wiki/PipeWire#Low-latency_setup + extraConfig.pipewire = mkIf cfg.enableLowLatency { + "92-low-latency.conf" = { + "context.properties" = { + "default.clock.rate" = 48000; + "default.clock.quantum" = 32; + "default.clock.min-quantum" = 32; + "default.clock.max-quantum" = 32; + }; + }; + }; }; services.flatpak.packages = mkIf config.host.ui.flatpak.enable [ "com.github.wwmm.easyeffects" ]; - - # Reduce audio latency per https://nixos.wiki/wiki/PipeWire#Low-latency_setup - services.pipewire.extraConfig.pipewire = mkIf cfg.enableLowLatency { - "92-low-latency.conf" = { - "context.properties" = { - "default.clock.rate" = 48000; - "default.clock.quantum" = 32; - "default.clock.min-quantum" = 32; - "default.clock.max-quantum" = 32; - }; - }; - }; }; } diff --git a/modules/users/common/home-manager/gnome.nix b/modules/users/common/home-manager/gnome.nix index 78af41d..78e48e2 100644 --- a/modules/users/common/home-manager/gnome.nix +++ b/modules/users/common/home-manager/gnome.nix @@ -6,6 +6,7 @@ workspaces-only-on-primary = false; experimental-features = [ "scale-monitor-framebuffer" # Fractional scaling + "variable-refresh-rate" ]; };