alyraffauf/nixcfg
1
0
Fork 0
mirror of https://github.com/alyraffauf/nixcfg.git synced 2024-11-22 02:13:55 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

sway/hyprland: marry defaults in waylandComp module

Browse source
This commit is contained in:
Aly Raffauf 2024-05-26 00:36:48 -04:00
parent 7d43115f41
commit 04c22c3d50
5 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixosModules/desktop/default.nix
View file

@ -13,6 +13,7 @@
./lightdm
./plasma
./sway
./waylandComp.nix
];
options = {

4
nixosModules/desktop/greetd/default.nix
View file

@ -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;

14
nixosModules/desktop/hyprland/default.nix
View file

@ -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;

14
nixosModules/desktop/sway/default.nix
View file

@ -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
View 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;
};
};
}