Compare commits
No commits in common. "21f499d6de75b08bf7c367bc5599aa704a358735" and "df0ffeecbdda05f6326af315bdc39aa8d8329e24" have entirely different histories.
21f499d6de
...
df0ffeecbd
4 changed files with 32 additions and 43 deletions
|
|
@ -26,8 +26,6 @@ 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,5 +0,0 @@
|
||||||
# Global gitignore - things to ALWAYS ignore
|
|
||||||
.DS_Store
|
|
||||||
Thumbs.db
|
|
||||||
.vscode
|
|
||||||
.idea
|
|
||||||
|
|
@ -1,3 +1,7 @@
|
||||||
|
[user]
|
||||||
|
name = Oliver Ladner
|
||||||
|
email = waste@lugh.ch
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
editor = nvim
|
editor = nvim
|
||||||
|
|
||||||
|
|
@ -25,12 +29,4 @@
|
||||||
[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
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue