Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles

3 files changed, 15 insertions, 351 deletions

diff --git a/.emacs b/.emacs
index 4bc39b3..99bdf77 100644
--- a/.emacs
+++ b/.emacs
@@ -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/.full.asound b/.full.asound
deleted file mode 100644
index bf41e03..0000000
--- a/.full.asound
+++ /dev/null
@@ -1,347 +0,0 @@
-state.PCH {
-	control.1 {
-		iface MIXER
-		name 'Headphone Playback Volume'
-		value.0 87
-		value.1 87
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 87'
-			dbmin -6525
-			dbmax 0
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Headphone Playback Switch'
-		value.0 true
-		value.1 true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 2
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Speaker Playback Volume'
-		value.0 87
-		value.1 87
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 87'
-			dbmin -6525
-			dbmax 0
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-	control.4 {
-		iface MIXER
-		name 'Speaker Playback Switch'
-		value.0 true
-		value.1 true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 2
-		}
-	}
-	control.5 {
-		iface MIXER
-		name 'Mic Playback Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 31'
-			dbmin -3450
-			dbmax 1200
-			dbvalue.0 -3450
-			dbvalue.1 -3450
-		}
-	}
-	control.6 {
-		iface MIXER
-		name 'Mic Playback Switch'
-		value.0 false
-		value.1 false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 2
-		}
-	}
-	control.7 {
-		iface MIXER
-		name 'Internal Mic Playback Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 31'
-			dbmin -3450
-			dbmax 1200
-			dbvalue.0 -3450
-			dbvalue.1 -3450
-		}
-	}
-	control.8 {
-		iface MIXER
-		name 'Internal Mic Playback Switch'
-		value.0 false
-		value.1 false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 2
-		}
-	}
-	control.9 {
-		iface MIXER
-		name 'Auto-Mute Mode'
-		value Enabled
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 Disabled
-			item.1 Enabled
-		}
-	}
-	control.10 {
-		iface MIXER
-		name 'Mic Boost Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 3'
-			dbmin 0
-			dbmax 3600
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-	control.11 {
-		iface MIXER
-		name 'Internal Mic Boost Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 3'
-			dbmin 0
-			dbmax 3600
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-	control.12 {
-		iface MIXER
-		name 'Capture Switch'
-		value.0 true
-		value.1 true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 2
-		}
-	}
-	control.13 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 19
-		value.1 19
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 31'
-			dbmin -1650
-			dbmax 3000
-			dbvalue.0 1200
-			dbvalue.1 1200
-		}
-	}
-	control.14 {
-		iface MIXER
-		name 'Beep Playback Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 31'
-			dbmin -3450
-			dbmax 1200
-			dbvalue.0 -3450
-			dbvalue.1 -3450
-		}
-	}
-	control.15 {
-		iface MIXER
-		name 'Beep Playback Switch'
-		value.0 false
-		value.1 false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 2
-		}
-	}
-	control.16 {
-		iface MIXER
-		name 'Master Playback Volume'
-		value 87
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 87'
-			dbmin -6525
-			dbmax 0
-			dbvalue.0 0
-		}
-	}
-	control.17 {
-		iface MIXER
-		name 'Master Playback Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.18 {
-		iface CARD
-		name 'Headphone Jack'
-		value false
-		comment {
-			access read
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.19 {
-		iface CARD
-		name 'Mic Jack'
-		value false
-		comment {
-			access read
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.20 {
-		iface CARD
-		name 'HDMI/DP,pcm=3 Jack'
-		value false
-		comment {
-			access read
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.21 {
-		iface MIXER
-		name 'IEC958 Playback Con Mask'
-		value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access read
-			type IEC958
-			count 1
-		}
-	}
-	control.22 {
-		iface MIXER
-		name 'IEC958 Playback Pro Mask'
-		value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access read
-			type IEC958
-			count 1
-		}
-	}
-	control.23 {
-		iface MIXER
-		name 'IEC958 Playback Default'
-		value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access 'read write'
-			type IEC958
-			count 1
-		}
-	}
-	control.24 {
-		iface MIXER
-		name 'IEC958 Playback Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.25 {
-		iface PCM
-		device 3
-		name ELD
-		value ''
-		comment {
-			access read
-			type BYTES
-			count 0
-		}
-	}
-	control.26 {
-		iface MIXER
-		name 'Digital Capture Volume'
-		value.0 60
-		value.1 60
-		comment {
-			access 'read write user'
-			type INTEGER
-			count 2
-			range '0 - 120'
-			tlv '0000000100000008fffff44800000032'
-			dbmin -3000
-			dbmax 3000
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-	control.27 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value.0 255
-		value.1 255
-		comment {
-			access 'read write user'
-			type INTEGER
-			count 2
-			range '0 - 255'
-			tlv '0000000100000008ffffec1400000014'
-			dbmin -5100
-			dbmax 0
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-}