aboutsummaryrefslogtreecommitdiff
path: root/i3/.config/i3
diff options
context:
space:
mode:
authorTucker Evans <tuckerevans24@gmail.com>2018-03-07 20:55:00 -0500
committerTucker Evans <tuckerevans24@gmail.com>2018-03-07 20:55:00 -0500
commit9e3771d19c02892119be2140e7c8303ebd01041d (patch)
tree9695804c14701d8bd20646bab2fb9d0a4af1ac2d /i3/.config/i3
parent4f3b29401c7ff6b42a84b9aca53877783212ec5d (diff)
parentd2caf851eac8284d134f5a440b65a492dd08039f (diff)
Merge branch 'ursa_minor'
Diffstat (limited to 'i3/.config/i3')
-rw-r--r--i3/.config/i3/config9
1 files changed, 9 insertions, 0 deletions
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 01e0749..86f89dd 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -159,6 +159,7 @@ bindsym $mod+r mode "resize"
bar {
status_command i3status
+ separator_symbol " | "
# colors {
# background #414A59
# statusline #F5F6F7
@@ -187,5 +188,13 @@ bindsym XF86AudioPrev exec playerctl previous
exec --no-startup-id synclient NaturalScrolling=1 VertScrollDelta=-113
exec --no-startup-id /home/tje/i3-battery-popup -N
+<<<<<<< HEAD
bindsym $mod+b exec !BROWSER
bindsym $mod+p exec passmenu
+=======
+bindsym $mod+b exec qutebrowser
+bindsym $mod+p exec passmenu
+
+for_window [class="mpv"] floating enable
+for_window [class="feh"] floating enable
+>>>>>>> ursa_minor