thx

.gitignore

@@ -3,3 +3,8 @@
 Transmission Remote GUI
 vim/bundle/*
 Fritzing
+hub
+camlistore
+git/
+inkscape/
+transmission-daemon/

.gitmodules

@@ -1,3 +1,6 @@
-[submodule "editors/vim/bundle/vundle"]
-	path = editors/vim/bundle/vundle
-	url = git://github.com/gmarik/vundle.git
+[submodule "shells/zsh/lib/syntax-highlighting"]
+	path = shells/zsh/lib/syntax-highlighting
+	url = git://github.com/zsh-users/zsh-syntax-highlighting.git
+[submodule "shells/zsh/lib/history-substring-search"]
+	path = shells/zsh/lib/history-substring-search
+	url = git://github.com/zsh-users/zsh-history-substring-search.git

README.md

@@ -1,14 +1,16 @@
-# TODO
+# My dot files.
 
-* Make ZSH/Bash PATH dynamically figured out (via globbing) like fish
-* Make `rake install` install a .git pre-commit hook to remind about or automatically remove all API keys from dot files (gitconfig, etc)
-* Make `rake install` set up a loop that will always try to `git pull` the dot-files (if working directory is clean) so they are always up to date
-* Remove 'export' from variables that don't need them
-* Make current directory red in prompt if non-writeable (ala fish)
-* Fix shell $PATH. Intelligently build up from only existent directories and ensure no-duplicates
-* Steal some awesome stuff from https://github.com/skwp/dotfiles/blob/master/osx
+Please explore and/or suggest!
 
-Copyright (c) 2008-2011 Bodaniel Jeanes
+## Initial setup
+
+```sh
+$ FRESH_LOCAL_SOURCE=bjeanes/dot-files bash -c "`curl -sL https://get.freshshell.com`"
+```
+
+# LICENSE
+
+Copyright (c) 2008-2013 Bodaniel Jeanes
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

editors/emacs/bjeanes/01_colors.el

@@ -1,7 +1,3 @@
-(defun plist-to-alist (&optional arg) nil) ; stop a weird error coming
-                                           ; from color-theme-molokai
-(require 'color-theme)
-(require 'color-theme-molokai)
-(color-theme-molokai)
+(require 'color-theme-sanityinc-tomorrow)
 
-(set-face-background 'hl-line "#000")
+(color-theme-sanityinc-tomorrow-night)

editors/emacs/bjeanes/99_vim.el

@@ -1,11 +1,51 @@
-(require 'evil)
-(add-hook 'prog-mode-hook 'evil-mode)
-(require 'surround)
-(add-hook 'prog-mode-hook 'global-surround-mode)
-
-(define-key evil-motion-state-map (kbd "C-u") 'evil-scroll-up)
-
 ;; TODO
 ;; * Map D to C-k (i.e. preserve paredit's version)
 ;; * Make word motions obey subword-mode setting
 ;; * Put current Evil state into powerline
+
+(require 'evil)
+
+;; This is actually mapped but it doesn't seem to work reliably
+;; without this
+(define-key evil-motion-state-map (kbd "C-u") 'evil-scroll-up)
+
+;; Escape quits
+;; https://github.com/mbriggs/.emacs.d/blob/d9e254ae/my-keymaps.el#L81-L89
+(define-key evil-normal-state-map [escape] 'keyboard-quit)
+(define-key evil-visual-state-map [escape] 'keyboard-quit)
+(define-key minibuffer-local-map [escape] 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-ns-map [escape] 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-completion-map [escape] 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit)
+
+
+(require 'cl) ; for `flet`
+(flet ((move-key (keymap-from keymap-to key)
+                   (define-key keymap-to key (lookup-key keymap-from key))
+                   (define-key keymap-from key nil)))
+  ;; Keep space/return available for other modes
+  ;; http://emacswiki.org/emacs/Evil#toc11
+  (move-key evil-motion-state-map evil-normal-state-map (kbd "RET"))
+  (move-key evil-motion-state-map evil-normal-state-map " "))
+
+;; a la vim-surround
+(require 'surround)
+(add-hook 'prog-mode-hook
+          (lambda ()
+            (turn-on-evil-mode)
+            (turn-on-surround-mode)))
+
+;; "tabs" (http://emacswiki.org/emacs/Evil#toc16)
+(load "elscreen" "ElScreen" t)
+(define-key evil-normal-state-map (kbd "C-w t") 'elscreen-create) ;create tab
+(define-key evil-normal-state-map (kbd "C-w x") 'elscreen-kill) ;kill tab
+(define-key evil-normal-state-map "gT" 'elscreen-previous) ;previous tab
+(define-key evil-normal-state-map "gt" 'elscreen-next) ;next tab
+
+(require 'evil-paredit)
+(add-hook 'emacs-lisp-mode-hook 'evil-paredit-mode)
+(add-hook 'clojure-mode-hook 'evil-paredit-mode)
+(add-hook 'common-lisp-mode-hook 'evil-paredit-mode)
+(add-hook 'scheme-mode-hook 'evil-paredit-mode)
+(add-hook 'lisp-mode-hook 'evil-paredit-mode)

editors/emacs/bjeanes/bindings.el

@@ -1,3 +1,7 @@
 (global-set-key (kbd "C-x M-f") 'ido-find-file-other-window)
 (global-set-key (kbd "C-x m") 'eshell)
+
+(define-key global-map (kbd "C-+") 'text-scale-increase)
+(define-key global-map (kbd "C--") 'text-scale-decrease)
+
 (define-key 'help-command "a" 'apropos)

editors/emacs/bjeanes/clojure.el

@@ -1,6 +1,7 @@
 (require 'clojure-mode)
 (define-clojure-indent
   (defroutes 'defun)
+  (do-seq 1)
   (GET 2)
   (POST 2)
   (PUT 2)

editors/emacs/bjeanes/go.el

@@ -0,0 +1,2 @@
+(require 'go-mode)
+(gofmt-before-save)

editors/emacs/bjeanes/misc.el

@@ -1,5 +1,5 @@
 (require 'powerline)
-(command-execute 'powerline-default)
+(command-execute 'powerline-default-theme)
 
 (global-auto-revert-mode t)
 

editors/emacs/bjeanes/programming.el

@@ -6,6 +6,20 @@
             (require 'autopair)
             (autopair-mode 1)
 
-            ;; TODO: Look into whitespace-cleanup instead?
+            (define-key global-map (kbd "RET") 'newline-and-indent)
+
             (add-hook 'before-save-hook
-                      'delete-trailing-whitespace)))
+                      (lambda ()
+                        (gofmt-before-save)
+                        (delete-trailing-whitespace)))
+
+            (require 'auto-complete-config)
+            (ac-config-default)))
+
+
+;;;;;;;; misc
+
+;; Auto-compile is really annoying if you have an existing
+;; compilation process that puts the output elsewhere or names it
+;; differently (e.g. Rails asset pipeline, Middleman, etc)
+(setq scss-compile-at-save nil)

editors/emacs/bjeanes/ruby.el

@@ -2,7 +2,8 @@
 (require 'ruby-end)
 (require 'ruby-tools)
 
-(custom-set-variables '(ruby-end-insert-newline nil))
+(custom-set-variables '(ruby-end-insert-newline nil)
+                      '(ruby-deep-indent-paren nil))
 
 (eval-after-load 'ruby-mode '(progn
                                (add-hook 'ruby-mode-hook

editors/emacs/bjeanes/snippets.el

@@ -0,0 +1,8 @@
+(require 'yasnippet)
+
+(add-to-list 'yas-snippet-dirs
+             (concat esk-user-dir "/snippets"))
+
+(yas-reload-all)
+
+(add-hook 'prog-mode-hook 'yas-minor-mode)

editors/emacs/init.el

@@ -9,31 +9,54 @@
   (package-refresh-contents))
 
 ;; Add in your own as you wish:
-(defvar my-packages '(starter-kit
-                      starter-kit-ruby
-                      starter-kit-lisp
-                      starter-kit-eshell
-                      starter-kit-js
+(defvar my-packages '(ac-nrepl
+                      auto-complete
+                      autopair
                       clojure-mode
                       clojure-test-mode
                       clojurescript-mode
-                      autopair
-                      ruby-tools
-                      ruby-end
-                      ruby-electric
-                      markdown-mode
                       color-theme
-                      color-theme-molokai
-                      rainbow-delimiters
+                      color-theme-sanityinc-tomorrow
                       ctags
+                      evil
+                      evil-paredit
+                      exec-path-from-shell
+                      find-file-in-repository
+                      go-mode
+                      markdown-mode
                       paredit
-                      undo-tree
-                      org
                       powerline
-                      evil
-                      surround)
+                      rainbow-delimiters
+                      ruby-electric
+                      ruby-end
+                      ruby-tools
+                      starter-kit
+                      starter-kit-eshell
+                      starter-kit-js
+                      starter-kit-lisp
+                      starter-kit-ruby
+                      surround
+                      undo-tree
+                      yasnippet)
   "A list of packages to ensure are installed at launch.")
 
 (dolist (p my-packages)
   (when (not (package-installed-p p))
         (package-install p)))
+
+;; This takes a really long time because ZSH init scripts are TOO slow!
+;; Thoughts:
+;;   * Extract a lot of non-interactive ZSH stuff to spawn from
+;;     .zshenv and adjust exec-path-from-shell to not start interactive
+;;     shell
+(when (memq window-system '(mac ns))
+  (exec-path-from-shell-initialize))
+
+;; TODO:
+;; * Go snippets
+;; * Custom ruby/rspec snippetts
+;; * proper auto-complete / intellisense
+;;   * auto pop-up (~100ms)
+;;   * intuitive TAB/ENTER support
+;;   * can be backed by REPL, ctags, buffer words, etc
+;; * Plug snippets into auto-complete