misc

Signed-off-by: Florian Pritz <bluewind@xinu.at>

3 files changed, 5 insertions, 1 deletions

diff --git a/.gitconfig b/.gitconfig
index 6e2b555..bb1db9c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,6 +23,7 @@
 	theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
 	p = push --follow-tags
 	dw = diff --color-words
+	ri = rebase -i --autosquash
 [merge]
 	tool = kdiff3
 	conflictstyle = diff3
diff --git a/.i3/config b/.i3/config
index e8db938..68ca9f3 100644
--- a/.i3/config
+++ b/.i3/config
@@ -34,6 +34,7 @@ assign [class="^Hamster$"] 3
 for_window [class="^Steam$" title=" - Chat$"] move window to workspace 3
 #assign [class="^chromium$"] 4
 assign [class="^Thunderbird$"] 5
+assign [class="^kmail2$"] 5
 assign [class="^Steam$"] 8
 
 workspace 1 output DP-2
diff --git a/.xinitrc b/.xinitrc
index c12274c..d29669d 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -42,7 +42,9 @@ autostart () {
   keepassx &
   transmission-remote-gtk &
   #claws-mail &
-  thunderbird &
+  #thunderbird &
+  kwalletd5 &
+  kmail &
   firefox &
   steam &
   copyq &