many changes

Signed-off-by: fbt <fbt@fleshless.org>
This commit is contained in:
Jack L. Frost 2017-06-13 16:03:45 +03:00
parent 1903d512a8
commit e87742f705
7 changed files with 54 additions and 11 deletions

View File

@ -48,7 +48,7 @@ bspc rule -a \* state=floating
# start some services
services=( sxhkd dunst )
services=( sxhkd dunst ssh-agent )
for s in "${services[@]}"; do
if ! service "$s" status; then
service "$s" start
@ -59,7 +59,6 @@ done
service moltenbar restart
nullexec browser &
nullexec terminal &
nullexec telegram &
nullexec dropbox &

View File

@ -41,6 +41,9 @@ super + {r,u,p}
super + z
ssm lockd lock
super + shift + z
ssm lockd toggle
Print
snap -f

View File

@ -136,7 +136,7 @@
startup_notification = true
# dmenu path.
dmenu = /usr/bin/dmenu -p dunst:
dmenu = /home/fbt/bin/dmenu-extras
#dmenu = /usr/bin/rofi -dmenu
# Browser for opening urls in context menu.

View File

@ -1 +0,0 @@
/home/fbt/git/moltenbar/mod

View File

@ -12,21 +12,23 @@ modules:
- bspwm_taskbar
- load_average
- network
- newmail
format: "<%= @panel_data['bspwm_pager'] %><%= @panel_data['bspwm_taskbar'] %>%{r}%{F<%= @config['colours']['bg_focused'] %>} %{F-}%{B<%= @config['colours']['bg_focused'] %>} New mail: <%= @panel_data['newmail'] %> LA: <%= @panel_data['load_average'] %> Network: <%= @panel_data['network'] %> <%= @panel_data['date'] %> %{B-}"
- memory
format: "<%= @panel_data['bspwm_pager'] %><%= @panel_data['bspwm_taskbar'] %>%{r}%{F<%= @config['colours']['bg_focused'] %>} %{F-}%{B<%= @config['colours']['bg_focused'] %>} LA: <%= @panel_data['load_average'] %> Mem (used): <%= @panel_data['memory'] %>% Internet: <%= @panel_data['network'] %> Warp: <%= @panel_data['warp'] %> <%= @panel_data['date'] %> %{B-}"
colours:
fg: '#f9f9f9'
fg_focused: '#f9f9f9'
bg: '#001f1f1f'
bg_focused: '#467EC2'
mon_focused: '#46C252'
# Module settings
mod:
bspwm_pager:
colour_focused: '#f9f9f9'
show_empty_desktops: false
show_single_monitor: false
#monitors:
# - "WMHDMI1"
# - "main"
blacklist:
-h
bspwm_taskbar:
@ -48,6 +50,14 @@ mod:
ok_colour: "#00FF00"
warn_colour: "#FFFF00"
crit_colour: "#FF0000"
warp:
hosts:
- malganis.priv
- spike.priv
- builder.virt
ok_colour: "#00FF00"
warn_colour: "#FFFF00"
crit_colour: "#FF0000"
newmail:
ok_message: "*"
ok_colour: "#00FF00"
@ -56,3 +66,9 @@ mod:
maildirs:
- /home/fbt/sync/maildir/.ops
- /home/fbt/sync/maildir/.inbox
memory:
ok_colour: "#00FF00"
warn_colour: "#FFFF00"
crit_colour: "#FF0000"
warn_value: 75
crit_value: 90

View File

@ -1,9 +1,30 @@
#!/usr/bin/env ssm
# vim: ft=sh
service_respawn='true'
service_command="$HOME/bin/lockd"
service_args=( i3lock-extra -s -o ~/pics/lock.png -g -p )
lock() {
function _lock {
kill -USR1 "$service_pid"
}
function lock {
status || {
start; sleep 1
"$0" "$service_name" lock
return "$?"
}
_lock
}
function toggle {
if status; then
out=$( "$0" "$service_name" stop 2>&1 )
notify-send "ssm" "$out"
else
out=$( "$0" "$service_name" start 2>&1 )
notify-send "ssm" "$out"
fi
}

View File

@ -4,5 +4,10 @@
[[ $PROXY_HOST ]] || PROXY_HOST='malganis.priv'
service_respawn=true
service_command='/usr/bin/ssh'
service_args=( -i ~/.ssh/proxy/id_ecdsa -ND 8080 "$PROXY_USER@$PROXY_HOST" )
service_command=( /usr/bin/ssh -i ~/.ssh/proxy/id_ecdsa -ND 8080 "$PROXY_USER@$PROXY_HOST" )
function info {
printf 'Name: %s\n' "$service_name"
printf 'Command: %s\n' "${service_command[*]}"
(( service_respawn )) && printf 'Respawn: yes\n'
}