about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2019-04-27 22:38:18 +0200
committerGitHub <noreply@github.com>2019-04-27 22:38:18 +0200
commit15010f04369429e582a4e152143f125108837002 (patch)
tree605b76d9b4243203f2ba54010538ea61a944fa70 /nixos
parent014c26d75bb5323de7cc2c0399bf73cfd5d8a36b (diff)
downloadnixlib-15010f04369429e582a4e152143f125108837002.tar
nixlib-15010f04369429e582a4e152143f125108837002.tar.gz
nixlib-15010f04369429e582a4e152143f125108837002.tar.bz2
nixlib-15010f04369429e582a4e152143f125108837002.tar.lz
nixlib-15010f04369429e582a4e152143f125108837002.tar.xz
nixlib-15010f04369429e582a4e152143f125108837002.tar.zst
nixlib-15010f04369429e582a4e152143f125108837002.zip
sway: Read the configuration from /etc before /nix/store (#60319)
This change will load all configuration files from /etc, to make it easy
to override them, but fallback to /nix/store/.../etc/sway/config to make
Sway work out-of-the-box with the default configuration on non NixOS
systems.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/programs/sway.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index 457faaa3c102..b4f03151cdc1 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -78,9 +78,9 @@ in {
     environment = {
       systemPackages = [ swayJoined ] ++ cfg.extraPackages;
       etc = {
-        "sway/config".source = "${swayPackage}/etc/sway/config";
-        #"sway/security.d".source = "${swayPackage}/etc/sway/security.d/";
-        #"sway/config.d".source = "${swayPackage}/etc/sway/config.d/";
+        "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/";
       };
     };
     security.pam.services.swaylock = {};