diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-03-26 15:36:15 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-03-26 15:36:15 -0400 |
| commit | 596fe4b1610df0a7f5a0ea174d136d179ee08440 (patch) | |
| tree | b3e9c23404ec7a3247ca251f5c142e33a22c1b61 | |
| parent | ea607b1e0d2648a67508b57fdfccaf8cc8e3ae80 (diff) | |
| parent | 4e5135eee28a7895dbc5fd74b0f49314a0f2397e (diff) | |
Merge remote-tracking branch 'origin/master' into build64-par/master
| -rw-r--r-- | .config/emacs/custom.el | 1 | ||||
| -rw-r--r-- | .config/git/ignore | 3 | ||||
| -rwxr-xr-x | .config/wmii-hg/rbar | 4 | ||||
| -rwxr-xr-x | .config/wmii-hg/rbar_wifi | 2 | ||||
| -rwxr-xr-x | .local/bin/config-path | 1 |
5 files changed, 6 insertions, 5 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el index d81ac98..1fdb0d3 100644 --- a/.config/emacs/custom.el +++ b/.config/emacs/custom.el @@ -29,6 +29,7 @@ '(org-latex-pdf-process (quote ("xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f"))) + '(org-src-fontify-natively t) '(scroll-bar-mode nil) '(send-mail-function (quote smtpmail-send-it)) '(smtpmail-smtp-server "plus.smtp.mail.yahoo.com") diff --git a/.config/git/ignore b/.config/git/ignore index e69de29..d0f607c 100644 --- a/.config/git/ignore +++ b/.config/git/ignore @@ -0,0 +1,3 @@ +#*# +.#* +*~ diff --git a/.config/wmii-hg/rbar b/.config/wmii-hg/rbar index 9aaa485..b95f9c4 100755 --- a/.config/wmii-hg/rbar +++ b/.config/wmii-hg/rbar @@ -1,8 +1,4 @@ #!/bin/bash -IFS=: -read -r name prefix DISPLAY <<<"$1" -export DISPLAY - id=$1 name=${id#[0-9][0-9]_} diff --git a/.config/wmii-hg/rbar_wifi b/.config/wmii-hg/rbar_wifi index eaf0137..f83d921 100755 --- a/.config/wmii-hg/rbar_wifi +++ b/.config/wmii-hg/rbar_wifi @@ -29,7 +29,7 @@ right-click() { IFS='' while read -r line; do list+=("$line") - done < <({ netctl-auto list; printf '> %s\n' 'New Network' 'Disable All' 'Enable All';} | sed 's,$,$,' | column -s '$' -t) + done < <({ netctl-auto list | sort -k1.2; printf '> %s\n' 'New Network' 'Disable All' 'Enable All';} | sed 's,$,$,' | column -s '$' -t) cur='' for item in "${list[@]}"; do diff --git a/.local/bin/config-path b/.local/bin/config-path index e81a986..4b7cccb 100755 --- a/.local/bin/config-path +++ b/.local/bin/config-path @@ -8,6 +8,7 @@ prefixes=( "$HOME/.prefix.$(uname -m)" "$HOME/.prefix" "$HOME"/.gem/ruby/* + "$HOME"/.npm-prefix ) in_array() { |