diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-17 00:07:08 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-17 00:07:08 -0400 |
| commit | 9399e46640c9c8f690c091f51749a7d3b5511646 (patch) | |
| tree | 9e88b7b30be21db9ab561ede4b9777a74a12b995 | |
| parent | 4dcf99a241f8591b21ce3e8b2dd385cbeb99bbf6 (diff) | |
| parent | dbab2a06f142894f446f1f66b637242862dcd7bf (diff) | |
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
| -rw-r--r-- | .crontab.local | 10 | ||||
| -rw-r--r-- | .emacs | 13 | ||||
| -rw-r--r-- | .emacs.d/custom.el | 6 | ||||
| -rw-r--r-- | .wmii/wmiirc_local | 36 | ||||
| -rw-r--r-- | .xmodmap | 7 |
5 files changed, 68 insertions, 4 deletions
diff --git a/.crontab.local b/.crontab.local new file mode 100644 index 0000000..d0c580d --- /dev/null +++ b/.crontab.local @@ -0,0 +1,10 @@ +# m h dom mon dow command +#0 4 * * 1-5 /usr/sbin/alsactl restore --file "$HOME/.full.asound" + +#0 5 * * 1-5 cvlc --volume 256 --random $HOME/Music +#30 5 * * 1-5 cvlc --volume 256 --random $HOME/Music +#0 6 * * 1-5 cvlc --volume 256 --random $HOME/Music +#30 6 * * 1-5 cvlc --volume 256 --random $HOME/Music +#0 7 * * * cvlc --volume 256 --random $HOME/Music + +#0 8 * * * cvlc --volume 256 --random $HOME/Music @@ -179,8 +179,19 @@ (setq autopair-dont-activate t) ;; Don't let autopair break ansi-term )) -(add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode)) +(add-hook 'ruby-mode-hook + '(lambda () + (set (make-local-variable 'indent-tabs-mode) t) + (set (make-local-variable 'ruby-indent-level) 4) + (set (make-local-variable 'tab-width) 4) + )) +(add-hook 'coffee-mode-hook + '(lambda () + (set (make-local-variable 'indent-tabs-mode) nil) + )) + +(add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode)) ;(require 'flymake) ;(add-hook 'php-mode-hook (lambda() (flymake-mode 1))) diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index 9f61215..4caf4c5 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -3,9 +3,9 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(erc-nick "lukeshu-freenode") - '(erc-port 6667) - '(erc-server "lukeshu.ath.cx") + '(ruby-deep-arglist nil) + '(ruby-deep-indent-paren nil) + '(erc-nick "lukeshu") '(mdmua-maildir "~/Maildir") '(scroll-bar-mode nil)) (custom-set-faces diff --git a/.wmii/wmiirc_local b/.wmii/wmiirc_local new file mode 100644 index 0000000..616f569 --- /dev/null +++ b/.wmii/wmiirc_local @@ -0,0 +1,36 @@ +#!/bin/bash + +# wmiirc file for my HP Pavilion dv6426us laptop + +export MODKEY=Mod4 + +status() { + buffer=$( + echo -n ' ' + # Wifi status + echo -n 'Wlan0:' $(iwconfig wlan0 | sed 's/ /\n/g' | grep Quality) + + echo -n ' | ' + + # Battery charge (not status) + echo -n $(acpi -b | sed 's/.*, \{0,2\}\([0-9]\{1,3\}%\),.*/Bat: \1/') + + echo -n ' | ' + # CPU + # This doesn't work for me, it shows capacity + #echo -n 'Core MHz:' $(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;') + # This actually displays %idle + echo -n 'CPU: [ '$(tail -n3 ~/tmp/cputime|sed -ur 's/\s\s+/\t/g'|cut -f2,11|sed 's/\t\(.*\)/(\1)/')' ]' + + #echo -n ' | ' + + #echo -n $(uptime | sed 's/.*://; s/,//g') + + echo -n ' | ' + + echo -n $(date) + + echo -n ' ' + ) + echo "$buffer" +} diff --git a/.xmodmap b/.xmodmap new file mode 100644 index 0000000..e4ade24 --- /dev/null +++ b/.xmodmap @@ -0,0 +1,7 @@ +remove lock = Caps_Lock +keysym Caps_Lock = Super_L + +keycode 135 = Super_R + +clear mod4 +add mod4 = Super_L Super_R Hyper_L Hyper_R Menu |