Compare commits
2 commits
df0ffeecbd
...
21f499d6de
| Author | SHA1 | Date | |
|---|---|---|---|
| 21f499d6de | |||
| 4d3ef27cd2 |
4 changed files with 43 additions and 32 deletions
|
|
@ -26,6 +26,8 @@ option_as_alt = "Both"
|
||||||
decorations = "None"
|
decorations = "None"
|
||||||
padding = { x = 12, y = 5 }
|
padding = { x = 12, y = 5 }
|
||||||
dynamic_padding = true
|
dynamic_padding = true
|
||||||
|
# opacity = 0.8
|
||||||
|
# blur = true
|
||||||
|
|
||||||
[bell]
|
[bell]
|
||||||
duration = 10
|
duration = 10
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,3 @@
|
||||||
[user]
|
|
||||||
name = Oliver Ladner
|
|
||||||
email = waste@lugh.ch
|
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
editor = nvim
|
editor = nvim
|
||||||
|
|
||||||
|
|
@ -29,4 +25,12 @@
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
[merge]
|
[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
5
.config/git/ignore
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
# Global gitignore - things to ALWAYS ignore
|
||||||
|
.DS_Store
|
||||||
|
Thumbs.db
|
||||||
|
.vscode
|
||||||
|
.idea
|
||||||
Loading…
Add table
Add a link
Reference in a new issue