diff options
-rw-r--r-- | .gitconfig | 1 | ||||
-rw-r--r-- | .i3/config | 1 | ||||
-rw-r--r-- | .xinitrc | 4 |
3 files changed, 5 insertions, 1 deletions
@@ -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 @@ -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 @@ -42,7 +42,9 @@ autostart () { keepassx & transmission-remote-gtk & #claws-mail & - thunderbird & + #thunderbird & + kwalletd5 & + kmail & firefox & steam & copyq & |