General updates

2 files changed, 110 insertions, 129 deletions

diff --git a/.config/i3/config b/.config/i3/config
index 4d53a3e..4b4263a 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -3,7 +3,7 @@
 set $mod Mod4
 
 # Default font
-font pango:xos4 Terminus 12
+font pango:Fira Code 12
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -112,21 +112,38 @@ mode "$mode_system" {
         bindsym Escape mode "default"
 }
 
-# Custom key maps
+# Resize windows
 bindsym $mod+Shift+k resize grow height 10 px or 10 ppt
 bindsym $mod+Shift+j resize shrink height 10 px or 10 ppt
 bindsym $mod+Shift+l resize grow width 10 px or 10 ppt
 bindsym $mod+Shift+h resize shrink width 10 px or 10 ppt
+
+# Volume
+bindsym $mod+Shift+greater exec --no-startup-id amixer sset Master 5%+
+bindsym $mod+Shift+less exec --no-startup-id amixer sset Master 5%-
+bindsym $mod+Shift+m exec --no-startup-id amixer sset Master toggle
 bindsym XF86AudioRaiseVolume exec --no-startup-id amixer sset Master 5%+
 bindsym XF86AudioLowerVolume exec --no-startup-id amixer sset Master 5%-
 bindsym XF86AudioMute exec --no-startup-id amixer sset Master toggle
+
+# Screen brightness
 bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 10%
 bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 10%
+
+# Screenshot
 bindsym $mod+Print exec --no-startup-id scrot
+
+# System menu
 bindsym $mod+Shift+s mode "$mode_system"
+
+# Cycle focused workspace
 bindsym $mod+Tab workspace next
 bindsym $mod+Shift+Tab workspace prev
 
+# Rofi binds
+bindsym $mod+Shift+w exec --no-startup-id "rofi -show window"
+bindsym $mod+Shift+p exec --no-startup-id "rofi-pass"
+
 # Gap stuff
 hide_edge_borders both
 new_window 1pixel
@@ -134,10 +151,9 @@ gaps inner 15
 gaps outer 15
 
 # Start helpful programs
-exec --no-startup-id wal -i "$HOME/Pictures/wal/"
-exec --no-startup-id redshift
+exec --no-startup-id wal -s -i "$HOME/Pictures/wal/"
 exec --no-startup-id xautolock -time 5 -locker "i3lock -c 000000"
-exec --no-startup-id compton
+exec --no-startup-id picom
 exec --no-startup-id tilda
 exec --no-startup-id polybar -r main0
 exec --no-startup-id polybar -r main1
diff --git a/.config/polybar/config b/.config/polybar/config
index fc50dab..12aa773 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -1,31 +1,15 @@
 ; Danny's Polybar config
 
 [colors]
-peach = #FFCD98
-lime = #CADC79
-salmon = #d97464
-darkgrey = #2e2e2e
-lightgrey = #444444
-alert = #bd2c40
-
-xcolor0 = ${xrdb:color0}
-xcolor1 = ${xrdb:color1}
-xcolor2 = ${xrdb:color2}
-xcolor3 = ${xrdb:color3}
-xcolor4 = ${xrdb:color4}
-xcolor5 = ${xrdb:color5}
-xcolor6 = ${xrdb:color6}
-xcolor7 = ${xrdb:color7}
-xcolor8 = ${xrdb:color8}
-xcolor9 = ${xrdb:color9}
-xcolor10 = ${xrdb:color10}
-xcolor11 = ${xrdb:color11}
-xcolor12 = ${xrdb:color12}
-xcolor13 = ${xrdb:color13}
-xcolor14 = ${xrdb:color14}
-xcolor15 = ${xrdb:color15}
-background = ${xrdb:background}
-foreground = ${xrdb:foreground}
+trans = #00000000
+white = #FFFFFF
+black = #000000
+
+bg = #341d63
+bg-alt = #05668d
+fg = #FFFFFF
+fg-alt = #A9ABB0
+urgent = #FF0000
 
 ; Global
 
