diff --git a/.Xresources b/.Xresources index 7797302b..6d7e293d 100644 --- a/.Xresources +++ b/.Xresources @@ -29,8 +29,8 @@ URxvt.perl-ext-common : matcher,keyboard-select,clipboard URxvt.keysym.C-M-v: perl:clipboard:paste URxvt.keysym.C-M-c: perl:clipboard:paste_escaped -! URxvt.clipboard.copycmd: xsel -ib -URxvt.clipboard.pastecmd: xsel -op +! URxvt.clipboard.copycmd: xclip -i -selection clipboard +! URxvt.clipboard.pastecmd: xclip -o -selection clipboard !! Keyboard-Select URxvt.keysym.M-Escape: perl:keyboard-select:activate diff --git a/.bashrc b/.bash_profile similarity index 100% rename from .bashrc rename to .bash_profile diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index c98dfafd..ec0acb0b 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -15,7 +15,7 @@ require("beautiful") require("naughty") -- Widget library -require("vicious") +vicious = require("vicious") -------------------------------------------------------------------------------- -- {{{ Error handling diff --git a/.netinit b/.netinit index 98a49b74..62b70f6d 100755 --- a/.netinit +++ b/.netinit @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ ## Custom network initialization script. -## 2012-04-09 +## 2012-08-31 ################################################################################ if [ $(id -u) -ne 0 ]; then @@ -23,21 +23,17 @@ ip link set ${NET_INTERFACE} up ## Connection. if [ $# -eq 0 ]; then # Associate if needed. - if [ "$(iwconfig ${NET_INTERFACE} | grep 'Not-Associated')" != "" ]; then + if [ -n "$(iwconfig ${NET_INTERFACE} | grep 'Not-Associated')" ]; then wpa_supplicant -B -i ${NET_INTERFACE} -D wext -c "${WPA_SUPPLICANT_CONF}" fi ## Wait until wpa_supplicant has finished association. i=0 - while [ "$(iwconfig ${NET_INTERFACE} | grep 'off/any')" != "" ] && [ $i -lt $TIMEOUT_LIMIT ] ; do + while [ -n "$(iwconfig ${NET_INTERFACE} | grep 'off/any')" ] && [ $i -lt $TIMEOUT_LIMIT ] ; do i=$(($i+1)) done fi -if [ "$1" == "ucd" ]; then - iwconfig ${NET_INTERFACE} essid "WaveLAN Network" -fi - ## Get IP. dhcpcd ${NET_INTERFACE} diff --git a/.save b/.save index d15b3683..ce84cd74 100755 --- a/.save +++ b/.save @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ ## Home Config Backup Script -## 2012-07-04 +## 2012-09-01 ################################################################################ ## Note for Zsh: because of the Ksh-style arrays (index starting at 0), you ## cannot use array index to append elements to arrays -- otherwise the @@ -204,7 +204,7 @@ FILELIST=(${FILELIST[*]} "README") FILELIST=(${FILELIST[*]} ".rtorrent.rc") ## Shells -FILELIST=(${FILELIST[*]} ".bashrc") +FILELIST=(${FILELIST[*]} ".bash_profile") FILELIST=(${FILELIST[*]} ".zshrc") for i in $(ls -a .shell.d/*|grep -vi 'bhistory') do diff --git a/.shell.d/alias_rc b/.shell.d/alias_rc index 25e6206a..988cb197 100644 --- a/.shell.d/alias_rc +++ b/.shell.d/alias_rc @@ -126,7 +126,6 @@ if [ -e "/usr/bin/pacman" ] ; then ## Pacman aliases if [ "$PACMAN_FRONTEND" = "pacman" ]; then alias pc='sudo pacman -Sc' - alias pcc='sudo pacman -Scc' alias pi='sudo pacman -S --needed' alias pqi='pacman -Qi' alias pql='pacman -Ql' @@ -140,7 +139,6 @@ if [ -e "/usr/bin/pacman" ] ; then if [ "$PACMAN_FRONTEND" = "pacman-color" ]; then alias pc='sudo pacman-color -Sc' - alias pcc='sudo pacman-color -Scc' alias pi='sudo pacman -S --needed' alias pqi='pacman-color -Qi' alias pql='pacman-color -Ql' @@ -160,9 +158,9 @@ fi ## TeXlive if [ -d "/usr/local/texlive" ]; then - # alias tli="sudo bash -c 'umask 022 && tlmgr install'" + alias tli="sudo bash -c 'umask 022 && tlmgr install'" alias tlu="sudo bash -c 'umask 022 && tlmgr update --self'" - # alias tls="tlmgr search --global" + alias tls="tlmgr search --global" alias tll="tlmgr show --list" fi diff --git a/.shell.d/funs_pacman b/.shell.d/funs_pacman index b8365d61..ddd9eaa3 100644 --- a/.shell.d/funs_pacman +++ b/.shell.d/funs_pacman @@ -26,10 +26,10 @@ _pacman_set_vars() return 2 fi - pacman_name="$(echo "$pacman_var_list" | sed -n '1p')" - pacman_deps="$(echo "$pacman_var_list" | sed -n '7p')" - pacman_optdeps="$(echo "$pacman_var_list" | sed -n '8p')" - pacman_size="$(echo "$pacman_var_list" | sed -n '12p')" + pacman_name="$(echo "$pacman_var_list" | sed -n '1{p;q}')" + pacman_deps="$(echo "$pacman_var_list" | sed -n '7{p;q}')" + pacman_optdeps="$(echo "$pacman_var_list" | sed -n '8{p;q}')" + pacman_size="$(echo "$pacman_var_list" | sed -n '12{p;q}')" } _pacman_unset_vars() diff --git a/.shell.d/funs_rc b/.shell.d/funs_rc index f25ca5fb..828ecc5a 100644 --- a/.shell.d/funs_rc +++ b/.shell.d/funs_rc @@ -659,7 +659,7 @@ xmulti () return fi - xrandr --output "$1" --auto --right-of $(xrandr | sed -n "/current/{n;p}" | cut -f1 -d" ") + xrandr --output "$1" --auto --right-of $(xrandr | sed -n "/current/{n;p;q}" | cut -f1 -d" ") } xmultioff () diff --git a/.xinitrc b/.xinitrc index 257426e1..49eafc02 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,7 +1,7 @@ #!/bin/sh ################################################################################ ## XINITRC -## Last updated: 2012-07-30 +## 2012-08-31 ################################################################################ ## Config (for URxvt) @@ -9,7 +9,7 @@ ## Useful tools numlockx on -[ "$(amixer | grep PCM)" != "" ] && amixer set PCM 80% +[ -n "$(amixer | grep PCM)" ] && amixer set PCM 80% ##============================================================================== ## Launch session