diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/git/config.in | 3 | ||||
| -rw-r--r-- | .config/sway/config | 13 | ||||
| -rw-r--r-- | .config/sway/melete/bg | 1 | ||||
| -rw-r--r-- | .config/sway/zephyr/bg | 1 |
4 files changed, 12 insertions, 6 deletions
diff --git a/.config/git/config.in b/.config/git/config.in index 37c01575..d2ba8db1 100644 --- a/.config/git/config.in +++ b/.config/git/config.in @@ -49,6 +49,9 @@ participants = 0F56D0553B6D411B signingkey = 0F56D0553B6D411B +[merge] + conflictStyle = zdiff3 + [merge "dpkg-mergechangelogs"] name = debian/changelog merge driver driver = dpkg-mergechangelogs -m %O %A %B %A diff --git a/.config/sway/config b/.config/sway/config index 69678c08..eacc40b2 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -20,8 +20,6 @@ input type:keyboard repeat_rate 25 input type:keyboard repeat_delay 380 seat * hide_cursor 5000 -output * bg ~/src/dotfiles/lib-src/img/green_gobbler.png tile - # Key binding strategy: # # Use Ctrl+N and Mod1+Ctrl+N, which will never be bound in Emacs, for bindings @@ -224,10 +222,13 @@ bindsym Mod1+Ctrl+1 seat - cursor set 0 0, \ bindsym Mod1+Ctrl+4 seat - cursor set 0 0, \ exec papersway-msg move_workspace next -bindsym Ctrl+2 focus output left -bindsym Mod1+Ctrl+2 move workspace to output left -bindsym Ctrl+3 focus output right -bindsym Mod1+Ctrl+3 move workspace to output right +bindsym Ctrl+2 exec papersway-msg scroll left +bindsym Ctrl+3 exec papersway-msg scroll right + +bindsym Mod4+7 focus output left +bindsym Mod1+Mod4+7 move workspace to output left +bindsym Mod4+0 focus output right +bindsym Mod1+Mod4+0 move workspace to output right bindsym Ctrl+5 kill bindsym Ctrl+6 exec papersway-msg monocle toggle diff --git a/.config/sway/melete/bg b/.config/sway/melete/bg new file mode 100644 index 00000000..8142acd6 --- /dev/null +++ b/.config/sway/melete/bg @@ -0,0 +1 @@ +output * bg ~/src/dotfiles/lib-src/img/green_gobbler.png tile diff --git a/.config/sway/zephyr/bg b/.config/sway/zephyr/bg new file mode 100644 index 00000000..13418ff9 --- /dev/null +++ b/.config/sway/zephyr/bg @@ -0,0 +1 @@ +output * bg ~/src/dotfiles/lib-src/img/hoffman.png tile |