movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/programs: factor out wayland-session common options

Browse source
This commit is contained in:
Gaetan Lepage 2023-05-15 13:45:09 +02:00
parent 94dca479f4
commit c7bd5289d6
4 changed files with 57 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/module-list.nix
View file

@ -241,7 +241,6 @@
./programs/starship.nix ./programs/starship.nix
./programs/steam.nix ./programs/steam.nix
./programs/streamdeck-ui.nix ./programs/streamdeck-ui.nix
./programs/sway.nix
./programs/sysdig.nix ./programs/sysdig.nix
./programs/system-config-printer.nix ./programs/system-config-printer.nix
./programs/systemtap.nix ./programs/systemtap.nix
@ -256,7 +255,8 @@
./programs/usbtop.nix ./programs/usbtop.nix
./programs/vim.nix ./programs/vim.nix
./programs/wavemon.nix ./programs/wavemon.nix
./programs/waybar.nix ./programs/wayland/sway.nix
./programs/wayland/waybar.nix
./programs/weylus.nix ./programs/weylus.nix
./programs/wireshark.nix ./programs/wireshark.nix
./programs/xastir.nix ./programs/xastir.nix
@ -1308,7 +1308,6 @@
./services/x11/window-managers/default.nix ./services/x11/window-managers/default.nix
./services/x11/window-managers/fluxbox.nix ./services/x11/window-managers/fluxbox.nix
./services/x11/window-managers/icewm.nix ./services/x11/window-managers/icewm.nix
./services/x11/window-managers/bspwm.nix
./services/x11/window-managers/katriawm.nix ./services/x11/window-managers/katriawm.nix
./services/x11/window-managers/metacity.nix ./services/x11/window-managers/metacity.nix
./services/x11/window-managers/nimdow.nix ./services/x11/window-managers/nimdow.nix

16
nixos/modules/programs/sway.nix → nixos/modules/programs/wayland/sway.nix
View file

@ -123,7 +123,9 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable
(mkMerge [
{
assertions = [ assertions = [
{ {
assertion = cfg.extraSessionCommands != "" -> cfg.wrapperFeatures.base; assertion = cfg.extraSessionCommands != "" -> cfg.wrapperFeatures.base;
@ -147,17 +149,11 @@ in {
"sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config"; "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config";
}; };
}; };
security.polkit.enable = true;
security.pam.services.swaylock = {};
hardware.opengl.enable = mkDefault true;
fonts.enableDefaultFonts = mkDefault true;
programs.dconf.enable = mkDefault true;
# To make a Sway session available if a display manager like SDDM is enabled: # To make a Sway session available if a display manager like SDDM is enabled:
services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ];
programs.xwayland.enable = mkDefault true; }
# For screen sharing (this option only has an effect with xdg.portal.enable): (import ./wayland-session.nix { inherit lib; })
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; ]);
};
meta.maintainers = with lib.maintainers; [ primeos colemickens ]; meta.maintainers = with lib.maintainers; [ primeos colemickens ];
} }

0
nixos/modules/programs/waybar.nix → nixos/modules/programs/wayland/waybar.nix
View file

26
nixos/modules/programs/wayland/wayland-session.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, ... }: with lib; {
security = {
polkit.enable = true;
pam.services.swaylock = {};
};
hardware.opengl.enable = mkDefault true;
fonts.enableDefaultFonts = mkDefault true;
programs = {
dconf.enable = mkDefault true;
xwayland.enable = mkDefault true;
};
xdg.portal = {
enable = mkDefault true;
extraPortals = [
# For screen sharing
pkgs.xdg-desktop-portal-wlr
];
};
}