Compare commits

...

2 commits

4 changed files with 43 additions and 32 deletions

View file

@ -26,6 +26,8 @@ option_as_alt = "Both"
decorations = "None"
padding = { x = 12, y = 5 }
dynamic_padding = true
# opacity = 0.8
# blur = true
[bell]
duration = 10

View file

@ -1,7 +1,3 @@
[user]
name = Oliver Ladner
email = waste@lugh.ch
[core]
editor = nvim
@ -29,4 +25,12 @@
[init]
defaultBranch = main
[merge]
conflictstyle = diff3
conflictstyle = diff3
# Set a correct user.name and user.email for work projects
[includeIf "gitdir:~/git/work/"]
path = ~/git/work/gitconfig
# Set a correct user.name and user.email for personal projects
[includeIf "gitdir:~/git/lugh/"]
path = ~/git/lugh/gitconfig

5
.config/git/ignore Normal file
View file

@ -0,0 +1,5 @@
# Global gitignore - things to ALWAYS ignore
.DS_Store
Thumbs.db
.vscode
.idea