@@ -37,54 +21,41 @@ margin-bottom = 5
 monitor = ${env:MONITOR:HDMI-0}
 ;monitor = ${env:MONITOR:eDP1}
 width = 100%
-height = 24
+height = 23
 bottom = false
 offset-x = 0%
 offset-y = 0%
 fixed-center = true
-background = ${colors.xcolor0}
-foreground = ${colors.xcolor1}
+line-size = 2
+background = ${colors.bg}
+foreground = ${colors.fg}
 
 overline-size = 0
-overline-color = ${colors.xcolor7}
+overline-color = ${colors.bg}
 underline-size = 2
-underline-color = ${colors.xcolor7}
-
-border-bottom-size = 0
-border-bottom-color = ${colors.xcolor7}
-border-top-size = 0
-border-top-color = ${colors.xcolor7}
-border-color-foreground = ${colors.peach}
+underline-color = ${colors.bg}
 
-spacing = 0
-padding-left = 0
-padding-right = 0
 module-margin-left = 0
 module-margin-right = 0
 
 ; Fonts
-font-0 = PowerlineSymbols:size=15;3
-font-1 = xos4 Terminus:size=12;1
-font-2 = FontAwesome:size=10;2
-font-3 = xos4 Terminus:size=18;0
-font-4 = Monospace:size=28;3
-font-5 = FontAwesome:size=26;7
+font-0 = "PowerlineSymbols:pixelsize=15;3"
+font-1 = "Fantasque Sans Mono:pixelsize=12;2"
 
 ; System tray
 tray-position = left
 tray-padding = 2
 tray-transparent = false
-tray-background = ${colors.xcolor1}
+tray-background = ${colors.bg-alt}
 
 ; Module layouts
 modules-left = RightArrow3 i3 RightArrow2 xwindow RightArrow1 RightStripe RightArrow1
 modules-center = RightStripe date LeftStripe
 modules-right = arrow1 LeftStripe arrow1 filesystem arrow2 alsa arrow3 cpu arrow2 memory arrow3 updates
 
-
 [bar/main1]
 inherit = bar/main0
-monitor = ${env:MONITOR:DVI-I-1}
+monitor = ${env:MONITOR:DVI-I-0}
 tray-position = none
 modules-left = i3 RightArrow2 xwindow RightArrow1 RightStripe RightArrow1
 
@@ -105,19 +76,19 @@ mount-0 = /
 mount-1 = /mnt/fileserver
 
 format-mounted = <label-mounted>
-format-mounted-foreground = ${colors.xcolor7}
-format-mounted-background = ${colors.xcolor1}
+format-mounted-foreground = ${colors.fg}
+format-mounted-background = ${colors.bg-alt}
 format-unmounted = <label-unmounted>
-format-unmounted-foreground = ${colors.xcolor7}
-format-unmounted-background = ${colors.xcolor1}
+format-unmounted-foreground = ${colors.fg}
+format-unmounted-background = ${colors.bg-alt}
 
 label-mounted = "%mountpoint%: %percentage_used%%"
 ; %free%% %percentage_used%% %used%
-label-mounted-foreground = ${colors.xcolor7}
-label-mounted-background = ${colors.xcolor1}
+label-mounted-foreground = ${colors.fg}
+label-mounted-background = ${colors.bg-alt}
 label-unmounted = %mountpoint%
-label-unmounted-foreground = ${colors.xcolor7}
-label-unmounted-background = ${colors.xcolor1}
+label-unmounted-foreground = ${colors.bg}
+label-unmounted-background = ${colors.fg}
 
 [module/alsa]
 type = internal/alsa
@@ -130,10 +101,10 @@ format-muted = <label-muted>
 label-volume = VOL %percentage%%
 label-muted = MUTED
 
-format-volume-foreground = ${colors.xcolor1}
-format-volume-background = ${colors.xcolor7}
-format-muted-foreground = ${colors.xcolor1}
-format-muted-background = ${colors.xcolor7}
+format-volume-foreground = ${colors.fg}
+format-volume-background = ${colors.bg}
+format-muted-foreground = ${colors.fg}
+format-muted-background = ${colors.bg}
 
 [module/i3]
 type = internal/i3
