Large update, remove old scripts & gorice, merge some together

This commit is contained in:
natemaia
2018-02-05 19:31:56 -08:00
parent 9718b4bd71
commit f041702ae0
77 changed files with 1704 additions and 3307 deletions

View File

@ -17,7 +17,7 @@ inherit = bar/master
; Use $ xrandr -q | grep " connected" | cut -d ' ' -f1
monitor =
modules-left = jgmenu config workspaces
modules-left = jgmenu workspaces
modules-center = window_switch clock
modules-right = pkg memory temperature coreuse network volume
@ -44,7 +44,7 @@ inherit = bar/master
; Use $ xrandr -q | grep " connected" | cut -d ' ' -f1
monitor =
modules-left = jgmenu config i3 menu
modules-left = jgmenu i3 menu
modules-center = clock
modules-right = pkg memory temperature coreuse network volume

View File

@ -5,61 +5,61 @@
[colors]
background = #2b303b
foreground = #c0c5ce
moderate = #ebcb8b
urgent = #bf616a
trim = #8fa1b3
blue = #8fa1b3
pink = #bf616a
orange = #ebcb8b
purple = #b48ead
yellow = #ebcb8b
border = #c0c5ce
moderate = #ebcb8b
urgent = #bf616a
trim = #8fa1b3
blue = #8fa1b3
pink = #bf616a
orange = #ebcb8b
purple = #b48ead
yellow = #ebcb8b
border = #c0c5ce
[settings]
throttle-output = 5
throttle-output-for = 10
throttle-input-for = 30
throttle-output = 5
throttle-output-for = 10
throttle-input-for = 30
compositing-background = source
compositing-foreground = source
compositing-overline = source
compositing-underline = source
compositing-border = source
screenchange-reload = true
format-foreground = ${colors.foreground}
format-background = ${colors.background}
compositing-overline = source
compositing-underline = source
compositing-border = source
screenchange-reload = true
format-foreground = ${colors.foreground}
format-background = ${colors.background}
;=====================================================
; Master Bar
;=====================================================
[bar/master]
width = 100%
height = 24
border-size = 0
border-top-size = 0
border-bottom-size = 2
radius = 0
bottom = false
line-size = 2
font-0 = "DejaVu Sans Mono:size=10:antialias=false;2"
font-1 = "FontAwesome:size=10:antialias=false;2"
font-2 = "MaterialIcons:size=10:antialias=false;2"
font-3 = "icomoon:size=10:antialias=false;2"
font-4 = "Ubuntu Nerd Font:size=10:antialias=false;2"
offset-x = 0
offset-y = 0
fixed-center = true
border-color = ${colors.border}
background = ${colors.background}
foreground = ${colors.foreground}
module-margin = 0
padding-right = 0
padding-left = 0
separator = │
scroll-up = pamixer -i 2
scroll-down = pamixer -d 2
click-middle = skippy-xd --activate-window-picker
double-click-left = networkmanager_dmenu
width = 100%
height = 24
border-size = 0
border-top-size = 0
border-bottom-size = 2
radius = 0
bottom = false
line-size = 2
font-0 = "DejaVu Sans Mono:size=10:antialias=false;2"
font-1 = "FontAwesome:size=10:antialias=false;2"
font-2 = "MaterialIcons:size=10:antialias=false;2"
font-3 = "icomoon:size=10:antialias=false;2"
font-4 = "Ubuntu Nerd Font:size=10:antialias=false;2"
offset-x = 0
offset-y = 0
fixed-center = true
border-color = ${colors.border}
background = ${colors.background}
foreground = ${colors.foreground}
module-margin = 0
padding-right = 0
padding-left = 0
separator = │
scroll-up = pamixer -i 2
scroll-down = pamixer -d 2
click-middle = skippy-xd --activate-window-picker
double-click-left = networkmanager_dmenu
double-click-middle = skippy-xd --activate-window-picker
double-click-right = pavucontrol &
double-click-right = pavucontrol &

View File

