Permalink
Browse files

Update dot-files

  • Loading branch information...
1 parent a95e5ba commit 9b2fb247e07b95f40b59b17c179f2172240c3989 @steveWang committed Mar 10, 2012
Showing with 70 additions and 49 deletions.
  1. +4 −7 dot-alias
  2. +2 −1 dot-bashrc
  3. +1 −1 dot-colors
  4. +55 −34 dot-emacs
  5. +7 −5 dot-env
  6. +1 −1 install.sh
View
@@ -1,19 +1,16 @@
# It's amusing. Sue me.
alias genocide=killall
-# Typoes are unfortunate.
-alias ndoe=node
-
-# Various FF versions
-alias ff6='~/workspace/browsers/firefox-6.0b5/firefox'
-alias ff8='~/workspace/browsers/firefox-8.0a1/firefox'
-
# Various supposedly useful aliases
alias rm='rm -i'
alias df='df -h'
+alias ls='ls --color=auto'
alias l='ls -al'
alias ll='ls -l'
alias ..='cd ..'
alias ...='cd ../..'
+
+# Use hub.
+alias git=hub
View
@@ -9,4 +9,5 @@ stty -ixon
# Denote current git branch in shell prompt.
source /etc/bash_completion.d/git
PS1="${CYAN}\$(date +%H:%M) ${GREEN}\u@\h:${WHITE}\w${YELLOW}\$(__git_ps1)${NORMAL}> "
-xmodmap ~/.xmodmap-`uname -n`
+setxkbmap -model latitude
+setxkbmap -option ctrl:nocaps
View
@@ -43,4 +43,4 @@ BRIGHT_YELLOW="\[$ESC[${BRIGHT};${FG_YELLOW}m\]"
BRIGHT_BLUE="\[$ESC[${BRIGHT};${FG_BLUE}m\]"
BRIGHT_VIOLET="\[$ESC[${BRIGHT};${FG_VIOLET}m\]"
BRIGHT_CYAN="\[$ESC[${BRIGHT};${FG_CYAN}m\]"
-BRIGHT_WHITE="\[$ESC[${BRIGHT};${FG_WHITE}m\]"
+BRIGHT_WHITE="\[$ESC[${BRIGHT};${FG_WHITE}m\]"
View
@@ -10,11 +10,24 @@
(mapc 'load-dir-recursive (list "/home/steve/.emacs.d/elisp"
"/home/steve/local/lib/erlang/lib/tools-2.6.6.5/emacs"
"/home/steve/.emacs.d/elisp/writegood-mode"))
+
+(global-set-key (kbd "C-s-b") 'shrink-window-horizontally)
+(global-set-key (kbd "C-s-f") 'enlarge-window-horizontally)
+(global-set-key (kbd "C-s-n") 'shrink-window)
+(global-set-key (kbd "C-s-p") 'enlarge-window)
+
+;; Fullscreen, all the way.
+(defun fullscreen ()
+ (interactive)
+ (x-send-client-message nil 0 nil "_NET_WM_STATE" 32
+ '(2 "_NET_WM_STATE_FULLSCREEN" 0)))
+
(require 'erlang-start)
+
+
;; zap-up-to-char is more useful than zap-to-char
(autoload 'zap-up-to-char "misc"
"kill up to, but not including argth occurrence of char.
-
\(fn arg char)"
'interactive)
(global-set-key "\M-z" 'zap-up-to-char)
@@ -50,20 +63,24 @@
(autoload 'js2-mode "js2-mode" nil t)
(add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
+;; Set modes for dot-files.
+(add-to-list 'auto-mode-alist '("dot-" . shell-script-mode))
+(add-to-list 'auto-mode-alist '("dot-emacs" . emacs-lisp-mode))
+
;; load color-theme stuff.
(require 'color-theme)
-(load "/home/steve/.emacs.d/elisp/color-theme-blackboard.el")
(eval-after-load "color-theme"
'(progn
(color-theme-initialize)
;; Use euphoria if in -nw mode, since blackboard is displayed
;; poorly in this case.
(if window-system
- (color-theme-blackboard)
- (color-theme-euphoria))))
+ (color-theme-calm-forest)
+ (color-theme-euphoria))))
;; jabber itself!
-(require 'jabber-autoloads)
+(if window-system
+ (require 'jabber-autoloads))
;; erc keywords
(setq erc-keywords '("\\b[nn]ow\\s?(js|js)\\b" "\\bdnode\\b"))
@@ -80,15 +97,6 @@
c-basic-offset 2
js-indent-level 2)
-;; no tabs by default. modes that really need tabs should enable
-;; indent-tabs-mode explicitly. makefile-mode already does that, for
-;; example.
-(setq-default indent-tabs-mode nil)
-;; if indent-tabs-mode is off, untabify before saving
-(add-hook 'write-file-hooks
- (lambda () (if (not indent-tabs-mode)
- (untabify (point-min) (point-max)))))
-
;; indent cases of switch statements.
(c-set-offset 'case-label '+)
@@ -103,20 +111,21 @@
(autoload 'markdown-mode "markdown-mode.el"
"major mode for editing markdown files" t)
(setq auto-mode-alist
- (cons '("\\.md" . markdown-mode) auto-mode-alist))
+ (cons '("\\.md$" . markdown-mode) auto-mode-alist))
;;; emacs/w3 configuration
(condition-case () (require 'w3-auto "w3-auto") (error nil))
;; custom variables. bleh.
(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; 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.
- '(LaTeX-mode-hook (quote (preview-mode-setup writegood-mode)))
+ ;; custom-set-variables was added by Custom.
+ ;; 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.
+ '(TeX-PDF-mode t)
'(auto-image-file-mode t)
'(c-basic-offset 2)
+ '(confirm-kill-emacs (quote y-or-n-p))
'(cperl-autoindent-on-semi t)
'(cperl-font-lock nil)
'(cperl-hairy t)
@@ -136,7 +145,11 @@
'(erc-user-full-name "Steve Wang")
'(espresso-indent-level 2)
'(exec-path (quote ("/home/steve/local/bin" "/home/steve/.cabal/bin" "/home/steve/bin" "/usr/local/bin" "/usr/bin" "/bin" "/usr/bin/x11" "/usr/x11r6/bin" "/usr/games" "/usr/lib/mit/bin" "/usr/lib/mit/sbin" "." "/usr/lib/emacs/23.3/x86_64-suse-linux")))
+ '(fill-column 75)
+ '(flyspell-default-dictionary nil)
'(global-mark-ring-max 32)
+ '(global-whitespace-mode nil)
+ '(global-whitespace-newline-mode t)
'(gnus-check-bogus-newsgroups t)
'(gnus-select-method (quote (nnimap "imap.gmail.com" (nnimap-address "imap.gmail.com") (nnimap-server-port 993) (nnimap-stream ssl))))
'(hippie-expand-dabbrev-skip-space t)
@@ -169,6 +182,8 @@
'(mail-source-report-new-mail-interval 1)
'(mark-even-if-inactive t)
'(mark-ring-max 32)
+ '(markdown-command-needs-filename t)
+ '(markdown-enable-math t)
'(message-confirm-send t)
'(mm-inline-text-html-with-images t)
'(mode-require-final-newline (quote visit-save))
@@ -180,7 +195,7 @@
'(save-interprogram-paste-before-kill t)
'(scroll-bar-mode nil)
'(standard-indent 2)
- '(tex-pdf-mode t)
+ '(tex-pdf-mode t t)
'(tex-source-correlate-method (quote synctex))
'(tex-source-correlate-mode t)
'(tex-source-correlate-start-server t)
@@ -195,32 +210,38 @@
'(which-func-modes (quote (emacs-lisp-mode c-mode c++-mode cperl-mode python-mode makefile-mode sh-mode diff-mode js2-mode haskell-mode ruby-mode)))
'(which-function-mode t)
'(whitespace-action (quote (auto-cleanup)))
+ '(whitespace-global-modes nil)
+ '(whitespace-line-column 75)
'(x-select-enable-clipboard t))
(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; 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.
+ ;; custom-set-faces was added by Custom.
+ ;; 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.
'(default ((t (:inherit nil :stipple nil :background "#0C1021" :foreground "#F8F8F8" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 100 :width normal :foundry "unknown" :family "DejaVu Sans Mono"))))
'(jabber-activity-personal-face ((t (:foreground "#0088FF" :weight bold))))
'(jabber-chat-prompt-local ((t (:foreground "#0aa" :weight bold))))
'(jabber-roster-user-online ((t (:foreground "#69f" :slant normal :weight bold)))))
;; hack to make js2-global-externs actually have an effect.
-(set 'js2-global-externs (list "JSON" "console" "settimeout" "setinterval"
- "cleartimeout" "clearinterval" "require"
+(set 'js2-global-externs (list "JSON" "console" "setTimeout" "setInterval"
+ "clearTimeout" "clearInterval" "require"
"module" "exports" "process" "__dirname"
-
- "__filename"))
+ "__filename" "$" "now" "MathJax" "Buffer"))
(add-hook 'latex-mode-hook 'dvi-with-okular t)
;; flymake mode for js. This is actually JSHint, hacked to work with
-;; lintnode. So this is hintnode, I guess?
-;; (require 'flymake-jslint)
-;; (add-hook 'js2-mode-hook
-;; (lambda () (flymake-mode t)))
-;; (lintnode-start)
+;; lintnode. So this is hintnode, I guess?
+(require 'flymake-jslint)
+(set 'lintnode-running nil)
+(add-hook 'js2-mode-hook
+ (lambda ()
+ (or (if (not lintnode-running)
+ (and (set 'lintnode-running t)
+ (lintnode-start)))
+ (flymake-mode t))))
+
;; Enable disabled commands.
(put 'set-goal-column 'disabled nil)
View
12 dot-env
@@ -1,12 +1,14 @@
# Adding various things to my path.
-export PATH=$HOME/local/gems/bin:$HOME/local/bin:$HOME/.cabal/bin:$PATH
+export PATH=$HOME/local/rabbitmq/sbin:$HOME/local/gems/bin:$HOME/local/bin:$HOME/.cabal/bin:$PATH
# Environment variables for the chunk of time in which I had to use Ruby.
-export GEM_HOME=/home/steve/local/gems
+export GEM_HOME=$HOME/local/gems
export RUBYOPT=rubygems
-export WINEARCH=win32
-
export CPATH=/opt/AMDAPP/include:$CPATH
-export PYTHONPATH=/home/steve/local/lib64/python2.7/site-packages/:$PYTHONPATH
export GIT_PS1_SHOWDIRTYSTATE=true
+export EDITOR=emacs
+export PYTHONPATH=$HOME/local/lib64/python2.7/site-packages:$PYTHONPATH
+
+export WINEARCH=win32
+export WINEDEBUG=fixme-all
View
@@ -14,4 +14,4 @@ for x in $BASE/dot-* ; do
echo Linking ~/$realdot to $x
ln -s $x $HOME/$realdot
-done
+done

0 comments on commit 9b2fb24

Please sign in to comment.