@@ -144,42 +115,39 @@ pin-workspaces = true
 enable-scroll = true
 
 label-focused = %index%
-label-focused-foreground = ${colors.xcolor1}
-label-focused-background = ${colors.xcolor7}
-label-focused-underline = ${colors.xcolor4}
+label-focused-foreground = ${colors.fg}
+label-focused-background = ${colors.bg}
+label-focused-underline = ${colors.fg}
 label-focused-padding = 2
-label-focused-font = 3
+label-focused-font = 1
 label-unfocused = %index%
 label-unfocused-padding = 2
-label-unfocused-foreground = ${colors.xcolor7}
-label-unfocused-background = ${colors.xcolor1}
+label-unfocused-foreground = ${colors.fg}
+label-unfocused-background = ${colors.bg}
 label-occupied = %index%
-label-occupied-foreground = ${colors.xcolor1}
-label-occupied-background = ${colors.xcolor7}
+label-occupied-foreground = ${colors.fg}
+label-occupied-background = ${colors.bg}
 label-occupied-padding = 2
-label-occupied-font = 3
 label-urgent = %index%
-label-urgent-foreground = ${colors.xcolor4}
-label-urgent-background = ${colors.xcolor7}
+label-urgent-foreground = ${colors.urgent}
+label-urgent-background = ${colors.bg}
 label-urgent-padding = 2
-label-urgent-font = 3
 label-empty = %index%
-label-empty-foreground = ${colors.xcolor0}
-label-empty-background = ${colors.xcolor1}
+label-empty-foreground = ${colors.bg}
+label-empty-background = ${colors.fg}
 label-empty-padding = 2
-label-empty-font = 3
 label-visible = %index%
 label-visible-background = ${self.label-focused-background}
 label-visible-underline = ${self.label-focused-underline}
 label-visible-padding = ${self.label-focused-padding}
-label-mode-foreground = ${colors.xcolor7}
-label-mode-background = ${colors.xcolor1}
+label-mode-foreground = ${colors.fg}
+label-mode-background = ${colors.bg}
 
 [module/xwindow]
 type = internal/xwindow
 
-format-foreground = ${colors.xcolor7}
-format-background = ${colors.xcolor1}
+format-foreground = ${colors.fg}
+format-background = ${colors.bg-alt}
 format-padding = 2
 label = %title%
 label-maxlen = 25
@@ -190,8 +158,8 @@ type = internal/xbacklight
 format = <label>
 label = Backlight %percentage%%
 
-format-foreground = ${colors.xcolor1}
-format-background = ${colors.xcolor7}
+format-foreground = ${colors.fg}
+format-background = ${colors.bg}
 format-padding = 1
 
 [module/backlight-acpi]
@@ -203,16 +171,16 @@ card = intel_backlight
 type = internal/cpu
 interval = 2
 format-prefix =
-format-foreground = ${colors.xcolor7}
-format-background = ${colors.xcolor1}
+format-foreground = ${colors.fg}
+format-background = ${colors.bg-alt}
 label = CPU %percentage%%
 
 [module/memory]
 type = internal/memory
 interval = 2
 format-prefix =
-format-foreground = ${colors.xcolor1}
-format-background = ${colors.xcolor7}
+format-foreground = ${colors.fg}
+format-background = ${colors.bg}
 format-margin-top = -5
 
 label = MEM %percentage_used%%
@@ -221,14 +189,11 @@ label = MEM %percentage_used%%
 type = internal/date
 interval = 1
 
-date = "%Y/%m/%d"
-date-alt = "%Y-%m-%d"
+date = "%m/%d/%Y"
+time = "%H:%M"
 
-time = %H:%M
-time-alt = " %I:%M:%S %p"
-
-format-foreground = ${colors.xcolor7}
-format-background = ${colors.xcolor1}
+format-foreground = ${colors.fg}
+format-background = ${colors.bg-alt}
 format-padding = 2
 
 label = %date% %time%
@@ -240,18 +205,18 @@ battery = BAT0
 adapter = AC
 
 format-charging = <label-charging>
