.config/alacritty/alacritty.toml

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

.config/git/ignore

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

.gitconfig

@@ -1,3 +1,7 @@
+[user]
+  name = Oliver Ladner
+  email = waste@lugh.ch
+
 [core]
   editor = nvim
 
@@ -25,12 +29,4 @@
 [init]
 	defaultBranch = main
 [merge]
-    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
+	conflictstyle = diff3