aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Matei Pintilie <lucafulger@gmail.com>2023-02-05 10:08:11 +0000
committerLuca Matei Pintilie <lucafulger@gmail.com>2023-02-05 10:08:11 +0000
commit1ca6f778e8c983950f5b05f2a84f1452fb99451d (patch)
treef0cc91abe372152f5609249920574f4151ca03ee
parentc24569217169ea9eea8d395afb5971056e7cd4b3 (diff)
downloaddotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar.gz
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar.bz2
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar.lz
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar.xz
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar.zst
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.zip
Better i3 exit prompt
Diffstat (limited to '')
-rw-r--r--.config/i3/config2
-rw-r--r--.gitconfig9
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:
#
diff --git a/.gitconfig b/.gitconfig
index f442193..9400d9f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -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