-format-charging-foreground = ${colors.xcolor7}
-format-charging-background = ${colors.xcolor1}
+format-charging-foreground = ${colors.bg}
+format-charging-background = ${colors.fg}
 format-discharging = <label-discharging>
-format-discharging-foreground = ${colors.xcolor7}
-format-discharging-background = ${colors.xcolor1}
+format-discharging-foreground = ${colors.bg}
+format-discharging-background = ${colors.fg}
 format-full = <label-full>
-format-full-foreground = ${colors.xcolor7}
-format-full-background = ${colors.xcolor1}
+format-full-foreground = ${colors.bg}
+format-full-background = ${colors.fg}
 
 label-charging = "BAT %percentage%%"
 label-discharging = "BAT %percentage%%"
-label-discharging-foreground = ${colors.xcolor7}
+label-discharging-foreground = ${colors.bg}
 label-full = "Battery Full"
 
 ; Powerline
@@ -259,76 +224,76 @@ label-full = "Battery Full"
 [module/pipe]
 type = custom/text
 content = "|"
-content-foreground = ${colors.darkgrey}
-content-background = ${colors.xcolor0}
+content-foreground = ${colors.fg}
+content-background = ${colors.bg}
 content-padding = 1
 
 [module/LeftStripe]
 type = custom/text
 content = ""
-content-foreground = ${colors.xcolor0}
-content-background = ${colors.xcolor1}
+content-foreground = ${colors.bg}
+content-background = ${colors.bg-alt}
 
 [module/arrow1]
 type = custom/text
 content = ""
-content-foreground = ${colors.xcolor1}
-content-background = ${colors.xcolor0}
+content-foreground = ${colors.bg-alt}
+content-background = ${colors.bg}
 
 [module/arrow2]
 type = custom/text
 content = " "
-content-foreground = ${colors.xcolor7}
-content-background = ${colors.xcolor1}
+content-foreground = ${colors.bg}
+content-background = ${colors.bg-alt}
 
 [module/arrow3]
 type = custom/text
 content = " "
-content-foreground = ${colors.xcolor1}
-content-background = ${colors.xcolor7}
+content-foreground = ${colors.bg-alt}
+content-background = ${colors.bg}
 
 [module/RightStripe]
 type = custom/text
 content = ""
-content-foreground = ${colors.xcolor0}
-content-background = ${colors.xcolor1}
+content-foreground = ${colors.bg}
+content-background = ${colors.bg-alt}
 
 [module/RightArrow1]
 type = custom/text
 content = ""
-content-foreground = ${colors.xcolor1}
-content-background = ${colors.xcolor0}
+content-foreground = ${colors.bg-alt}
+content-background = ${colors.bg}
 
 [module/RightArrow2]
 type = custom/text
 content = ""
-content-foreground = ${colors.xcolor7}
-content-background = ${colors.xcolor1}
+content-foreground = ${colors.bg}
+content-background = ${colors.bg-alt}
 
 [module/RightArrow3]
 type = custom/text
 content = ""
-content-foreground = ${colors.xcolor1}
-content-background = ${colors.xcolor7}
+content-foreground = ${colors.bg-alt}
+content-background = ${colors.bg}
 
 [module/MiddleArrowLeft]
 type = custom/text
 content = "◥"
-content-foreground = ${colors.xcolor1}
-content-background = ${colors.xcolor0}
-;◥ ◤◢ ◣
+content-foreground = ${colors.fg}
+content-background = ${colors.bg}
+
 [module/MiddleArrowRight]
 type = custom/text
 content = "◢"
-content-foreground = ${colors.xcolor0}
-content-background = ${colors.xcolor1}
+content-foreground = ${colors.bg}
+content-background = ${colors.fg}
 
 [module/updates]
 type = custom/script
 exec = pacman -Qu | wc -l
 format = <label>
-format-foreground = ${colors.xcolor7}
-format-background = ${colors.xcolor1}
+format-foreground = ${colors.fg}
+format-background = ${colors.bg-alt}
 format-padding = 1
 label = Updates: %output%
 interval = 90