diff options
author | Luca Matei Pintilie <lucafulger@gmail.com> | 2022-12-31 15:23:45 +0000 |
---|---|---|
committer | Luca Matei Pintilie <lucafulger@gmail.com> | 2022-12-31 15:23:45 +0000 |
commit | a3e63f3e49af6360665f6e5045ee9b599294b18d (patch) | |
tree | 739d44327af99ce1ce3ea7cdeac20ab65aee8919 | |
parent | 84153502db8b3b0c0d5e7555802d5d53d3bcc3d7 (diff) | |
download | dotfiles-a3e63f3e49af6360665f6e5045ee9b599294b18d.tar dotfiles-a3e63f3e49af6360665f6e5045ee9b599294b18d.tar.gz dotfiles-a3e63f3e49af6360665f6e5045ee9b599294b18d.tar.bz2 dotfiles-a3e63f3e49af6360665f6e5045ee9b599294b18d.tar.lz dotfiles-a3e63f3e49af6360665f6e5045ee9b599294b18d.tar.xz dotfiles-a3e63f3e49af6360665f6e5045ee9b599294b18d.tar.zst dotfiles-a3e63f3e49af6360665f6e5045ee9b599294b18d.zip |
Improve git config
-rw-r--r-- | .config/sway/config | 2 | ||||
-rw-r--r-- | .gitconfig | 47 |
2 files changed, 46 insertions, 3 deletions
diff --git a/.config/sway/config b/.config/sway/config index d9597d0..3806521 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -169,7 +169,7 @@ input "1:1:AT_Translated_Set_2_keyboard" xkb_layout no bindsym $mod+Shift+r reload # Exit sway (logs you out of your Wayland session) - bindsym $mod+Ctrl+q exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' + bindsym $mod+Ctrl+q exec swaynag -t warning -m 'You pressed Super + Q. What do you want to do?' -B 'Log out' 'swaymsg exit' -B 'Reboot' 'reboot' -B 'Power off' 'poweroff' # # Moving around: # @@ -1,12 +1,55 @@ [user] - signingKey = CA875B8CE4FF7C9F name = Luca Matei Pintilie - email = lucafulger@gmail.com + signingKey = CA875B8CE4FF7C9F + [commit] gpgSign = true + [tag] gpgSign = true + [pull] rebase = false + [init] defaultBranch = master + +[push] + push.autoSetupRemote + +[core] + pager = delta + +[interactive] + 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) + +[merge] + conflictstyle = diff3 + +[diff] + colorMoved = default + +[delta] + features = decorations + line-numbers = true + syntax-theme = Dracula + #side-by-side = true + pager = less + +[delta "interactive"] + keep-plus-minus-markers = true + +[delta "decorations"] + commit-decoration-style = blue ol + commit-style = raw + file-style = omit + hunk-header-decoration-style = blue box + hunk-header-file-style = red + hunk-header-line-number-style = "#067a00" + hunk-header-style = file line-number syntax + + |