Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

i3: validate configuration at build time

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

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

@ -193,6 +193,21 @@ let
else else
"") + "\n" + cfg.extraConfig); "") + "\n" + cfg.extraConfig);
# Validates the i3 configuration
checkI3Config =
pkgs.runCommandLocal "i3-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 i3 succesfully validated the configuration
i3 -c ${configFile} -C -d all || {
echo "i3 configuration validation failed"
echo "For a verbose log of the failure, run 'i3 -c ${configFile} -C -d all'"
exit 1
};
cp ${configFile} $out
'';
in { in {
options = { options = {
xsession.windowManager.i3 = { xsession.windowManager.i3 = {
@ -229,7 +244,7 @@ in {
home.packages = [ cfg.package ]; home.packages = [ cfg.package ];
xsession.windowManager.command = "${cfg.package}/bin/i3"; xsession.windowManager.command = "${cfg.package}/bin/i3";
xdg.configFile."i3/config" = { xdg.configFile."i3/config" = {
source = configFile; source = checkI3Config;
onChange = '' onChange = ''
i3Socket=''${XDG_RUNTIME_DIR:-/run/user/$UID}/i3/ipc-socket.* i3Socket=''${XDG_RUNTIME_DIR:-/run/user/$UID}/i3/ipc-socket.*
if [ -S $i3Socket ]; then if [ -S $i3Socket ]; then

4
tests/modules/services/window-managers/i3/i3-followmouse.nix
View file

@ -14,7 +14,9 @@ with lib;
(self: super: { (self: super: {
dmenu = super.dmenu // { outPath = "@dmenu@"; }; dmenu = super.dmenu // { outPath = "@dmenu@"; };
i3 = super.i3 // { outPath = "@i3@"; }; i3 = super.writeScriptBin "i3" "" // { outPath = "@i3@"; };
i3-gaps = super.writeScriptBin "i3" "" // { outPath = "@i3-gaps@"; };
i3status = super.i3status // { outPath = "@i3status@"; }; i3status = super.i3status // { outPath = "@i3status@"; };
}) })

7
tests/modules/services/window-managers/i3/i3-keybindings.nix
View file

@ -19,9 +19,10 @@ with lib;
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
dmenu = super.dmenu // { outPath = "@dmenu@"; }; dmenu = super.dmenu // { outPath = "@dmenu@"; };
i3 = super.writeScriptBin "i3" "" // { outPath = "@i3@"; };
i3 = super.i3 // { outPath = "@i3@"; }; i3-gaps = super.writeScriptBin "i3-gaps" "" // {
outPath = "@i3-gaps@";
};
i3status = super.i3status // { outPath = "@i3status@"; }; i3status = super.i3status // { outPath = "@i3status@"; };
}) })
]; ];