diff options
Diffstat (limited to '')
-rw-r--r-- | .config/i3/config | 2 | ||||
-rw-r--r-- | .gitconfig | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/.config/i3/config b/.config/i3/config index f799129..382e9f7 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -119,7 +119,7 @@ set $keyboardbacklight "asus::kbd_backlight" bindsym $mod+Shift+r reload # Exit i3 - bindsym $mod+Ctrl+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + bindsym $mod+Ctrl+q exec i3-nagbar -t warning -m 'You pressed Super + Q. What do you want to do?' -B 'Log out' 'i3-msg exit' -B 'Reboot' 'reboot' -B 'Power off' 'poweroff' # # Moving around: # @@ -2,6 +2,9 @@ name = Luca Matei Pintilie signingKey = CA875B8CE4FF7C9F +[pull] + rebase = false + [commit] gpgSign = true @@ -24,8 +27,10 @@ diffFilter = delta --color-only [delta] - navigate = true # use n and N to move between diff sections - light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal) + # use n and N to move between diff sections + navigate = true + # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal) + light = false [merge] conflictstyle = diff3 |