1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-12-24 02:39:48 +01:00

herbstluftwm: merge improvements

This commit is contained in:
Robert Helgesson 2022-12-21 00:20:13 +01:00
commit 0f8bf4f92e
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
6 changed files with 69 additions and 11 deletions

View file

@ -141,19 +141,22 @@ in {
herbstclient attr theme.tiling.reset 1
herbstclient attr theme.floating.reset 1
herbstclient keyunbind --all
herbstclient mouseunbind --all
herbstclient unrule --all
${renderSettings cfg.settings}
if ${cfg.package}/bin/herbstclient object_tree tags.by-name | ${pkgs.gnugrep}/bin/grep default; then
herbstclient rename default ${
lib.escapeShellArg (builtins.head cfg.tags)
}
fi
${lib.optionalString (cfg.tags != [ ]) ''
if ${cfg.package}/bin/herbstclient object_tree tags.default &>/dev/null; then
herbstclient rename default ${
lib.escapeShellArg (builtins.head cfg.tags)
}
fi
for tag in ${lib.escapeShellArgs cfg.tags}; do
herbstclient add "$tag"
done
for tag in ${lib.escapeShellArgs cfg.tags}; do
herbstclient add "$tag"
done
''}
${renderKeybinds cfg.keybinds}

View file

@ -1 +1,4 @@
{ herbstluftwm-simple-config = ./herbstluftwm-simple-config.nix; }
{
herbstluftwm-simple-config = ./herbstluftwm-simple-config.nix;
herbstluftwm-no-tags = ./herbstluftwm-no-tags.nix;
}

View file

@ -0,0 +1,32 @@
#!/nix/store/00000000000000000000000000000000-bash/bin/bash
shopt -s expand_aliases
# shellcheck disable=SC2142
alias herbstclient='set -- "$@" ";"'
set --
herbstclient emit_hook reload
# Reset everything.
herbstclient attr theme.tiling.reset 1
herbstclient attr theme.floating.reset 1
herbstclient keyunbind --all
herbstclient mouseunbind --all
herbstclient unrule --all
herbstclient unlock
@herbstluftwm@/bin/herbstclient chain ";" "$@"

View file

@ -0,0 +1,16 @@
{ lib, pkgs, ... }:
{
xsession.windowManager.herbstluftwm = { enable = true; };
test.stubs.herbstluftwm = { };
nmt.script = ''
autostart=home-files/.config/herbstluftwm/autostart
assertFileExists "$autostart"
assertFileIsExecutable "$autostart"
normalizedAutostart=$(normalizeStorePaths "$autostart")
assertFileContent "$normalizedAutostart" ${./herbstluftwm-no-tags-autostart}
'';
}

View file

@ -11,6 +11,7 @@ herbstclient emit_hook reload
herbstclient attr theme.tiling.reset 1
herbstclient attr theme.floating.reset 1
herbstclient keyunbind --all
herbstclient mouseunbind --all
herbstclient unrule --all
herbstclient set always_show_frame true
@ -19,7 +20,7 @@ herbstclient set frame_bg_active_color '#000000'
herbstclient set frame_gap '12'
herbstclient set frame_padding '-12'
if @herbstluftwm@/bin/herbstclient object_tree tags.by-name | /nix/store/00000000000000000000000000000000-gnugrep/bin/grep default; then
if @herbstluftwm@/bin/herbstclient object_tree tags.default &>/dev/null; then
herbstclient rename default '1'
fi
@ -27,6 +28,7 @@ for tag in '1' 'with space' 'wə1rd#ch@rs'\'''; do
herbstclient add "$tag"
done
herbstclient keybind Mod4-1 use 1
herbstclient keybind Mod4-2 use 2
herbstclient keybind Mod4-Alt-Tab cycle -1

View file

@ -39,6 +39,8 @@
assertFileIsExecutable "$autostart"
normalizedAutostart=$(normalizeStorePaths "$autostart")
assertFileContent "$normalizedAutostart" ${./autostart}
assertFileContent "$normalizedAutostart" ${
./herbstluftwm-simple-config-autostart
}
'';
}