Merge remote-tracking branch 'origin/master'

4 files changed, 23 insertions, 26 deletions

diff --git a/.config/polybar/config b/.config/polybar/config
index dcc032a..c4a3f26 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -37,7 +37,7 @@ margin-bottom = 5
 monitor = ${env:MONITOR:HDMI-0}
 ;monitor = ${env:MONITOR:eDP1}
 width = 100%
-height = 27
+height = 24
 bottom = false
 offset-x = 0%
 offset-y = 0%
@@ -74,7 +74,7 @@ font-5 = FontAwesome:size=26;7
 tray-position = left
 tray-padding = 2
 tray-transparent = false
-tray-background = ${colors.xcolor7}
+tray-background = ${colors.xcolor1}
 
 ; Module layouts
 modules-left = RightArrow2 i3 xwindow RightArrow1 RightStripe RightArrow1
@@ -98,7 +98,7 @@ modules-left = i3 xwindow RightArrow1 RightStripe RightArrow1
 
 [module/filesystem]
 type = internal/fs
-interval = 25
+interval = 5
 fixed-values = true
 
 mount-0 = /
@@ -107,6 +107,9 @@ mount-1 = /mnt/fileserver
 format-mounted = <label-mounted>
 format-mounted-foreground = ${colors.xcolor7}
 format-mounted-background = ${colors.xcolor1}
+format-unmounted = <label-unmounted>
+format-unmounted-foreground = ${colors.xcolor7}
+format-unmounted-background = ${colors.xcolor1}
 
 label-mounted = "%mountpoint%: %percentage_used%%"
 ; %free%% %percentage_used%% %used%
@@ -141,9 +144,9 @@ pin-workspaces = true
 enable-scroll = true
 
 label-focused = %index%
-label-focused-foreground = ${colors.xcolor7}
-label-focused-background = ${colors.xcolor1}
-label-focused-underline = 1
+label-focused-foreground = ${colors.xcolor1}
+label-focused-background = ${colors.xcolor7}
+label-focused-underline = ${colors.xcolor4}
 label-focused-padding = 2
 label-focused-font = 3
 label-unfocused = %index%
@@ -151,13 +154,13 @@ label-unfocused-padding = 2
 label-unfocused-foreground = ${colors.xcolor7}
 label-unfocused-background = ${colors.xcolor1}
 label-occupied = %index%
-label-occupied-foreground = ${colors.xcolor0}
-label-occupied-background = ${colors.xcolor1}
+label-occupied-foreground = ${colors.xcolor1}
+label-occupied-background = ${colors.xcolor7}
 label-occupied-padding = 2
 label-occupied-font = 3
 label-urgent = %index%
 label-urgent-foreground = ${colors.xcolor4}
-label-urgent-background = ${colors.xcolor1}
+label-urgent-background = ${colors.xcolor7}
 label-urgent-padding = 2
 label-urgent-font = 3
 label-empty = %index%
@@ -184,19 +187,12 @@ label-maxlen = 25
 [module/xbacklight]
 type = internal/xbacklight
 
-format = <label> <bar>
-label = BL
+format = <label>
+label = Backlight %percentage%%
 
-bar-width = 10
-bar-indicator = |
-bar-indicator-foreground = #ff
-bar-indicator-font = 2
-bar-fill = ─
-bar-fill-font = 2
-bar-fill-foreground = #9f78e1
-bar-empty = ─
-bar-empty-font = 2
-bar-empty-foreground = ${colors.foreground-alt}
+format-foreground = ${colors.xcolor1}
+format-background = ${colors.xcolor7}
+format-padding = 1
 
 [module/backlight-acpi]
 inherit = module/xbacklight
@@ -241,13 +237,12 @@ label = %date% %time%
 type = internal/battery
 ; To list battery & adapter: $ ls -1 /sys/class/power_supply/
 battery = BAT0
-adapter = AC0
-full-at = 99
+adapter = AC
 
 format-charging = <label-charging>
 format-charging-foreground = ${colors.xcolor7}
 format-charging-background = ${colors.xcolor1}
-format-discharging = <ramp-capacity> <label-discharging>
+format-discharging = <label-discharging>
 format-discharging-foreground = ${colors.xcolor7}
 format-discharging-background = ${colors.xcolor1}
 format-full = <label-full>
diff --git a/.gitconfig b/.gitconfig
index bd4dc31..f9e7362 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,6 @@
 [user]
 	email = dholman@gymli.org
-        name = Daniel Holman
+	name = Danny Holman
 
 [sendemail]
         smtpencryption = tls
diff --git a/.muttrc b/.muttrc
index 8d965cd..c9a5f30 100644
--- a/.muttrc
+++ b/.muttrc
@@ -17,7 +17,7 @@ set imap_keepalive = 300
 set mail_check = 120
 
 set record=+Sent
-set smtp_url=smtp://$imap_user:$imap_pass@mail.gymli.org
+set smtp_url="smtp://$imap_user:$imap_pass@mail.gymli.org:587"
 set realname=$my_name
 set from=$imap_user
 set ssl_force_tls = yes
diff --git a/.zshenv b/.zshenv
index 78d1c51..30d4e85 100644
--- a/.zshenv
+++ b/.zshenv
@@ -11,6 +11,7 @@ appendpath () {
 # Setup environment
 appendpath '/home/dholman/bin'
 appendpath '/home/dholman/.local/bin'
+appendpath '/home/dholman/.gem/ruby/2.6.0/bin'
 export PATH
 export EDITOR="vim"
 export SUDO_EDITOR="vim"
@@ -26,3 +27,4 @@ source /usr/share/git/completion/git-prompt.sh
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
 source /usr/lib/python3.7/site-packages/powerline/bindings/zsh/powerline.zsh
+source ~/.rvm/scripts/rvm