@ -1,65 +0,0 @@
;=====================================================
; Colors & Settings
;=====================================================
[colors]
background = {{.Data.bar_background}}
foreground = {{.Data.terminal_foreground}}
moderate = {{index .Data.terminal_colors 3}}
urgent = {{index .Data.terminal_colors 1}}
trim = {{index .Data.terminal_colors 4}}
blue = {{index .Data.terminal_colors 4}}
pink = {{index .Data.terminal_colors 1}}
orange = {{index .Data.terminal_colors 3}}
purple = {{index .Data.terminal_colors 5}}
yellow = {{index .Data.terminal_colors 3}}
border = {{.Data.border_color}}
[settings]
throttle-output = 5
throttle-output-for = 10
throttle-input-for = 30
compositing-background = source
compositing-foreground = source
compositing-overline = source
compositing-underline = source
compositing-border = source
screenchange-reload = true
format-foreground = ${colors.foreground}
format-background = ${colors.background}
;=====================================================
; Master Bar
;=====================================================
[bar/master]
width = {{.Data.bar_width}}
height = {{.Data.bar_height}}
border-size = {{.Data.border_all}}
border-top-size = {{.Data.border_top}}
border-bottom-size = {{.Data.border_bottom}}
radius = {{.Data.bar_radius}}
bottom = {{.Data.bar_bottom}}
line-size = {{.Data.border_pixels}}
font-0 = "{{.Data.bar_font0}}"
font-1 = "FontAwesome:size=10:antialias=false;2"
font-2 = "MaterialIcons:size=10:antialias=false;2"
font-3 = "icomoon:size=10:antialias=false;2"
font-4 = "Ubuntu Nerd Font:size=10:antialias=false;2"
offset-x = 0
offset-y = 0
fixed-center = true
border-color = ${colors.border}
background = ${colors.background}
foreground = ${colors.foreground}
module-margin = 0
padding-right = 0
padding-left = 0
separator = │
scroll-up = pamixer -i 2
scroll-down = pamixer -d 2
click-middle = skippy-xd --activate-window-picker
double-click-left = networkmanager_dmenu
double-click-middle = skippy-xd --activate-window-picker
double-click-right = pavucontrol &

View File

