diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2022-05-15 22:24:11 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2022-05-15 22:24:11 +1200 |
| commit | 67128af06f99ae579347ab6ca4ca21fb643167cd (patch) | |
| tree | e3b1920009758983e2a368a856d6c7cccca96294 | |
| parent | Merge branch 'release/v12.2.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-67128af06f99ae579347ab6ca4ca21fb643167cd.tar.gz dotfiles-67128af06f99ae579347ab6ca4ca21fb643167cd.zip | |
Merge branch 'release/v12.3.0'v12.3.0
* release/v12.3.0:
Start correct alternative for X window manager
Revert some Git settings
Switch from "full" Git log/show format to "fuller"
Switch to pactl for mute/volume hotkeys
| -rw-r--r-- | VERSION | 4 | ||||
| -rw-r--r-- | git/config.mi5 | 6 | ||||
| -rw-r--r-- | sxhkd/sxhkdrc | 6 | ||||
| -rw-r--r-- | x/xsession.sh | 2 |
4 files changed, 7 insertions, 11 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v12.2.0 -Mon, 09 May 2022 10:18:14 +0000 +tejr dotfiles v12.3.0 +Sun, 15 May 2022 10:24:05 +0000 diff --git a/git/config.mi5 b/git/config.mi5 index cc7456b5..6ae7f8ef 100644 --- a/git/config.mi5 +++ b/git/config.mi5 @@ -4,11 +4,8 @@ [diff] algorithm = patience -[fetch] - output = compact - [format] - pretty = full + pretty = fuller [init] defaultBranch = master @@ -16,7 +13,6 @@ [log] date = local - decorate = short [merge] ff = false diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc index 94726e2c..3dabee06 100644 --- a/sxhkd/sxhkdrc +++ b/sxhkd/sxhkdrc @@ -47,13 +47,13 @@ Pause i3lock --color=#000000 --image "$HOME"/.local/share/i3/lock.png --nofork XF86AudioMute - amixer -q sset Master toggle + pactl set-sink-mute @DEFAULT_SINK@ toggle XF86AudioRaiseVolume - amixer -q sset Master 5%+ unmute + pactl set-sink-volume @DEFAULT_SINK@ +5% XF86AudioLowerVolume - amixer -q sset Master 5%- unmute + pactl set-sink-volume @DEFAULT_SINK@ -5% XF86Calculator x-terminal-emulator -e bcq diff --git a/x/xsession.sh b/x/xsession.sh index 0ef2615a..99d7368d 100644 --- a/x/xsession.sh +++ b/x/xsession.sh @@ -46,4 +46,4 @@ unset -v sh # Start Debian's configured window manager now that everything's ready; at the # time of writing, this is normally i3wm -exec x-session-manager +exec x-window-manager |