diff --git a/i3/MMLin-status.conf b/i3/MMLin-status.conf new file mode 100644 index 0000000..3f102d6 --- /dev/null +++ b/i3/MMLin-status.conf @@ -0,0 +1,44 @@ +#i3status config +general { + output_format= "i3bar" + colors = true + #color_good = '#ffffff' + #color_degraded = '#ffffff' + #color_bad = '#ffffff' + color_good = '#00ff00' + color_degraded = '#ff0000' + color_bad = '#ff0000' + interval = 1 +} +order += "disk /" +order += "ethernet tun0" +order += "ethernet enp2s0f0" +order += "volume master" +order += "tztime local" +ethernet tun0 { + format_up = "%ip" + format_down = "!T" +} +ethernet enp2s0f0 { + # if you use %speed, i3status requires root privileges + format_up = "%ip (%speed)" + format_down = "!E" +} +tztime local { + format = "%a %b%e %r" + #:%M:%S +} +load { + format = "%5min" +} +volume master { + format = "V:%volume" + format_muted = "V: 0%" + device = "default" + mixer = "Master" + mixer_idx = 0 +} +disk "/" { + format = "%free" +} +# vim: ts=4:sw=4:et diff --git a/i3/run.sh b/i3/run.sh index 2ee4906..e96d083 100755 --- a/i3/run.sh +++ b/i3/run.sh @@ -36,18 +36,15 @@ if len(swap) == 2: EOF fi if [ "$1" = "boot" ];then + test -f ~/.screenlayout/default.sh && ~/.screenlayout/default.sh /usr/bin/xset -b /usr/bin/xset +fp /usr/share/fonts/X11/misc /usr/bin/xset +fp /usr/share/fonts/X11/Type1 /usr/bin/xset +fp built-ins /usr/bin/xset s off /usr/bin/xset -dpms - urxvtd -q -f -o - if [ -f /usr/local/bin/i3 ]; then - /usr/bin/ck-launch-session /usr/local/bin/i3 - elif [ -f /usr/bin/i3 ]; then - /usr/bin/ck-launch-session /usr/bin/i3 - fi + /usr/bin/urxvtd -q -f -o + $(which ck-launch-session 2>/dev/null) $(which i3) fi if [ "$1" = "screen-lock" ];then revert(){ diff --git a/shells/zshrc b/shells/zshrc index f51ec9c..6b70dd8 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -141,9 +141,7 @@ if test -f /etc/gentoo-release; then echo "You're a server. Exiting" return fi - cd /usr/portage >/dev/null - sudo zsh -c "git up&&echo Done pulling&&eix-update&&echo Done with eix" - cd ->/dev/null + sudo zsh -c "git -C /usr/portage pull&&echo Done pulling&&eix-update&&echo Done with eix" echo '\a' } elif test -f /etc/lsb-release; then