@ -6,28 +6,13 @@
;; Jgmenu ;;
;;;;;;;;;;;;;;;
[module/jgmenu]
type = custom/script
label = %output%
type = custom/script
label = %output%
label-padding = 2
interval = 10
exec = echo ""
click-left = "jgmenu_run >/dev/null 2>&1 &"
click-right = exo-open $HOME/.config/jgmenu/jgmenurc
;;;;;;;;;;;;;;;;;;;;;;;;
;; GoRice Config UI ;;
;;;;;;;;;;;;;;;;;;;;;;;;
[module/config]
type = custom/script
interval = 5
label = %output%
format-padding = 1
format = <label>
click-right = termite "--exec=gorice edit i3/current" &
click-left = gorice dump i3 ~/.gorice/output.yaml.template; config_ui &
exec = echo ""
;exec = grep "current" data.json | cut -d '"' -f22 | cut -d . -f1 | cut -d / -f2 | tr '[:lower:]' '[:upper:]'
interval = 10
exec = echo ""
click-left = "jgmenu_run >/dev/null 2>&1 &"
click-right = exo-open $HOME/.config/jgmenu/jgmenurc
;;;;;;;;;;;;;;;;;;;;;;;;
@ -36,8 +21,8 @@ exec = echo ""
[module/workspaces]
type = internal/xworkspaces
pin-workspaces = false
enable-click = true
enable-scroll = true
enable-click = true
enable-scroll = true
format-padding = 0
icon-0 = 1;
icon-1 = 2;
@ -51,20 +36,20 @@ icon-8 = 9;
icon-9 = 10;
icon-default =
format = <label-state>
label-active = %icon% %name%
label-active = %icon% %name%
label-occupied = %icon% %name%
label-urgent = %icon% %name%
label-empty = %icon% %name%
label-occupied-padding = 1
label-empty-padding = 1
label-urgent-padding = 1
label-active-padding = 1
label-active-foreground = ${colors.blue}
label-active-underline = ${colors.blue}
label-urgent = %icon% %name%
label-empty = %icon% %name%
label-occupied-padding = 1
label-empty-padding = 1
label-urgent-padding = 1
label-active-padding = 1
label-active-foreground = ${colors.blue}
label-active-underline = ${colors.blue}
label-occupied-underline = ${colors.blue}
label-urgent-foreground = ${colors.urgent}
label-urgent-underline = ${colors.urgent}
label-empty-foreground = ${colors.foreground}
label-urgent-foreground = ${colors.urgent}
label-urgent-underline = ${colors.urgent}
label-empty-foreground = ${colors.foreground}
;;;;;;;;;;;;;;;;;;;
@ -95,18 +80,17 @@ label-visible-underline = ${colors.trim}
label-urgent-underline = ${colors.urgent}
;;;;;;;;;;;;;;;;;;;;
;;Bspwm Workspaces;;
;;;;;;;;;;;;;;;;;;;;
[module/bspwm]
type = internal/bspwm
pin-workspaces = true
inline-mode = false
enable-click = true
enable-scroll = false
inline-mode = false
enable-click = true
enable-scroll = false
reverse-scroll = false
fuzzy-match = false
fuzzy-match = false
; ws-icon-[0-9]+ = label;icon
; Note that the label needs to correspond with the bspwm workspace name
ws-icon-0 = I;
@ -120,7 +104,6 @@ ws-icon-7 = VIII;
ws-icon-8 = IX;
ws-icon-9 = X;
;ws-icon-default = ♟
format = <label-state> <label-mode>
label-monitor = %name%
label-mode-padding = 1
@ -140,7 +123,6 @@ label-focused-underline = ${colors.blue}
label-occupied-underline = ${colors.purple}
label-urgent-foreground = ${colors.urgent}
label-urgent-underline = ${colors.urgent}
; The following labels will be used to indicate the layout/mode
; for the focused workspace. Requires <label-mode>
label-monocle = 
@ -156,17 +138,16 @@ label-locked-foreground = ${colors.yellow}
label-private-foreground = ${colors.urgent}
;;;;;;;;;;;;;
;; Network ;;
;;;;;;;;;;;;;
[module/network]
type = custom/script
exec = check-network
click-left = networkmanager_dmenu &
click-right = networkmanager_dmenu &
click-left = networkmanager_dmenu &
click-right = networkmanager_dmenu &
label-padding = 1
tail = true
tail = true
;;;;;;;;;;;;;;;;;;;
@ -174,12 +155,12 @@ tail = true
;;;;;;;;;;;;;;;;;;;
[module/window_switch]
type = custom/script
interval = 5
label = %output%
click-left = skippy-xd
interval = 5
label = %output%
click-left = skippy-xd
click-right = skippy-xd
exec = echo "  "
format = <label>
exec = echo "  "
format = <label>
;;;;;;;;;
@ -187,10 +168,10 @@ format = <label>
;;;;;;;;;
[module/coreuse]
type = internal/cpu
interval = 1
format-padding = 1
format = <label><ramp-coreload>
label = %{A1:termite --exec=htop & disown:} %percentage%% %{A}
interval = 1
format-padding = 1
format = <label><ramp-coreload>
label = %{A1:termite --exec=htop & disown:} %percentage%% %{A}
ramp-coreload-0 = ▂
ramp-coreload-1 = ▃
ramp-coreload-2 = ▄
@ -209,33 +190,33 @@ ramp-coreload-5-foreground = ${colors.urgent}
;; MEM ;;
;;;;;;;;;
[module/memory]
type = internal/memory
interval = 3
format = <label>
type = internal/memory
interval = 3
format = <label>
label-padding = 1
label = %{A1:termite --exec=htop & disown:} %percentage_used%%%{A}
label = %{A1:termite --exec=htop & disown:} %percentage_used%%%{A}
;;;;;;;;;
;; PKG ;;
;;;;;;;;;
[module/pkg]
type = custom/script
exec = check-updates
type = custom/script
exec = updates.sh
exec-if = "ping -q -w 2 -c 1 176.34.135.167 > /dev/null"
label = %{A1:termite --exec=pacli & disown:} %{A3:termite --exec=pacli & disown:}%output%%{A} %{A}
tail = true
label = %{A1:termite --exec=pacli & disown:} %{A3:termite --exec=pacli & disown:}%output%%{A} %{A}
tail = true
;;;;;;;;;;;
;; Clock ;;
;;;;;;;;;;;
[module/clock]
type = internal/date
format = <label>
type = internal/date
format = <label>
lebel-padding = 1
interval = 5
time = %R
interval = 5
time = %R
label = %{A1:gsimplecal & disown:} %{A3:gsimplecal & disown:} %time%%{A} %{A}
@ -244,22 +225,22 @@ label = %{A1:gsimplecal & disown:} %{A3:gsimplecal & disown:} %time%%{A} %{A}
;;;;;;;;;;;;;;;;;
[module/temperature]
type = internal/temperature
interval = 3
thermal-zone = 0
interval = 3
thermal-zone = 0
warn-temperature = 70
format = <ramp><label>
format-padding = 1
format = <ramp><label>
format-padding = 1
label = %{A1:termite --exec='watch sensors' & disown:} %temperature%%{A}
ramp-0 = ""
ramp-1 = ""
ramp-2 = ""
ramp-3 = ""
ramp-0-foreground = ${colors.blue}
ramp-1-foreground = ${colors.pink}
ramp-2-foreground = ${colors.purple}
ramp-3-foreground = ${colors.urgent}
format-warn = <label-warn>
label-warn = " %temperature%"
ramp-0-foreground = ${colors.blue}
ramp-1-foreground = ${colors.pink}
ramp-2-foreground = ${colors.purple}
ramp-3-foreground = ${colors.urgent}
format-warn = <label-warn>
label-warn = " %temperature%"
label-warn-padding = 1
label-warn-foreground = ${colors.urgent}
@ -292,7 +273,7 @@ ramp-volume-3-foreground = ${colors.urgent}
[module/battery]
type = internal/battery
; Use $ ls -1 /sys/class/power_supply/
battery = BAT1
battery = BAT0
adapter = AC
full-at = 98
poll-interval = 5
@ -374,34 +355,34 @@ menu-3-3-exec = systemctl poweroff
;;;;;;;;;;;;;;;;;;;;
[module/compton_toggle]
type = custom/script
tail = true
label = %output%
click-left = toggle-compton --toggle &
exec = toggle-compton
format = <label>
tail = true
label = %output%
click-left = toggle.sh -c -tg &
exec = toggle.sh -c
format = <label>
;;;;;;;;;;;;;;;
;; KEYBOARD ;;
;;;;;;;;;;;;;;;
[module/keyboard]
type = internal/xkeyboard
blacklist-0 = num lock
blacklist-1 = scroll lock
format = <label-layout>
type = internal/xkeyboard
blacklist-0 = num lock
blacklist-1 = scroll lock
format = <label-layout>
format-padding = 1
label-layout = %{A1:mintlocale & disown:} %{A3:mintlocale & disown:} %layout%%{A} %{A}
label-layout = %{A1:mintlocale & disown:} %{A3:mintlocale & disown:} %layout%%{A} %{A}
;;;;;;;;;;;;;;
;; ETHERNET ;;
;;;;;;;;;;;;;;
[module/wired-network]
type = internal/network
interface =
format-connected = <label-connected>
type = internal/network
interface =
format-connected = <label-connected>
format-disconnected = <label-disconnected>
label-connected =  %local_ip%
label-connected =  %local_ip%
format-connected-foreground = ${colors.purple}
@ -409,24 +390,24 @@ format-connected-foreground = ${colors.purple}
;; REDSHIFT ;;
;;;;;;;;;;;;;;
[module/redshift]
type = custom/script
tail = true
exec = toggle-redshift
label = %output%
click-left = toggle-redshift --toggle &
type = custom/script
tail = true
exec = toggle.sh -r
label = %output%
click-left = toggle.sh -r -tg &
;;;;;;;;;;;;;;;;
;; FILESYSTEM ;;
;;;;;;;;;;;;;;;;
[module/filesystem]
type = internal/fs
type = internal/fs
format-mounted = <label-mounted>
label-mounted = %mountpoint% : %percentage_free%%
mount-0 = /
interval = 1200
fixed-values = false
spacing = 2
label-mounted = %mountpoint% : %percentage_free%%
mount-0 = /
interval = 1200
fixed-values = false
spacing = 2
label-mounted-foreground = ${colors.yellow}
@ -435,27 +416,27 @@ label-mounted-foreground = ${colors.yellow}
;;;;;;;;;
[module/mpd]
type = internal/mpd
format-online = <bar-progress> <icon-prev> <icon-stop> <toggle> <icon-next> <label-song>
format-offline = <label-offline>
bar-progress-format = %{+o +u}%fill%%{-o -u}%indicator%%{+o +u}%empty%%{-u -o}
label-offline = mpd is off
format-online = <bar-progress> <icon-prev> <icon-stop> <toggle> <icon-next> <label-song>
format-offline = <label-offline>
bar-progress-format = %{+o +u}%fill%%{-o -u}%indicator%%{+o +u}%empty%%{-u -o}
label-offline = mpd is off
format-online-prefix = " "
icon-play = 
icon-pause = 
icon-stop = 
icon-prev = 
icon-next = 
icon-play = 
icon-pause = 
icon-stop = 
icon-prev = 
icon-next = 
icon-random = 
icon-repeat = 
toggle-on-foreground =
toggle-off-foreground = #55
bar-progress-width = 35
toggle-on-foreground =
toggle-off-foreground = #55
bar-progress-width = 35
bar-progress-indicator = █
bar-progress-fill = █
bar-progress-empty = ▒
bar-progress-empty-font = 2
bar-progress-indicator-font = 2
bar-progress-fill-font = 2
bar-progress-empty-font = 2
bar-progress-indicator-font = 2
bar-progress-fill-font = 2
bar-progress-fill-foreground = #bb
bar-progress-empty-foreground = #44
bar-progress-indicator-foreground = #A85659