public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122605 from primeos/nixos-sway-extend-default-configuration

Browse Source 
nixos/sway: Extend the default configuration for NixOS
This commit is contained in:
Michael Weiss
2021-05-13 20:48:55 +02:00
committed by GitHub
parent 7500267ed9 00e8e5b123
commit 60f2af5938
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/programs/sway.nix
+6 -2
View File
@@ -31,6 +31,7 @@ let
extraOptions = cfg.extraOptions;
withBaseWrapper = cfg.wrapperFeatures.base;
withGtkWrapper = cfg.wrapperFeatures.gtk;
isNixOS = true;
};
in {
options.programs.sway = {
@@ -120,8 +121,11 @@ in {
systemPackages = [ swayPackage ] ++ cfg.extraPackages;
etc = {
"sway/config".source = mkOptionDefault "${swayPackage}/etc/sway/config";
#"sway/security.d".source = mkOptionDefault "${swayPackage}/etc/sway/security.d/";
#"sway/config.d".source = mkOptionDefault "${swayPackage}/etc/sway/config.d/";
"sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" ''
# Import the most important environment variables into the D-Bus and systemd
# user environments (e.g. required for screen sharing and Pinentry prompts):
exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
'';
};
};
security.pam.services.swaylock = {};