aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2014-06-13 18:32:12 +0200
committerAdrian Kummerlaender2014-06-13 18:32:12 +0200
commite918c374d96e968c628d45458bc1a17ddf60d405 (patch)
treed9d68d990042330abcdf9b1f40c4a48d23ec64f3
parentbc9795c86a900b55c6184ae69fea20fec015a347 (diff)
downloaddotfiles-e918c374d96e968c628d45458bc1a17ddf60d405.tar
dotfiles-e918c374d96e968c628d45458bc1a17ddf60d405.tar.gz
dotfiles-e918c374d96e968c628d45458bc1a17ddf60d405.tar.bz2
dotfiles-e918c374d96e968c628d45458bc1a17ddf60d405.tar.lz
dotfiles-e918c374d96e968c628d45458bc1a17ddf60d405.tar.xz
dotfiles-e918c374d96e968c628d45458bc1a17ddf60d405.tar.zst
dotfiles-e918c374d96e968c628d45458bc1a17ddf60d405.zip
Switched conky / i3bar to JSON protocol
* conky now generates JSON output in conjunction with newly created ".conky.sh" * changed conky script logic to be interface aware ** detects and displays address of the active interface (eth / wlan / wwan) * changed conky date format to iso * switched gvim font to "Droid Sans Mono" ** analog to urxvt font * xdg config is now preventing "Desktop" and "Downloads" directories from being created
-rwxr-xr-xconky/.conky.sh4
-rw-r--r--conky/.conkyrc53
-rw-r--r--i3wm/.i3/config2
-rw-r--r--vim/.gvimrc2
-rw-r--r--xdg/.config/user-dirs.dirs2
5 files changed, 60 insertions, 3 deletions
diff --git a/conky/.conky.sh b/conky/.conky.sh
new file mode 100755
index 0000000..6c9286e
--- /dev/null
+++ b/conky/.conky.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo '{"version":1}[[],'
+exec conky
diff --git a/conky/.conkyrc b/conky/.conkyrc
index b052dfd..dff876f 100644
--- a/conky/.conkyrc
+++ b/conky/.conkyrc
@@ -4,5 +4,56 @@ total_run_times 0
update_interval 5
+if_up_strictness address
+
TEXT
-Host: $nodename | Kernel: $kernel | Root: ${fs_used_perc /}% | IP: ${addr} | CPU-Temp: ${acpitemp}°C | Fan: ${ibm_fan} rpm | RAM: ${memperc}% | CPU-Load: ${cpu cpu0}% | Battery: ${battery_percent} | ${time %d.%m.%y %H:%M}
+[
+ {
+ "full_text" : " Host: $nodename "
+ },
+ {
+ "full_text" : " Kernel: $kernel "
+ },
+ {
+ "full_text" : " Root: ${fs_used_perc /}% "
+ },
+ ${if_up enp0s25}
+ {
+ "full_text" : " IP: ${addr enp0s25} "
+ },
+ ${else}
+ ${if_up wlp3s0}
+ {
+ "full_text" : " IP: ${addr wlp3s0} "
+ },
+ ${else}
+ ${if_up wwp0s29u1u4i6}
+ {
+ "full_text" : " IP: ${addr wwp0s29u1u4i6} "
+ },
+ ${else}
+ {
+ "full_text" : " IP: No connection "
+ },
+ ${endif}
+ ${endif}
+ ${endif}
+ {
+ "full_text" : " Temp: ${acpitemp}°C "
+ },
+ {
+ "full_text" : " Fan: ${ibm_fan} "
+ },
+ {
+ "full_text" : " RAM: ${memperc}% "
+ },
+ {
+ "full_text" : " Load: ${cpu cpu0}% "
+ },
+ {
+ "full_text" : " Battery: ${battery_percent} "
+ },
+ {
+ "full_text" : " ${time %Y/%m/%d %H:%M}"
+ }
+],
diff --git a/i3wm/.i3/config b/i3wm/.i3/config
index 0878b88..42a87e8 100644
--- a/i3wm/.i3/config
+++ b/i3wm/.i3/config
@@ -86,7 +86,7 @@ mode "resize" {
bindsym $mod+r mode "resize"
bar {
- status_command conky
+ status_command ~/.conky.sh
workspace_buttons yes
colors {
diff --git a/vim/.gvimrc b/vim/.gvimrc
index 25a6837..08f60aa 100644
--- a/vim/.gvimrc
+++ b/vim/.gvimrc
@@ -5,7 +5,7 @@ set guioptions-=m
set guioptions-=T
set guioptions-=e
-set guifont=Monospace\ 8
+set guifont=Droid\ Sans\ Mono\ 8
nnoremap <A-left> <C-W>h
nnoremap <A-right> <C-W>l
diff --git a/xdg/.config/user-dirs.dirs b/xdg/.config/user-dirs.dirs
index 0dba985..b605d87 100644
--- a/xdg/.config/user-dirs.dirs
+++ b/xdg/.config/user-dirs.dirs
@@ -1 +1,3 @@
XDG_TEMPLATES_DIR="$HOME/"
+XDG_DESKTOP_DIR="$HOME/"
+XDG_DOWNLOADS_DIR="$HOME/"