Permalink
Browse files

tons of changes i'm too lazy to split out

  • Loading branch information...
bkudria committed Feb 18, 2010
1 parent 262b9a1 commit f668d7ea44c6a131d8cd508d3761c5eb4fc4e07c
Showing 548 changed files with 56,655 additions and 49 deletions.
View
@@ -446,3 +446,10 @@ export PROMPT_COMMAND="history -a"
. ~/.bashrc.local
fi
+
+# -- start rip config -- #
+RIPDIR=/home/bkudria/.rip
+RUBYLIB="$RUBYLIB:$RIPDIR/active/lib"
+PATH="$PATH:$RIPDIR/active/bin"
+export RIPDIR RUBYLIB PATH
+# -- end rip config -- #
View
2 .emacs
@@ -37,3 +37,5 @@
(server-mode t) ; Enable server mode
+
+(put 'set-goal-column 'disabled nil)
@@ -228,7 +228,7 @@
(font-lock-doc-face ((t (:foreground "#777777"))))
(font-lock-doc-string-face ((t (:foreground "#777777"))))
(font-lock-function-name-face ((t (:foreground "#0F9FFF"))))
- (font-lock-keyword-face ((t (:foreground "#808080" :bold t))))
+ (font-lock-keyword-face ((t (:foreground "#0faf3f" :bold t))))
(font-lock-preprocessor-face ((t (:foreground "#ff00ff"))))
(font-lock-reference-face ((t (:foreground "#ff00ff"))))
(font-lock-string-face ((t (:foreground "#FF5F0F" :italic t))))
@@ -44,6 +44,7 @@
(defun color-theme-scanner-brightly ()
"Color theme by Benjamin Kudria <ben@kudria.net>."
(interactive)
+ (message "Loaded color theme")
(setq-default hl-paren-colors '("#bb6400" "#afbb00" "#4bbb00" "#00bb19" "#00bb7d" "#0096bb" "#0032bb" "#3200bb" "#9600bb" "#bb007d" "#bb0019" "#bb0000"))
(color-theme-install
`(color-theme-scanner-brightly
@@ -221,19 +222,19 @@
(font-lock-builtin-face ((t (:foreground "#ff00ff"))))
- (font-lock-color-constant-face ((t (:foreground "#CBFF0E"))))
+ (font-lock-color-constant-face ((t (:foreground "#00FF11"))))
(font-lock-comment-face ((t (:foreground "#9b9b9b" :italic t))))
(font-lock-comment-delimiter-face ((t (:foreground "#555555"))))
- (font-lock-constant-face ((t (:foreground "#98bb0a"))))
+ (font-lock-constant-face ((t (:foreground "#00c80d"))))
(font-lock-doc-face ((t (:foreground "#777777"))))
(font-lock-doc-string-face ((t (:foreground "#777777"))))
(font-lock-function-name-face ((t (:foreground "#0b75bb"))))
- (font-lock-keyword-face ((t (:foreground "#808080" :bold t))))
+ (font-lock-keyword-face ((t (:foreground "#404040" :bold t))))
(font-lock-preprocessor-face ((t (:foreground "#ff00ff"))))
(font-lock-reference-face ((t (:foreground "#ff00ff"))))
(font-lock-string-face ((t (:foreground "#BB450B" :italic t))))
(font-lock-type-face ((t (:foreground "#ff00ff"))))
- (font-lock-variable-name-face ((t (:foreground "#0BBBB5"))))
+ (font-lock-variable-name-face ((t (:foreground "#00bec8"))))
(font-lock-warning-face ((t (:foreground "#bb0b0b"))))
(font-lock-negation-char-face ((t (:foreground "#099191"))))
(font-lock-other-type-face ((t (:foreground "#808080" :italic t))))
@@ -244,7 +245,7 @@
(font-lock-regexp-grouping-backslash ((t (:foreground "#0bbb0b"))))
(font-lock-special-comment-face ((t (:foreground "#0bbb0b"))))
- (fringe ((t (:background "#eeeeee" :foreground nil))))
+ (fringe ((t (:background "#ffffff" :foreground "#000000"))))
;;; (header-line ((t (:box (:line-width 2
;;; :color "gray8"
@@ -355,8 +356,8 @@
(minibuffer-prompt ((t (:foreground "#00494D" :bold t))))
- (mode-line ((t (:foreground "#00494D" :background "#dddddd" :overline "#999999"))))
- (modeline ((t (:foreground "#00494D" :background "#dddddd" :overline "#999999"))))
+ (mode-line ((t (:foreground "#00494D" :background "#ffffff" :overline "#dddddd"))))
+ (modeline ((t (:foreground "#00494D" :background "#ffffff" :overline "#dddddd"))))
(mode-line-inactive ((t (:foreground "#00494D" :background "#dddddd" :overline "white"))))
(mode-line-highlight ((t (:foreground "#434343" :background "#aaaaaa"))))
View
@@ -70,7 +70,7 @@
(global-set-key "\C-x\C-r" 'eval-and-replace)
-(global-set-key (kbd "RET") 'newline-and-indent)
+(global-set-key (kbd "RET") 'align-newline-and-indent)
(global-set-key (kbd "C-SPC") 'highlight-symbol-at-point)
@@ -93,9 +93,6 @@
(global-set-key [f7] 'kmacro-start-macro-or-insert-counter)
(global-set-key [f8] 'kmacro-end-or-call-macro)
-(define-key paredit-mode-map "\C-d" nil)
-(global-set-key "\C-d" 'comment-dwim)
-
;; multi-term
(global-set-key (kbd "<f9> t") 'multi-term)
(global-set-key (kbd "<f9> n") 'multi-term-next)
@@ -105,4 +102,8 @@
(add-hook 'haskell-mode-hook
'(lambda ()
- (define-key haskell-mode-map (kbd "\C-y") 'search-hayoo)))
+ (define-key haskell-mode-map (kbd "\C-y") 'search-hayoo)))
+
+(global-set-key "\C-x\C-d" 'ido-dired)
+
+(define-key dired-mode-map [backspace] 'dired-up-directory)
View
@@ -33,4 +33,4 @@
;; Breaks dtrt-indent if t
(setq-default indent-tabs-mode nil)
-(color-theme-lite-brite)
+(color-theme-scanner-brightly)
@@ -60,6 +60,7 @@
(narrow-to-region (region-beginning) (region-end)))
(indent-region (point-min) (point-max) nil)
+ (align (point-min) (point-max))
(widen))
(defun eval-and-replace ()
View
@@ -9,9 +9,7 @@
(define-globalized-minor-mode global-paredit-mode paredit-mode turn-on-paredit-no-errors)
-(global-paredit-mode t)
-
-
+(autopair-global-mode t)
(ido-mode t) ; Turn on ido-mode
(setq-default ido-create-new-buffer 'always)
@@ -64,16 +62,27 @@
(setq-default whitespace-style
'(tabs spaces trailing space-before-tab indentation empty space-after-tab space-mark tab-mark))
-;; do some spooky shit to make the time display
-(display-time-mode t)
-(setq-default display-time-default-load-average 2)
-(setq-default display-time-mail-file 'none)
-(setq-default display-time-string-forms (quote ((if (and (not display-time-format) display-time-day-and-date) (format-time-string " %a %b %e " now) "") (propertize (format-time-string (or display-time-format (if display-time-24hr-format " %H:%M" "%-I:%M%p")) now) (quote help-echo) (format-time-string " %a %b %e, %Y" now)) load (if mail (concat " " (propertize display-time-mail-string (quote display) (\` (when (and display-time-use-mail-icon (display-graphic-p)) (\,@ display-time-mail-icon) (\,@ (if (and display-time-mail-face (memq (plist-get (cdr display-time-mail-icon) :type) (quote (pbm xbm)))) (let ((bg (face-attribute display-time-mail-face :background))) (if (stringp bg) (list :background bg))))))) (quote face) display-time-mail-face (quote help-echo) "You have new mail; mouse-2: Read mail" (quote mouse-face) (quote mode-line-highlight) (quote local-map) (make-mode-line-mouse-map (quote mouse-2) read-mail-command))) ""))))
-
- ; make dired slightly smarter
+;; make dired slightly smarter
(setq-default directory-free-space-program "di")
(setq-default directory-free-space-args "-Ph")
+(eval-after-load "dired"
+ ;; don't remove `other-window', the caller expects it to be there
+ '(defun dired-up-directory (&optional other-window)
+ "Run Dired on parent directory of current directory."
+ (interactive "P")
+ (let* ((dir (dired-current-directory))
+ (orig (current-buffer))
+ (up (file-name-directory (directory-file-name dir))))
+ (or (dired-goto-file (directory-file-name dir))
+ ;; Only try dired-goto-subdir if buffer has more than one dir.
+ (and (cdr dired-subdir-alist)
+ (dired-goto-subdir up))
+ (progn
+ (kill-buffer orig)
+ (dired up)
+ (dired-goto-file dir))))))
+
(tabkey2-mode t)
(setq-default tabkey2-completion-functions
'(
@@ -236,4 +245,20 @@
(arglist-close . c-lineup-arglist)
(access-label . 0)
(inher-cont . c-lineup-java-inher)
- (func-decl-cont . c-lineup-java-throws))))
+ (func-decl-cont . c-lineup-java-throws))))
+
+
+(defun flymake-erlang-init ()
+ (let* ((temp-file (flymake-init-create-temp-buffer-copy
+ 'flymake-create-temp-inplace))
+ (local-file (file-relative-name temp-file
+ (file-name-directory buffer-file-name))))
+ (list "~/bin/flymake-erlang.erl" (list local-file))))
+
+(add-to-list 'flymake-allowed-file-name-masks '("\\.erl\\'" flymake-erlang-init))
+
+
+(add-hook 'erlang-mode-hook
+ '(lambda ()
+ (flymake-mode t)
+ ))
View
@@ -26,7 +26,6 @@
(require 'smooth-scrolling)
(require 'parenface)
(require 'color-theme-scanner-brightly)
-(require 'color-theme-lite-brite)
(require 'tabkey2)
(require 'dtrt-indent)
(require 'sudo-save)
@@ -42,4 +41,6 @@
(require 'tramp)
(require 'sr-speedbar)
(require 'etags)
-(require 'php-mode)
+(require 'php-mode)
+(require 'dired+)
+(require 'autopair)
@@ -9,16 +9,14 @@
(setq-default mouse-autoselect-window 0.5) ; select the window the pointer is in after 0.5 sec
(setq-default scalable-fonts-allowed t) ; allow scalable fonts
-(display-battery-mode t) ; Display battery and temp in modeline
-
(add-hook 'after-make-frame-functions 'fit-frame)
(add-hook 'temp-buffer-show-hook 'fit-frame-if-one-window 'append)
(setq-default fit-frame-empty-height 40) ; Set default frame resize options
(setq-default fit-frame-empty-width 75)
(setq-default fit-frame-min-height 40)
(setq-default fit-frame-min-width 105)
-(setq-default fit-frame-max-height 100)
+(setq-default fit-frame-max-height 80)
(setq-default fit-frame-max-width 130)
(global-hl-line-mode t)
@@ -27,4 +25,5 @@
(mouse-avoidance-mode 'animate) ; Animate the mouse away from where we are typing
-(add-hook 'after-make-frame-functions 'color-theme-lite-brite)
+(add-hook 'after-make-frame-functions 'color-theme-scanner-brightly)
+
View
9 .gemrc
@@ -1,10 +1,11 @@
---
+:backtrace: false
+:benchmark: false
+:bulk_threshold: 1000
:sources:
+- http://gemcutter.org
- http://gems.rubyforge.org/
- http://gems.github.com
:update_sources: true
-:benchmark: false
-:bulk_threshold: 1000
-:backtrace: false
:verbose: true
-gem: --no-ri --no-rdoc
+gem: --no-ri --no-rdoc
View
@@ -4,14 +4,18 @@
[github]
user = bkudria
+ token = 43cefc58c5ff6fdb90dffc731df10723
[core]
- editor = emacs-client-frame
+ editor = nano
pager = less
# change to tig when color.pager bug is fixed.
whitespace = trailing-space,space-before-tab,cr-at-eol
+[clean]
+ requireForce = false
+
[color]
diff = auto
status = auto
@@ -61,9 +65,15 @@
echo = "!echo $1; echo $1"
+ lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+
+ top = !eval cd "$(pwd)/$(git rev-parse --show-cdup)" && pwd
+
[gui]
- fontdiff = -family terminus -size 13 -weight normal -slant roman -underline 0 -overstrike 0
+ fontdiff = -family terminus -size 10 -weight normal -slant roman -underline 0 -overstrike 0
+ fontui = -family terminus -size 10 -weight bold -slant roman -underline 0 -overstrike 0
+ diffcontext = 3
[giggle]
compact-mode = true
main-window-maximized = true
Oops, something went wrong.

0 comments on commit f668d7e

Please sign in to comment.