huge
This commit is contained in:
@@ -6,11 +6,6 @@
|
||||
./pipewire.nix
|
||||
];
|
||||
fonts.fontDir.enable = true;
|
||||
security = {
|
||||
pam = {
|
||||
services.greetd.enableGnomeKeyring = config.services.greetd.enable && config.services.gnome.gnome-keyring.enable;
|
||||
};
|
||||
};
|
||||
services.udisks2.enable = true;
|
||||
programs.dconf.enable = true;
|
||||
}
|
||||
|
||||
@@ -5,21 +5,16 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
cfg = config.module.desktop.gnome-keyring;
|
||||
cfg = config.module.gnome-keyring;
|
||||
in {
|
||||
options = {
|
||||
module.desktop.gnome-keyring.enable = mkEnableOption "enable gnome keyring";
|
||||
module.gnome-keyring.enable = mkEnableOption "enable gnome keyring";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
gcr_4
|
||||
libsecret
|
||||
];
|
||||
environment.systemPackages = with pkgs; [gcr_4 libsecret];
|
||||
programs.seahorse.enable = true;
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
xdg.portal.config.common = {
|
||||
"org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
|
||||
};
|
||||
xdg.portal.config.common."org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,6 +31,7 @@ in {
|
||||
};
|
||||
})
|
||||
(mkIf (cfg.displayManager == "greetd") {
|
||||
security.pam.services.greetd.enableGnomeKeyring = config.services.greetd.enable && config.services.gnome.gnome-keyring.enable;
|
||||
programs.regreet.enable = true;
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
|
||||
@@ -5,57 +5,60 @@
|
||||
}: let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
|
||||
cfg = config.sound.pipewire;
|
||||
cfg = config.module.pipewire;
|
||||
in {
|
||||
options = {
|
||||
sound.pipewire.enable = mkEnableOption "enable pipewire";
|
||||
module.pipewire.enable = mkEnableOption "enable pipewire";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
security.rtkit.enable = true;
|
||||
security.rtkit = {
|
||||
enable = true;
|
||||
args = ["--no-canary"];
|
||||
};
|
||||
services.pulseaudio.enable = false;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
pulse.enable = true;
|
||||
|
||||
extraConfig = {
|
||||
pipewire = {
|
||||
"92-low-latency" = {
|
||||
"context.properties" = {
|
||||
"default.clock.rate" = 48000;
|
||||
"default.clock.allowed-rates" = [
|
||||
44100
|
||||
48000
|
||||
88200
|
||||
96000
|
||||
];
|
||||
|
||||
"default.clock.min-quantum" = 512;
|
||||
"default.clock.quantum" = 4096;
|
||||
"default.clock.max-quantum" = 8192;
|
||||
};
|
||||
};
|
||||
|
||||
"93-no-resampling" = {
|
||||
"context.properties" = {
|
||||
"default.clock.rate" = 48000;
|
||||
"default.clock.allowed-rates" = [
|
||||
44100
|
||||
48000
|
||||
96000
|
||||
192000
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
"94-no-upmixing" = {
|
||||
"stream.properties" = {
|
||||
"channelmix.upmix" = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
# extraConfig.pipewire."92-low-latency" = {
|
||||
# "context.properties" = {
|
||||
# "default.clock.rate" = 48000;
|
||||
# "default.clock.quantum" = 32;
|
||||
# "default.clock.min-quantum" = 32;
|
||||
# "default.clock.max-quantum" = 32;
|
||||
# };
|
||||
# };
|
||||
wireplumber.extraConfig."10-alsa-vm" = {
|
||||
"api.alsa.period-size" = 1024 / 2; # seems to fix random crackling
|
||||
};
|
||||
extraConfig.pipewire-pulse."93-auto-connect" = {
|
||||
"pulse.cmd" = [
|
||||
{
|
||||
cmd = "load-module";
|
||||
args = "module-switch-on-connect";
|
||||
}
|
||||
];
|
||||
};
|
||||
# extraConfig.pipewire-pulse."92-low-latency" = {
|
||||
# "context.properties" = [
|
||||
# {
|
||||
# name = "libpipewire-module-protocol-pulse";
|
||||
# args = {};
|
||||
# }
|
||||
# ];
|
||||
# "pulse.properties" = {
|
||||
# "pulse.min.req" = "32/48000";
|
||||
# "pulse.default.req" = "32/48000";
|
||||
# "pulse.max.req" = "32/48000";
|
||||
# "pulse.min.quantum" = "32/48000";
|
||||
# "pulse.max.quantum" = "32/48000";
|
||||
# };
|
||||
# "stream.properties" = {
|
||||
# "node.latency" = "32/48000";
|
||||
# "resample.quality" = 1;
|
||||
# };
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user