Merge branch 'work'
Conflicts: - .config/dunst/dunstrc - .config/i3/config - .local/bin/fuzzy-i3lock
This commit is contained in:
commit
2a8c0dc667
5 changed files with 108 additions and 67 deletions
|
@ -6,7 +6,7 @@
|
|||
history_length = 100
|
||||
corner_radius = 5
|
||||
ignore_dbusclose = true
|
||||
timeout = 30
|
||||
timeout = 0
|
||||
background = "#333333"
|
||||
frame_color = "#009900"
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ bindsym $mod+Shift+Return exec i3-sensible-editor
|
|||
bindsym $mod+Print exec scrot ~/tmp/screenshots/'%Y-%m-%d_%H:%M:%S_$wx$h.png'
|
||||
|
||||
# lock screen
|
||||
bindsym $mod+Shift+l exec fuzzy-i3lock
|
||||
bindsym $mod+Shift+l exec fuzzy-i3lock 37c3
|
||||
|
||||
# kill focused window
|
||||
bindsym $mod+Shift+q kill
|
||||
|
@ -157,8 +157,8 @@ client.focused #000000 #009900 #ffffff #ff0000
|
|||
client.unfocused #000000 #005500 #000000 #ff0000
|
||||
|
||||
# use variables for screens
|
||||
set $screen0 "DP-1"
|
||||
set $screen1 "HDMI-2"
|
||||
set $screen0 "eDP-1"
|
||||
set $screen1 "HDMI-A-2"
|
||||
|
||||
# Start i3bar to display a workspace bar (plus the system information
|
||||
# i3status-rust finds out, if available)
|
||||
|
@ -197,5 +197,3 @@ bar {
|
|||
#client.orientation #ff0000
|
||||
}
|
||||
}
|
||||
|
||||
include ~/.config/i3/config.d/*.conf
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[icons]
|
||||
icons = "awesome"
|
||||
icons = "awesome4"
|
||||
|
||||
[theme]
|
||||
theme = "solarized-dark"
|
||||
|
@ -11,90 +11,131 @@ separator = "|"
|
|||
separator_fg = "#00cc00"
|
||||
separator_bg = "#222222"
|
||||
|
||||
[[block]]
|
||||
block = "maildir"
|
||||
interval = 15
|
||||
inboxes = ["/home/finga/mail/onders.org/Inbox", "/home/finga/mail/chaostreff.at/Inbox"]
|
||||
display_type = "new"
|
||||
|
||||
[[block]]
|
||||
block = "weather"
|
||||
format = "$weather $temp, $humidity, $wind m/s $direction"
|
||||
format = " $icon $weather $temp, $humidity, $wind m/s $direction "
|
||||
service = { name = "openweathermap", api_key = "8271cc3c23dbae82eda2123c55c050be", city_id = "2766824", units = "metric" }
|
||||
|
||||
[[block]]
|
||||
block = "sound"
|
||||
driver = "pulseaudio"
|
||||
|
||||
[[block]]
|
||||
block = "music"
|
||||
format = "$combo.rot-str(30) $play"
|
||||
player = "mpd"
|
||||
block = "net"
|
||||
device = "br0"
|
||||
format = " $icon $ip $graph_down $speed_down^icon_net_down $graph_up $speed_up^icon_net_up "
|
||||
|
||||
[[block]]
|
||||
block = "net"
|
||||
device = "enp0s31f6"
|
||||
format = "$ip $graph_down $speed_down $graph_up $speed_up"
|
||||
format = " $icon $ip $graph_down $speed_down $graph_up $speed_up "
|
||||
|
||||
# [[block]]
|
||||
# block = "disk_space"
|
||||
# path = "/"
|
||||
# info_type = "used"
|
||||
# format = "{path} {percentage}"
|
||||
[[block]]
|
||||
block = "net"
|
||||
device = "tn0"
|
||||
format = " $icon $ip $graph_down $speed_down^icon_net_down $graph_up $speed_up^icon_net_up "
|
||||
|
||||
# [[block]]
|
||||
# block = "disk_space"
|
||||
# path = "/home"
|
||||
# info_type = "used"
|
||||
# format = "{path} {percentage}"
|
||||
[[block]]
|
||||
block = "net"
|
||||
format = " $icon {$signal_strength $ssid $frequency via $device| x} "
|
||||
|
||||
# [[block]]
|
||||
# block = "disk_space"
|
||||
# path = "/var"
|
||||
# info_type = "used"
|
||||
# warning = 20.0
|
||||
# format = "{path} {percentage}"
|
||||
[[block]]
|
||||
block = "disk_space"
|
||||
path = "/"
|
||||
warning = 80.0
|
||||
alert = 90.0
|
||||
info_type = "used"
|
||||
format = " $icon $path $percentage "
|
||||
|
||||
# [[block]]
|
||||
# block = "disk_space"
|
||||
# path = "/tmp"
|
||||
# info_type = "used"
|
||||
# format = "{path} {percentage}"
|
||||
[[block]]
|
||||
block = "disk_space"
|
||||
path = "/boot"
|
||||
warning = 75.0
|
||||
alert = 85.0
|
||||
info_type = "used"
|
||||
format = " $icon $path $percentage "
|
||||
|
||||
[[block]]
|
||||
block = "disk_space"
|
||||
path = "/home"
|
||||
warning = 80.0
|
||||
alert = 87.0
|
||||
info_type = "used"
|
||||
format = " $icon $path $percentage "
|
||||
|
||||
[[block]]
|
||||
block = "disk_space"
|
||||
path = "/tmp"
|
||||
warning = 75.0
|
||||
alert = 80.0
|
||||
info_type = "used"
|
||||
format = " $icon $path $percentage "
|
||||
|
||||
[[block]]
|
||||
block = "disk_space"
|
||||
path = "/var"
|
||||
warning = 80.0
|
||||
alert = 90.0
|
||||
info_type = "used"
|
||||
format = " $icon $path $percentage "
|
||||
|
||||
[[block]]
|
||||
block = "disk_space"
|
||||
path = "/var/lib/machines"
|
||||
warning = 80.0
|
||||
alert = 90.0
|
||||
info_type = "used"
|
||||
format = " $icon nspawn $percentage "
|
||||
|
||||
[[block]]
|
||||
block = "disk_space"
|
||||
path = "/var/lib/libvirt/images"
|
||||
warning = 80.0
|
||||
alert = 90.0
|
||||
info_type = "used"
|
||||
format = " $icon libvirt $percentage "
|
||||
|
||||
[[block]]
|
||||
block = "disk_space"
|
||||
path = "/share/backup"
|
||||
warning = 85.0
|
||||
alert = 90.0
|
||||
info_type = "used"
|
||||
format = " $icon backup $percentage "
|
||||
|
||||
[[block]]
|
||||
block = "memory"
|
||||
display_type = "memory"
|
||||
format_mem = "$mem_total_used_percents.eng(3)"
|
||||
clickable = false
|
||||
format = " $icon $mem_used_percents.eng(w:3) "
|
||||
|
||||
[[block]]
|
||||
block = "memory"
|
||||
display_type = "swap"
|
||||
format_swap = "$swap_used_percents.eng(3)"
|
||||
clickable = false
|
||||
format = " $icon_swap $swap_used_percents.eng(w:3) "
|
||||
|
||||
[[block]]
|
||||
block = "cpu"
|
||||
interval = 1
|
||||
format = "$barchart $utilization $frequency.eng(4)"
|
||||
format = " $icon $barchart $utilization $frequency.eng(w:4) "
|
||||
|
||||
[[block]]
|
||||
block = "temperature"
|
||||
collapsed = false
|
||||
format = "$min min, $max max, $average avg"
|
||||
chip = "*-isa-*"
|
||||
format = " $icon $min min, $max max, $average avg "
|
||||
|
||||
[[block]]
|
||||
block = "load"
|
||||
format = "$1m.eng(4) $5m.eng(4) $15m.eng(4)"
|
||||
format = " $icon $1m.eng(w:4) $5m.eng(w:4) $15m.eng(w:4) "
|
||||
|
||||
[[block]]
|
||||
block = "battery"
|
||||
format = "$percentage $time"
|
||||
|
||||
[[block]]
|
||||
block = "time"
|
||||
interval = 1
|
||||
format = "%F (%Z) %T"
|
||||
format = " $icon $timestamp.datetime(f:'%F (%Z) %T') "
|
||||
timezone = "Europe/Vienna"
|
||||
|
||||
[[block]]
|
||||
block = "time"
|
||||
interval = 1
|
||||
format = "(%Z) %T"
|
||||
format = " $icon $timestamp.datetime(f:'(%Z) %T') "
|
||||
timezone = "Etc/UTC"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[icons]
|
||||
icons = "awesome"
|
||||
icons = "awesome4"
|
||||
|
||||
[theme]
|
||||
theme = "solarized-dark"
|
||||
|
@ -13,45 +13,40 @@ separator_bg = "#222222"
|
|||
|
||||
[[block]]
|
||||
block = "sound"
|
||||
driver = "pulseaudio"
|
||||
|
||||
[[block]]
|
||||
block = "uptime"
|
||||
|
||||
[[block]]
|
||||
block = "memory"
|
||||
display_type = "memory"
|
||||
format_mem = "$mem_total_used_percents.eng(3)"
|
||||
clickable = false
|
||||
format = " $icon $mem_used_percents.eng(w:3) "
|
||||
|
||||
[[block]]
|
||||
block = "memory"
|
||||
display_type = "swap"
|
||||
format_swap = "$swap_used_percents.eng(3)"
|
||||
clickable = false
|
||||
format = " $icon_swap $swap_used_percents.eng(w:3) "
|
||||
|
||||
[[block]]
|
||||
block = "cpu"
|
||||
interval = 1
|
||||
format = "$barchart $utilization"
|
||||
format = " $icon $barchart $utilization $frequency.eng(w:4) "
|
||||
|
||||
[[block]]
|
||||
block = "temperature"
|
||||
collapsed = false
|
||||
format = "$min min, $max max, $average avg"
|
||||
chip = "*-isa-*"
|
||||
format = " $icon $min min, $max max, $average avg "
|
||||
|
||||
[[block]]
|
||||
block = "load"
|
||||
format = "$1m.eng(4) $5m.eng(4) $15m.eng(4)"
|
||||
format = " $icon $1m.eng(w:4) $5m.eng(w:4) $15m.eng(w:4) "
|
||||
|
||||
[[block]]
|
||||
block = "time"
|
||||
interval = 1
|
||||
format = "%Y-%m-%d %a (%Z) %H:%M:%S"
|
||||
format = " $icon $timestamp.datetime(f:'%F (%Z) %T') "
|
||||
timezone = "Europe/Vienna"
|
||||
|
||||
[[block]]
|
||||
block = "time"
|
||||
interval = 1
|
||||
format = "(%Z) %H:%M:%S"
|
||||
format = " $icon $timestamp.datetime(f:'(%Z) %T') "
|
||||
timezone = "Etc/UTC"
|
||||
|
|
|
@ -9,5 +9,12 @@
|
|||
screenshot="${TMPDIR:-/tmp}/fuzzy-i3lock.png"
|
||||
|
||||
scrot -o "$screenshot"
|
||||
mogrify -scale 10% -scale 1000% "$screenshot"
|
||||
|
||||
case $1 in
|
||||
"37c3") mogrify -scale 10% -scale 500% -dither FloydSteinberg -colors 32 -scale 200% "$screenshot"
|
||||
;;
|
||||
*) mogrify -scale 10% -scale 1000% "$screenshot"
|
||||
;;
|
||||
esac
|
||||
|
||||
exec i3lock -i "$screenshot"
|
||||
|
|
Loading…
Add table
Reference in a new issue