commit 4d4f6665924a0a9a15d6967521c22398fd4fd8c3
parent 14f5d11ba6e768adfa8cdaa92aa4fe7789cb29dc
Author: NicholasFarrow <nicholas.w.farrow@gmail.com>
Date: Sat, 14 Mar 2020 17:06:48 +1100
Polybar changes, new modules and my modules. Slight changes to i3 config and bashrc.
Diffstat:
4 files changed, 136 insertions(+), 319 deletions(-)
diff --git a/.bashrc b/.bashrc
@@ -122,7 +122,7 @@ export PATH=~/anaconda3/bin:$PATH
export PATH=/bin/lscript:/bin/lscript:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
export PATH=/bin/lscript:/bin/lscript:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
export PATH=/bin/lscript:/bin/lscript:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
-
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/
# MOUNT SEAGATE DRIVE
#sudo mount /dev/sda1 /media/sea
@@ -142,6 +142,7 @@ xrdb ~/.Xresources
# Load pywal theme
# Already done by luke's st fork
+#(cat ~/.cache/wal/sequences &)
(cat ~/.cache/wal/sequences &)
export SPLASH_DIR=$HOME/splash
diff --git a/.config/i3/config b/.config/i3/config
@@ -55,11 +55,13 @@ for_window [class=".*"] border pixel 0
# status_command ~/.config/i3/statusbar.sh
#}
-exec_always --no-startup-id $HOME/.config/polybar/launch.sh
+
+exec --no-startup-id pkill polybar; polybar -r example
+#exec_always --no-startup-id $HOME/.config/polybar/launch.sh
# Application Shortcuts
-bindsym $mod+F1 exec google-chrome-stable
+bindsym $mod+F1 exec brave #google-chrome-stable
bindsym $mod+F2 exec nautilus
bindsym $mod+F3 exec firefox
#bindsym $mod+F4
diff --git a/.config/polybar/config b/.config/polybar/config
@@ -1,218 +1,124 @@
-;==========================================================
-;
-;
-; ██████╗ ██████╗ ██╗ ██╗ ██╗██████╗ █████╗ ██████╗
-; ██╔══██╗██╔═══██╗██║ ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗
-; ██████╔╝██║ ██║██║ ╚████╔╝ ██████╔╝███████║██████╔╝
-; ██╔═══╝ ██║ ██║██║ ╚██╔╝ ██╔══██╗██╔══██║██╔══██╗
-; ██║ ╚██████╔╝███████╗██║ ██████╔╝██║ ██║██║ ██║
-; ╚═╝ ╚═════╝ ╚══════╝╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝
-;
-;
-; To learn more about how to configure Polybar
-; go to https://github.com/polybar/polybar
-;
-; The README contains a lot of information
-;
-;==========================================================
-
+;--------;
+; COLORS ;
+;--------;
[colors]
background = ${xrdb:color1:#222}
background-alt = #444
-;foreground = ${xrdb:color:#222}
foreground = #000000
foreground-alt = #000000
primary = ${xrdb:color3:#222}
secondary = ${xrdb:color14:#222}
-c1 = ${xrdb:color4:#222}
+c1 = ${xrdb:color4:#222}
c2 = ${xrdb:color5:#222}
c3 = ${xrdb:color6:#222}
c4 = ${xrdb:color7:#222}
-;c5 = ${xrdb:color10:#222}
-
+border-color = 0
+alert = #dd0000
-;primary = #000000
-;secondary = #ffffff
-alert = #bd2c40
[bar/example]
-monitor = ${env:MONITOR:}
+;------------;
+; DIMENSIONS ;
+;------------;
width = 100%
height = 27
-;offset-x = 1%
-;offset-y = 1%
+offset-y = 0
+offset-x = 0
radius = 10.0
-fixed-center = false
+border-size = 0
background = ${colors.background}
foreground = ${colors.foreground}
-
line-size = 6
line-color = #f00
-border-size = 0
-border-color = #00000000
-
-padding-left = 0
-padding-right = 2
-module-margin-left = 1
-module-margin-right = 2
+;----------;
+; LOCATION ;
+;----------;
+bottom = false
+monitor = ${env:MONITOR:}
-;font-0 = Inconsolata for Powerline:pixelsize=10;0
-font-0 = Inconsolata:style=Regular:size=12;
-;font-0 = misc fixed:pixelsize=10;1
+;-------;
+; FONTS ;
+;-------;
+font-0 = Inconsolata:style=Regular:size=14;
font-1 = unifont:fontformat=truetype:size=16:antialias=false;0
font-2 = siji:pixelsize=16;1
+font-3 = Font Awesome 5 Brands,Font Awesome 5 Brands Regular:style=Regular
+font-4 = Font Awesome 5 Free,Font Awesome 5 Free Regular:style=Regular
-modules-left = bspwm i3
-modules-center =
-modules-right = filesystem xbacklight alsa memory cpu wlan battery temperature date powermenu
-;modules-right = filesystem xbacklight alsa pulseaudio xkeyboard memory cpu wlan eth battery temperature date powermenu
-
-tray-position = right
-tray-padding = 2
-;tray-background = #0063ff
-
-;wm-restack = bspwm
-;wm-restack = i3
-
-;override-redirect = true
-
-;scroll-up = bspwm-desknext
-;scroll-down = bspwm-deskprev
-
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
-
-cursor-click = pointer
-cursor-scroll = ns-resize
-
-[module/xwindow]
-type = internal/xwindow
-label = %title:0:30:...%
-
-[module/xkeyboard]
-type = internal/xkeyboard
-blacklist-0 = num lock
-
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
-format-prefix-underline = ${colors.secondary}
-
-label-layout = %layout%
-label-layout-underline = ${colors.secondary}
-
-label-indicator-padding = 2
-label-indicator-margin = 1
-label-indicator-background = ${colors.secondary}
-label-indicator-underline = ${colors.secondary}
-
-[module/filesystem]
-type = internal/fs
-interval = 25
-
-mount-0 = /
+;---------------;
+; MISCELLANEOUS ;
+;---------------;
-label-mounted = %{F#000000}%mountpoint%%{F-}: %percentage_used%%
-label-unmounted = %mountpoint% not mounted
-label-unmounted-foreground = ${colors.foreground-alt}
-
-[module/bspwm]
-type = internal/bspwm
-
-label-focused = %index%
-label-focused-background = ${colors.background-alt}
-label-focused-underline= ${colors.primary}
-label-focused-padding = 2
-
-label-occupied = %index%
-label-occupied-padding = 2
-
-label-urgent = %index%!
-label-urgent-background = ${colors.alert}
-label-urgent-padding = 2
-
-label-empty = %index%
-label-empty-foreground = ${colors.foreground-alt}
-label-empty-padding = 2
-
-; Separator in between workspaces
-; label-separator = |
-
-[module/i3]
-type = internal/i3
-format = <label-state> <label-mode>
-index-sort = true
-wrapping-scroll = false
-
-; Only show workspaces on the same output as the bar
-;pin-workspaces = true
+fixed-center = true
+padding-left = 2
+padding-right = 2
+module-margin = 1.5
-label-mode-padding = 2
-label-mode-foreground = #000
-label-mode-background = ${colors.primary}
+modules-left = i3 crypto nordstat
+modules-center = optimusgfx
+modules-right = volume memory cpu wlan battery temperature date powermenu
-; focused = Active workspace on focused monitor
-label-focused = %index%
-label-focused-background = ${colors.background-alt}
-label-focused-underline= ${colors.primary}
-label-focused-padding = 2
+tray-position = none
+tray-detached = true
-; unfocused = Inactive workspace on any monitor
-label-unfocused = %index%
-label-unfocused-padding = 2
-; visible = Active workspace on unfocused monitor
-label-visible = %index%
-label-visible-background = ${self.label-focused-background}
-label-visible-underline = ${self.label-focused-underline}
-label-visible-padding = ${self.label-focused-padding}
+;---------;
+; MODULES ;
+;---------;
-; urgent = Workspace with urgency hint set
-label-urgent = %index%
-label-urgent-background = ${colors.alert}
-label-urgent-padding = 2
+[module/nordstat]
+type = custom/script
+exec = echo "VPN:`nordstat`"
+interval = 5
-; Separator in between workspaces
-; label-separator = |
+[module/crypto]
+type = custom/script
+exec = crypto
+interval = 60
+[module/optimusgfx]
+type = custom/script
+exec = optimus-manager --print-mode | grep mode | tr " " \\n | tail -1
+interval = 60
[module/mpd]
type = internal/mpd
-format-online = <label-song> <icon-prev> <icon-stop> <toggle> <icon-next>
-
-icon-prev =
-icon-stop =
-icon-play =
-icon-pause =
-icon-next =
-
+label-offline = mpd is offline
+format-online = <icon-prev> <toggle> <icon-next> <label-song>
+format-offline = <label-offline>
+host = 127.0.0.1
+port = 6600
+icon-prev =
+icon-stop =
+icon-play =
+icon-pause =
+icon-next =
label-song-maxlen = 25
label-song-ellipsis = true
+bar-progress-width = 10
+bar-progress-indicator = |
+bar-progress-fill = ─
+bar-progress-empty = ─
-[module/xbacklight]
-type = internal/xbacklight
-
-format = <label> <bar>
-label = BL
-
-bar-width = 10
-bar-indicator = |
-bar-indicator-foreground = #fff
-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}
+[module/volume]
+type = internal/alsa
+format-volume = VOL: <label-volume>
+format-muted = 🔈 0%
+ramp-volume-0 = 🔈
+ramp-volume-1 = 🔉
+ramp-volume-2 = 🔊
-[module/backlight-acpi]
-inherit = module/xbacklight
-type = internal/backlight
-card = intel_backlight
+[module/memory]
+type = internal/memory
+interval = 2
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = ${colors.c1}
+label = RAM: %percentage_used%%
[module/cpu]
type = internal/cpu
@@ -222,29 +128,18 @@ format-prefix-foreground = ${colors.foreground-alt}
format-underline = ${colors.c2}
label = CPU: %percentage:2%%
-[module/memory]
-type = internal/memory
-interval = 2
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
-format-underline = ${colors.c1}
-label = RAM: %percentage_used%%
-
[module/wlan]
type = internal/network
interface = wlp82s0
interval = 3.0
-
format-connected = <ramp-signal> <label-connected>
format-connected-underline = ${colors.c3}
label-connected = %essid%
-
format-disconnected =
;format-disconnected = <label-disconnected>
-format-disconnected-underline = ${#ff0000}
+format-disconnected-underline = #ff0000
;label-disconnected = %ifname% disconnected
;label-disconnected-foreground = ${colors.foreground-alt}
-
ramp-signal-0 =
ramp-signal-1 =
ramp-signal-2 =
@@ -252,157 +147,57 @@ ramp-signal-3 =
ramp-signal-4 =
ramp-signal-foreground = ${colors.foreground-alt}
-[module/eth]
-type = internal/network
-interface = enp0s31f6
-interval = 3.0
-
-format-connected-underline = #55aa55
-format-connected-prefix = " "
-format-connected-prefix-foreground = ${colors.foreground-alt}
-label-connected = %local_ip%
-
-format-disconnected =
-;format-disconnected = <label-disconnected>
-;format-disconnected-underline = ${self.format-connected-underline}
-;label-disconnected = %ifname% disconnected
-;label-disconnected-foreground = ${colors.foreground-alt}
-
-[module/date]
-type = internal/date
-interval = 5
-
-date =
-date-alt = " %Y-%m-%d"
-
-time = %H:%M
-time-alt = %H:%M:%S
-
-format-prefix =
-format-prefix-foreground = ${colors.foreground-alt}
-format-underline = ${xrdb:color6:#222}
-
-label = %date% %time%
-
-[module/pulseaudio]
-type = internal/pulseaudio
-
-format-volume = <label-volume> <bar-volume>
-label-volume = VOL %percentage%%
-label-volume-foreground = ${root.foreground}
-
-label-muted = 🔇 muted
-label-muted-foreground = #666
-
-bar-volume-width = 10
-bar-volume-foreground-0 = #55aa55
-bar-volume-foreground-1 = #55aa55
-bar-volume-foreground-2 = #55aa55
-bar-volume-foreground-3 = #55aa55
-bar-volume-foreground-4 = #55aa55
-bar-volume-foreground-5 = #f5a70a
-bar-volume-foreground-6 = #ff5555
-bar-volume-gradient = false
-bar-volume-indicator = |
-bar-volume-indicator-font = 2
-bar-volume-fill = ─
-bar-volume-fill-font = 2
-bar-volume-empty = ─
-bar-volume-empty-font = 2
-bar-volume-empty-foreground = ${colors.foreground-alt}
-
-[module/alsa]
-type = internal/alsa
-
-master-soundcard = default
-speaker-soundcard = default
-headphone-soundcard = default
-
-master-mixer = Master
-
-format-volume = <label-volume> <bar-volume>
-label-volume = VOL
-label-volume-foreground = ${colors.c2}
-
-format-muted-prefix = " "
-format-muted-foreground = ${colors.c2}
-label-muted = (mute)
-
-bar-volume-width = 10
-label-format-underline = ${colors.c1}
-
-bar-volume-foreground-0 = ${colors.c1}
-bar-volume-foreground-1 = ${colors.c1}
-bar-volume-foreground-2 = ${colors.c1}
-bar-volume-foreground-3 = ${colors.c2}
-bar-volume-foreground-4 = ${colors.c2}
-bar-volume-foreground-5 = ${colors.c3}
-bar-volume-foreground-6 = ${colors.c4}
-
-;bar-volume-foreground-0 = #55aa55
-;bar-volume-foreground-1 = #55aa55
-;bar-volume-foreground-2 = #55aa55
-;bar-volume-foreground-3 = #55aa55
-;bar-volume-foreground-4 = #55aa55
-;bar-volume-foreground-5 = #f5a70a
-;bar-volume-foreground-6 = #ff5555
-
-bar-volume-gradient = true
-bar-volume-indicator =
-bar-volume-indicator-font = 0
-bar-volume-fill = |
-bar-volume-fill-font = 0
-bar-volume-empty = ─
-bar-volume-empty-font = 2
-bar-volume-empty-foreground = ${colors.foreground-alt}
[module/battery]
type = internal/battery
battery = BAT0
adapter = AC
full-at = 98
-
format-charging = <animation-charging> <label-charging>
format-charging-underline = ${xrdb:color3:#222}
-
format-discharging = <animation-discharging> <label-discharging>
format-discharging-underline = ${self.format-charging-underline}
-
format-full-prefix = " "
format-full-prefix-foreground = ${colors.foreground-alt}
format-full-underline = ${self.format-charging-underline}
-
ramp-capacity-0 =
ramp-capacity-1 =
ramp-capacity-2 =
ramp-capacity-foreground = ${colors.foreground-alt}
-
animation-charging-0 =
animation-charging-1 =
animation-charging-2 =
animation-charging-foreground = ${colors.foreground-alt}
animation-charging-framerate = 750
-
animation-discharging-0 =
animation-discharging-1 =
animation-discharging-2 =
animation-discharging-foreground = ${colors.foreground-alt}
animation-discharging-framerate = 750
+[module/date]
+type = internal/date
+interval = 5
+date =
+date-alt = " %Y-%m-%d"
+time = %H:%M
+time-alt = %H:%M:%S
+format-prefix =
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = ${xrdb:color6:#222}
+label = %date% %time%
+
[module/temperature]
type = internal/temperature
thermal-zone = 0
warn-temperature = 80
-
format = <ramp> <label>
format-underline = ${xrdb:color4:#222}
format-warn = <ramp> <label-warn>
format-warn-underline = #ff0000
-
label = %temperature-c%
label-warn = %temperature-c%
label-warn-foreground = ${colors.secondary}
-
ramp-0 =
ramp-1 =
ramp-2 =
@@ -410,46 +205,64 @@ ramp-foreground = ${colors.foreground-alt}
[module/powermenu]
type = custom/menu
-
expand-right = true
-
format-spacing = 1
-
label-open =
-label-open-foreground = #000000
+label-open-foreground = #000000
label-close = cancel
label-close-foreground = ${colors.secondary}
label-separator = |
label-separator-foreground = ${colors.foreground-alt}
-
menu-0-0 = reboot
menu-0-0-exec = menu-open-1
menu-0-1 = power off
menu-0-1-exec = menu-open-2
menu-0-2 = hibernate
menu-0-2-exec = menu-open-3
-
menu-1-0 = cancel
menu-1-0-exec = menu-open-0
menu-1-1 = reboot
menu-1-1-exec = sudo reboot
-
menu-2-0 = power off
menu-2-0-exec = sudo poweroff
-
menu-3-0 = hibernate
menu-3-0-exec = sudo hibernate
-[settings]
-screenchange-reload = true
-;compositing-background = xor
-;compositing-background = screen
-;compositing-foreground = source
-;compositing-border = over
-;pseudo-transparency = false
-[global/wm]
-margin-top = 5
-margin-bottom = 5
+[module/i3]
+type = internal/i3
+format = <label-state> <label-mode>
+index-sort = true
+wrapping-scroll = false
+
+; Only show workspaces on the same output as the bar
+;pin-workspaces = true
+
+label-mode-padding = 2
+label-mode-foreground = #000
+label-mode-background = ${colors.primary}
+
+; focused = Active workspace on focused monitor
+label-focused = %index%
+label-focused-background = ${colors.background-alt}
+label-focused-underline= ${colors.primary}
+label-focused-padding = 2
+
+; unfocused = Inactive workspace on any monitor
+label-unfocused = %index%
+label-unfocused-padding = 2
+
+; visible = Active workspace on unfocused monitor
+label-visible = %index%
+label-visible-background = ${self.label-focused-background}
+label-visible-underline = ${self.label-focused-underline}
+label-visible-padding = ${self.label-focused-padding}
+
+; urgent = Workspace with urgency hint set
+label-urgent = %index%
+label-urgent-background = ${colors.alert}
+label-urgent-padding = 2
+
+; Separator in between workspaces
+; label-separator = |
-; vim:ft=dosini
diff --git a/.config/polybar/launch.sh b/.config/polybar/launch.sh
@@ -4,7 +4,8 @@
killall -q polybar
# Wait until the processes have been shut down
-while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
+#while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
+pkill polybar
# Launch Polybar, using default config location ~/.config/polybar/config
if type "xrandr"; then
