eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-27 05:29:46 +01:00
Code Issues Releases Wiki Activity

sway: validate configuration at build time

Browse source 
PR #1579
This commit is contained in:
Nicolas Berbiche 2020-11-15 17:58:54 -05:00 committed by Robert Helgesson
parent 964f698095
commit 99b75f99df
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
6 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/services/window-managers/i3-sway/sway.nix
View file

@ -290,6 +290,21 @@ let
'' else '' else
"") + cfg.extraConfig); "") + cfg.extraConfig);
# Validates the Sway configuration
checkSwayConfig =
pkgs.runCommandLocal "sway-config" { buildInputs = [ cfg.package ]; } ''
# We have to make sure the wrapper does not start a dbus session
export DBUS_SESSION_BUS_ADDRESS=1
# A zero exit code means Sway succesfully validated the configuration
sway --config ${configFile} --validate --debug || {
echo "Sway configuration validation failed"
echo "For a verbose log of the failure, run 'sway --config ${configFile} --validate --debug'"
exit 1
};
cp ${configFile} $out
'';
defaultSwayPackage = pkgs.sway.override { defaultSwayPackage = pkgs.sway.override {
extraSessionCommands = cfg.extraSessionCommands; extraSessionCommands = cfg.extraSessionCommands;
extraOptions = cfg.extraOptions; extraOptions = cfg.extraOptions;
@ -394,7 +409,7 @@ in {
home.packages = optional (cfg.package != null) cfg.package home.packages = optional (cfg.package != null) cfg.package
++ optional cfg.xwayland pkgs.xwayland; ++ optional cfg.xwayland pkgs.xwayland;
xdg.configFile."sway/config" = { xdg.configFile."sway/config" = {
source = configFile; source = checkSwayConfig;
onChange = '' onChange = ''
swaySocket=''${XDG_RUNTIME_DIR:-/run/user/$UID}/sway-ipc.$UID.$(${pkgs.procps}/bin/pgrep -x sway || ${pkgs.coreutils}/bin/true).sock swaySocket=''${XDG_RUNTIME_DIR:-/run/user/$UID}/sway-ipc.$UID.$(${pkgs.procps}/bin/pgrep -x sway || ${pkgs.coreutils}/bin/true).sock
if [ -S $swaySocket ]; then if [ -S $swaySocket ]; then

2
tests/modules/services/window-managers/sway/sway-default.conf
View file

@ -92,7 +92,7 @@ bar {
hidden_state hide hidden_state hide
position bottom position bottom
status_command @i3status@/bin/i3status status_command @i3status@/bin/i3status
swaybar_command @sway/bin/swaybar swaybar_command @sway@/bin/swaybar
workspace_buttons yes workspace_buttons yes
strip_workspace_numbers no strip_workspace_numbers no
tray_output primary tray_output primary

3
tests/modules/services/window-managers/sway/sway-default.nix
View file

@ -10,7 +10,8 @@ in {
config = { config = {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
package = dummy-package // { outPath = "@sway"; }; package = pkgs.writeScriptBin "sway" "" // { outPath = "@sway@"; };
# overriding findutils causes issues # overriding findutils causes issues
config.menu = "${pkgs.dmenu}/bin/dmenu_run"; config.menu = "${pkgs.dmenu}/bin/dmenu_run";
}; };

6
tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix
View file

@ -10,7 +10,7 @@ in {
config = { config = {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
package = dummy-package // { outPath = "@sway"; }; package = pkgs.writeScriptBin "sway" "";
config = { config = {
focus.followMouse = false; focus.followMouse = false;
@ -26,10 +26,6 @@ in {
outPath = "@rxvt-unicode-unwrapped@"; outPath = "@rxvt-unicode-unwrapped@";
}; };
sway = dummy-package // { outPath = "@sway@"; }; sway = dummy-package // { outPath = "@sway@"; };
sway-unwrapped = dummy-package // {
outPath = "@sway-unwrapped@";
version = "1";
};
swaybg = dummy-package // { outPath = "@swaybg@"; }; swaybg = dummy-package // { outPath = "@swaybg@"; };
xwayland = dummy-package // { outPath = "@xwayland@"; }; xwayland = dummy-package // { outPath = "@xwayland@"; };
}) })

3
tests/modules/services/window-managers/sway/sway-followmouse.nix
View file

@ -10,7 +10,7 @@ in {
config = { config = {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
package = dummy-package // { outPath = "@sway"; }; package = pkgs.writeScriptBin "sway" "" // { outPath = "@sway@"; };
config = { config = {
focus.followMouse = "always"; focus.followMouse = "always";
@ -26,7 +26,6 @@ in {
outPath = "@rxvt-unicode-unwrapped@"; outPath = "@rxvt-unicode-unwrapped@";
}; };
sway = dummy-package // { outPath = "@sway@"; }; sway = dummy-package // { outPath = "@sway@"; };
sway-unwrapped = dummy-package // { version = "1"; };
swaybg = dummy-package // { outPath = "@swaybg@"; }; swaybg = dummy-package // { outPath = "@swaybg@"; };
xwayland = dummy-package // { outPath = "@xwayland@"; }; xwayland = dummy-package // { outPath = "@xwayland@"; };
}) })

3
tests/modules/services/window-managers/sway/sway-post-2003.nix
View file

@ -12,7 +12,8 @@ in {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
package = dummy-package // { outPath = "@sway"; }; package = pkgs.writeScriptBin "sway" "" // { outPath = "@sway@"; };
# overriding findutils causes issues # overriding findutils causes issues
config.menu = "${pkgs.dmenu}/bin/dmenu_run"; config.menu = "${pkgs.dmenu}/bin/dmenu_run";
}; };