Merge branch 'ursa_minor'

2 files changed, 36 insertions, 13 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
diff --git a/i3/.config/i3status/config b/i3/.config/i3status/config
index a291ae3..36062e3 100644
--- a/i3/.config/i3status/config
+++ b/i3/.config/i3status/config
@@ -7,10 +7,9 @@
 # If the above line is not correctly displayed, fix your editor first!
 
 general {
-        colors = true
-        interval = 5
-#color_good = "#5294E2"
-#	color_bad = "#CC575D"
+	colors = true
+	interval = 5
+	output_format = i3bar
 }
 
 order += "ipv6"
@@ -20,33 +19,48 @@ order += "ethernet _first_"
 order += "volume master"
 order += "battery all"
 order += "load"
+order += "cpu_temperature 0"
 order += "tztime local"
+order += "tztime utc"
+
+ipv6 {
+	format_up = "%ip"
+	format_down = ""
+}
 
 wireless _first_ {
-        format_up = "W: (%quality at %essid) %ip"
-        format_down = "W: down"
+	format_up = "W:%quality %ip"
+	format_down = "W: down"
 }
 
 ethernet _first_ {
-        # if you use %speed, i3status requires root privileges
-        format_up = "E: %ip (%speed)"
-        format_down = "E: down"
+	# if you use %speed, i3status requires root privileges
+	format_up = "E: %ip %speed"
+	format_down = "E: down"
 }
 
 battery all {
-        format = "%status %percentage %remaining"
+	format = "%status %percentage"
+}
+tztime utc {
+	format = "UTC: %H:%M"
+	timezone = "Etc/UTC"
 }
 
 tztime local {
-        format = "%Y-%m-%d %H:%M:%S"
+	format = "EST: %Y-%m-%d %H:%M:%S"
 }
 
 load {
-        format = "%1min"
+	format = "%1min"
+}
+cpu_temperature 0 {
+	format = "%degrees C"
+	path ="/sys/devices/platform/coretemp.0/hwmon/hwmon1/temp1_input"
 }
 
 disk "/" {
-        format = "%avail"
+	format = "%avail"
 }
 
 volume master {