mirror of
https://github.com/alyraffauf/nixcfg.git
synced 2024-11-22 07:53:55 -05:00
sway/hyprland: marry defaults in waylandComp module
This commit is contained in:
parent
7d43115f41
commit
04c22c3d50
|
@ -13,6 +13,7 @@
|
|||
./lightdm
|
||||
./plasma
|
||||
./sway
|
||||
./waylandComp.nix
|
||||
];
|
||||
|
||||
options = {
|
||||
|
|
|
@ -26,6 +26,10 @@
|
|||
};
|
||||
|
||||
config = lib.mkIf config.alyraffauf.desktop.greetd.enable {
|
||||
security.pam.services = {
|
||||
greetd.enableKwallet = lib.mkDefault true;
|
||||
greetd.enableGnomeKeyring = lib.mkDefault true;
|
||||
};
|
||||
services = {
|
||||
greetd = {
|
||||
enable = true;
|
||||
|
|
|
@ -11,21 +11,9 @@
|
|||
};
|
||||
|
||||
config = lib.mkIf config.alyraffauf.desktop.hyprland.enable {
|
||||
services = {
|
||||
dbus.packages = [pkgs.gcr];
|
||||
udev.packages = [pkgs.swayosd];
|
||||
gnome.gnome-keyring.enable = true;
|
||||
blueman.enable = true;
|
||||
};
|
||||
|
||||
security.pam.services = {
|
||||
greetd.enableKwallet = true;
|
||||
greetd.enableGnomeKeyring = true;
|
||||
swaylock = {};
|
||||
};
|
||||
alyraffauf.desktop.waylandComp.enable = true;
|
||||
|
||||
programs = {
|
||||
gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
|
||||
hyprland = {
|
||||
enable = true;
|
||||
package = inputs.nixpkgsUnstable.legacyPackages."${pkgs.system}".hyprland;
|
||||
|
|
|
@ -11,22 +11,12 @@
|
|||
};
|
||||
|
||||
config = lib.mkIf config.alyraffauf.desktop.sway.enable {
|
||||
alyraffauf.desktop.waylandComp.enable = true;
|
||||
services = {
|
||||
blueman.enable = true;
|
||||
dbus.packages = [pkgs.gcr];
|
||||
geoclue2.enable = true;
|
||||
gnome.gnome-keyring.enable = true;
|
||||
udev.packages = [pkgs.swayosd];
|
||||
};
|
||||
|
||||
security.pam.services = {
|
||||
greetd.enableKwallet = true;
|
||||
greetd.enableGnomeKeyring = true;
|
||||
swaylock = {};
|
||||
geoclue2.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
programs = {
|
||||
gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
|
||||
sway = {
|
||||
enable = true;
|
||||
package = inputs.nixpkgsUnstable.legacyPackages."${pkgs.system}".swayfx;
|
||||
|
|
29
nixosModules/desktop/waylandComp.nix
Normal file
29
nixosModules/desktop/waylandComp.nix
Normal file
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
options = {
|
||||
alyraffauf.desktop.waylandComp.enable =
|
||||
lib.mkEnableOption "Shared defaults for wayland compositors.";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.alyraffauf.desktop.waylandComp.enable {
|
||||
services = {
|
||||
blueman.enable = lib.mkDefault true;
|
||||
dbus.packages = [pkgs.gcr];
|
||||
gnome.gnome-keyring.enable = lib.mkDefault true;
|
||||
udev.packages = [pkgs.swayosd];
|
||||
};
|
||||
|
||||
security.pam.services = {
|
||||
swaylock = {};
|
||||
};
|
||||
|
||||
programs = {
|
||||
gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue