This commit is contained in:
2025-12-31 15:03:16 +02:00
parent c93c93a810
commit fa32ae5510
69 changed files with 1093 additions and 659 deletions
-5
View File
@@ -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"];
};
}
+1
View File
@@ -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;
+43 -40
View File
@@ -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;
# };
# };
};
};
}
+1 -1
View File
@@ -17,7 +17,7 @@ in {
};
config = mkIf cfg.enable {
module.desktop.displayManager = "cosmic";
sound.pipewire.enable = true;
module.pipewire.enable = true;
environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
services.desktopManager.cosmic.enable = true;
+3 -3
View File
@@ -4,8 +4,8 @@
./cosmic
./dms
./gnome
./hyprland
./niri
./plasma
# ./hyprland
# ./niri
# ./plasma
];
}
+12 -13
View File
@@ -23,26 +23,25 @@ in {
enable = true;
extraPortals = with pkgs; [xdg-desktop-portal-gnome xdg-desktop-portal-gtk];
config.niri.default = ["gnome" "gtk"];
config.common."org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
};
module.desktop.gnome-keyring.enable = true;
sound.pipewire.enable = true;
module.gnome-keyring.enable = true;
module.pipewire.enable = true;
services.gvfs.enable = true;
programs.niri = {
enable = true;
package = perSystem.niri-flake.niri-unstable;
};
systemd.user.services.niri-flake-polkit.enable = false;
programs.dankMaterialShell = {
enable = true;
greeter = {
programs = {
niri.enable = true;
niri.package = perSystem.niri-flake.niri-unstable;
dankMaterialShell = {
enable = true;
configHome = "/home/user";
compositor.name = "niri";
greeter = {
enable = true;
configHome = "/home/user";
compositor.name = "niri";
};
};
};
};
+1 -1
View File
@@ -14,7 +14,7 @@ in {
config = lib.mkMerge [
(mkIf cfg.enable {
module.desktop.displayManager = "gdm";
sound.pipewire.enable = true;
module.pipewire.enable = true;
services.desktopManager.gnome.enable = true;
environment.gnome.excludePackages = with pkgs; [
orca
+1 -1
View File
@@ -5,7 +5,7 @@
...
}: let
inherit (lib) mkIf mkEnableOption getExe;
cfg = config.desktop.niri;
cfg = config.desktop.jay;
in {
options = {
desktop.niri.enable =
+3 -5
View File
@@ -15,11 +15,9 @@ in {
};
config = lib.mkMerge [
(mkIf cfg.enable {
module.desktop = {
displayManager = "greetd";
gnome-keyring.enable = true;
};
sound.pipewire.enable = true;
module.desktop.displayManager = "greetd";
module.gnome-keyring.enable = true;
module.pipewire.enable = true;
# nixpkgs.overlays = [inputs.niri.overlays.default];