aboutsummaryrefslogtreecommitdiff
path: root/i3
diff options
context:
space:
mode:
authorTucker Evans <tuckerevans24@gmail.com>2018-03-11 21:55:17 -0400
committerTucker Evans <tuckerevans24@gmail.com>2018-03-11 21:55:17 -0400
commit06416b923f16b060aa4d68c5178fb9a823b291d5 (patch)
tree4dc1a209a05b1b1ec9e156346bd65757b64f158a /i3
parent9e3771d19c02892119be2140e7c8303ebd01041d (diff)
parent687a64c30fa70eb2a27cba09599c33a68b18d910 (diff)
Merge branch 'ursa_minor'
Diffstat (limited to 'i3')
-rw-r--r--i3/.config/i3/config6
-rw-r--r--i3/.config/i3status/config4
2 files changed, 3 insertions, 7 deletions
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 86f89dd..6af3601 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -160,6 +160,7 @@ bindsym $mod+r mode "resize"
bar {
status_command i3status
separator_symbol " | "
+ font pango: 3270Medium Nerd Font 14
# colors {
# background #414A59
# statusline #F5F6F7
@@ -188,13 +189,8 @@ 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
diff --git a/i3/.config/i3status/config b/i3/.config/i3status/config
index 36062e3..b4f4c36 100644
--- a/i3/.config/i3status/config
+++ b/i3/.config/i3status/config
@@ -64,7 +64,7 @@ disk "/" {
}
volume master {
- format = "♪: %volume"
- format_muted = "♪: muted (%volume)"
+ format = " %volume"
+ format_muted = " %volume"
device = "pulse:alsa_output.pci-0000_00_1f.3.analog-stereo"
}