diff --git a/boot.nix b/boot.nix index 9f2e189..df55d45 100644 --- a/boot.nix +++ b/boot.nix @@ -25,14 +25,13 @@ let enableRTGroupSched = { name = "enable-rt-group-sched"; patch = null; - structuredExtraConfig = with lib.kernel; { + extraConfigStructuredConfig = with lib.kernel; { RT_GROUP_SCHED = yes; }; }; enableEnergyModel = { name = "enable-energy-model"; - patch = null; - structuredExtraConfig = with lib.kernel; { + patch = null; extraStructuredConfig = with lib.kernel; { ENERGY_MODEL = yes; }; }; diff --git a/desktop/general.nix b/desktop/general.nix index 7dfd8a6..9372573 100644 --- a/desktop/general.nix +++ b/desktop/general.nix @@ -188,6 +188,20 @@ in { #services.pcscd.enable = mkDefault true; networking.networkmanager.plugins = [ pkgs.networkmanager-openvpn ]; + + nixpkgs.overlays = [(final: prev: { + + # Patch rtkit to enable graceful systemd suspend support + rtkit = myLib.optimizations.addAttrs prev.rtkit { + patches = [ + (final.fetchpatch { + name = "add-graceful-system-suspend-support.patch"; + url = "https://patch-diff.githubusercontent.com/raw/heftig/rtkit/pull/35.patch"; + hash = "sha256-NRVNSa7fzgEDn6ic/Vb36VCj2kv9AC6+Dm2uYNgbEZw="; + }) + ]; + }; + })]; }) ]); } diff --git a/desktop/multimedia.nix b/desktop/multimedia.nix index 4a6cd2a..caa0875 100644 --- a/desktop/multimedia.nix +++ b/desktop/multimedia.nix @@ -28,7 +28,7 @@ in { obs-pipewire-audio-capture ]; }) - #scribus + scribus yt-dlp #jellyfin-media-player # https://github.com/NixOS/nixpkgs/issues/437865 https://github.com/jellyfin/jellyfin-media-player/issues/282 jellyfin-mpv-shim diff --git a/desktop/pipewire/pipewire-noise-filter.conf.nix b/desktop/pipewire/pipewire-noise-filter.conf.nix index 2ea0eed..56b60fa 100644 --- a/desktop/pipewire/pipewire-noise-filter.conf.nix +++ b/desktop/pipewire/pipewire-noise-filter.conf.nix @@ -42,23 +42,18 @@ context.modules = [ plugin = ${rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so label = noise_suppressor_stereo control = { - "VAD Threshold (%)" = ${toString noiseFilterStrength} - "VAD Grace Period (ms)" = 200 - "Retroactive VAD Grace (ms)" = 0 + "VAD Threshold (%)" ${toString noiseFilterStrength} } } ] } capture.props = { - node.name = "capture.rnnoise_source" node.passive = true - audio.rate = 48000 } playback.props = { node.name = "rnnoise_source.output" media.class = Audio/Source node.virtual = false - audio.rate = 48000 } } } diff --git a/general.nix b/general.nix index a213e9d..2f46c9a 100644 --- a/general.nix +++ b/general.nix @@ -4,7 +4,7 @@ let cfg = config.aviallon.general; desktopCfg = config.aviallon.desktop; cmdline = config.aviallon.boot.cmdline; - zswapEnabled = if cmdline ? "zswap.enabled" then cmdline."zswap.enabled" == "Y" else false; + zswapEnabled = if cmdline ? "zswap.enabled" then cmdline."zswap.enabled" == "Y" else false in { imports = [