wip

.gitignore

@@ -42,10 +42,7 @@ tmux/*
 git/*
 !git/config
 !git/ignore
-!git/config.d
-git/config.d/*
-!git/config.d/aflabs.conf
-!git/config.d/flare.conf
+!git/aflabs
 
 # ghostty
 !ghostty

git/config

@@ -1,3 +1,12 @@
+[includeIf "gitdir:~/Desktop/git/git.aflabs.org/"]
+	path = ~/.config/git/config.d/aflabs.conf
+
+[includeIf "gitdir:~/Desktop/git/gitlab.com/flarenetwork"]
+	path = ~/.config/git/config.d/flare.conf
+
+[includeIf "gitdir:~/Desktop/git/gitlab.com/flare-foundation"]
+	path = ~/.config/git/config.d/flare.conf
+
 [user]
 	name = Matej Janežič
 	email = janezic.mj@gmail.com
@@ -45,12 +54,3 @@
 
 [mergetool "nvimdiff"]
 	layout = "LOCAL,BASE,REMOTE / MERGED"
-
-[includeIf "gitdir:~/git/git.aflabs.org/**"]
-	path = ~/.config/git/config.d/aflabs.conf
-
-[includeIf "gitdir:~/git/gitlab.com/flarenetwork/**"]
-	path = ~/.config/git/config.d/flare.conf
-
-[includeIf "gitdir:~/git/gitlab.com/flare-foundation/**"]
-	path = ~/.config/git/config.d/flare.conf

git/config.d/aflabs.conf

@@ -1,2 +0,0 @@
-[user]
-	email = matej.janezic@aflabs.com

git/config.d/flare.conf

@@ -1,2 +0,0 @@
-[user]
-	email = matej@flare.network

sway/config.d/60-window-rule.conf

@@ -6,7 +6,7 @@ for_window [tiling] border normal $border
 assign [app_id="google-chrome"] workspace 2
 assign [app_id="thunderbird"] workspace 3
 assign [app_id="Cider"] workspace 4
-assign [app_id=".*BoltLauncher.*"] workspace 5
+assign [class=".*BoltLauncher.*"] workspace 5
 assign [class="net-runelite.*"] workspace 5
 assign [app_id="vesktop"] workspace 8
 assign [app_id="Slack"] workspace 8