Merge branch 'master' of github.com:DeCarabas/Init-Files

.emacs.d/core.el

@@ -65,9 +65,9 @@
 
 (defvar my-packages
   (list 
-   'switch-window	    ; takes over C-x o
+   'switch-window	         ; takes over C-x o
-   'auto-complete	    ; complete as you type with overlays
+   'auto-complete	         ; complete as you type with overlays
-   'zencoding-mode  	    ; http://www.emacswiki.org/emacs/ZenCoding
+   'zencoding-mode  	     ; http://www.emacswiki.org/emacs/ZenCoding
    'ruby-mode                ; Major mode for editing Ruby files
    'color-theme              ; Color themes...
    'color-theme-solarized    ; ...Solarized
@@ -88,7 +88,16 @@
 
    'tss                      ; Typescript, ala https://github.com/aki2o/emacs-tss
 
-   ;; ----- PROVISIONAL (for whatever that's worth)
+   ;; Clojure stuffs
+   'clojure-mode            
+   'clojure-test-mode
+   'cider
+   'cider-decompile
+   'cider-tracing
+   'ac-nrepl                 ; Autocomplete for Clojure
+
+   'paredit                  ; Also good for lisps?
+
    'auto-complete-nxml       ; Auto-complete for nxml (maybe?)
    'magit                    ; Magit?
    )
@@ -141,7 +150,7 @@
 (if (fboundp 'tool-bar-mode) (tool-bar-mode -1))
 (if (fboundp 'menu-bar-mode) (menu-bar-mode -1))
 
-;; Consolas.
+;; Consolas. (And, to a lesser extent, Inconsolata.)
 ;;
 (require 'cl)
 (defun font-existsp (font)
@@ -206,6 +215,18 @@
 
 (global-set-key (read-kbd-macro "C-x f") 'font-lock-fontify-buffer)
 
+;; In addition, make sure various things are working properly with xterm-keys
+;; on under tmux. (This has been the most reliable way to get putty to send
+;; the right keystrokes into emacs.)
+(defadvice terminal-init-screen
+  ;; The advice is named `tmux', and is run before `terminal-init-screen' runs.
+  (before tmux activate)
+  "Apply xterm keymap, allowing use of keys passed through tmux."
+  (if (getenv "TMUX")
+    (let ((map (copy-keymap xterm-function-map)))
+    (set-keymap-parent map (keymap-parent input-decode-map))
+    (set-keymap-parent input-decode-map map))))
+
 ;; =================================================================
 ;; Random Goo.
 ;; Drunken men who don't know where they are, and no longer care.
@@ -364,7 +385,8 @@
 (defun indent-buffer ()
   "Indent the entire current buffer based on the current mode"
   (interactive)
-  (indent-region (point-min) (point-max) nil))
+  (indent-region (point-min) (point-max))
+  (whitespace-cleanup))
 
 (global-set-key (read-kbd-macro "C-c TAB") 'indent-buffer)
 
@@ -582,11 +604,11 @@
 
 (require 'go-mode)
 (require 'auto-complete-config)
-;(require 'go-autocomplete)
+(require 'go-autocomplete)
 
 (defun my-go-mode-hook ()
   (flycheck-mode)
-  ;(auto-complete-mode)
+  (auto-complete-mode)
   )
 
 (add-hook 'go-mode-hook 'my-go-mode-hook)
@@ -616,3 +638,18 @@
 ;; =================================================================
 (add-to-list 'auto-mode-alist '("\\.appx\\'" . archive-mode))
 (add-to-list 'auto-coding-alist '("\\.appx\\'" . no-conversion))
+
+;; ===
+;; Clojure
+;; ===
+(require 'ac-nrepl)
+(defun my-cider-mode-hook ()
+  ; (paredit-mode)
+  (ac-nrepl-setup)
+  (auto-complete-mode)
+  (cider-turn-on-eldoc-mode)
+  )
+
+(add-hook 'cider-repl-mode-hook 'my-cider-mode-hook)
+(add-hook 'cider-mode-hook 'my-cider-mode-hook)
+(add-hook 'cider-mode-hook 'cider-turn-on-eldoc-mode)

.emacs.d/custom.el

@@ -8,6 +8,7 @@
  '(c-indent-level 4)
  '(c-label-minimum-indentation 0)
  '(c-label-offset -4)
+ '(css-indent-offset 2)
  '(fast-lock-cache-directories (quote ("~/flc-cache")))
  '(fast-lock-minimum-size nil)
  '(fill-column 77)
@@ -22,7 +23,7 @@
  '(indent-tabs-mode nil)
  '(inhibit-startup-screen t)
  '(ispell-program-name "aspell")
- '(js2-basic-offset 4)
+ '(js2-basic-offset 2)
  '(js2-bounce-indent-p t)
  '(js2-strict-trailing-comma-warning nil)
  '(make-backup-files nil)

.tmux.conf

@@ -6,7 +6,7 @@ bind-key C-b last-window
 set -g base-index 1
 
 # Allows for faster key repetition
-set -s escape-time 0
+#set -s escape-time 0
 
 # Set status bar
 set -g status-bg black
@@ -23,6 +23,9 @@ setw -g aggressive-resize on
 # another TMUX session
 bind-key a send-prefix
 
+# Fix control keys through putty
+set -g xterm-keys on
+
 # Activity monitoring
 #setw -g monitor-activity on
 #set -g visual-activity on

bin/lein

@@ -0,0 +1,348 @@
+#!/usr/bin/env bash
+
+# Ensure this file is executable via `chmod a+x lein`, then place it
+# somewhere on your $PATH, like ~/bin. The rest of Leiningen will be
+# installed upon first run into the ~/.lein/self-installs directory.
+
+export LEIN_VERSION="2.3.4"
+
+case $LEIN_VERSION in
+    *SNAPSHOT) SNAPSHOT="YES" ;;
+    *) SNAPSHOT="NO" ;;
+esac
+
+if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
+    delimiter=";"
+else
+    delimiter=":"
+fi
+
+if [[ "$OSTYPE" == "cygwin" ]]; then
+  cygwin=true
+else
+  cygwin=false
+fi
+
+function make_native_path {
+    # ensure we have native paths
+    if $cygwin && [[ "$1"  == /* ]]; then
+    echo -n "$(cygpath -wp "$1")"
+    elif [[ "$OSTYPE" == "msys" && "$1"  == /* ]]; then
+    echo -n "$(sh -c "(cd $1 2</dev/null && pwd -W) || echo $1 | sed 's/^\\/\([a-z]\)/\\1:/g'")"
+    else
+    echo -n "$1"
+    fi
+}
+
+#  usage : add_path PATH_VAR [PATH]...
+function add_path {
+    local path_var="$1"
+    shift
+    while [ -n "$1" ];do
+        # http://bashify.com/?Useful_Techniques:Indirect_Variables:Indirect_Assignment
+    export ${path_var}="${!path_var}${delimiter}$(make_native_path "$1")"
+    shift
+    done
+}
+
+function download_failed_message {
+    echo "Failed to download $1"
+    echo "It's possible your HTTP client's certificate store does not have the"
+    echo "correct certificate authority needed. This is often caused by an"
+    echo "out-of-date version of libssl. Either upgrade it or set HTTP_CLIENT"
+    echo "to turn off certificate checks:"
+    echo "  export HTTP_CLIENT=\"wget --no-check-certificate -O\" # or"
+    echo "  export HTTP_CLIENT=\"curl --insecure -f -L -o\""
+    echo "It's also possible that you're behind a firewall haven't yet"
+    echo "set HTTP_PROXY and HTTPS_PROXY."
+}
+
+function self_install {
+  if [ -r "$LEIN_JAR" ]; then
+    echo "The self-install jar already exists at $LEIN_JAR."
+    echo "If you wish to re-download, delete it and rerun \"$0 self-install\"."
+    exit 1
+  fi
+  echo "Downloading Leiningen to $LEIN_JAR now..."
+  mkdir -p "$(dirname "$LEIN_JAR")"
+  LEIN_URL="https://leiningen.s3.amazonaws.com/downloads/leiningen-$LEIN_VERSION-standalone.jar"
+  $HTTP_CLIENT "$LEIN_JAR.pending" "$LEIN_URL"
+  if [ $? == 0 ]; then
+      # TODO: checksum
+      mv -f "$LEIN_JAR.pending" "$LEIN_JAR"
+  else
+      rm "$LEIN_JAR.pending" 2> /dev/null
+      download_failed_message "$LEIN_URL"
+      exit 1
+  fi
+}
+
+if [ `id -u` -eq 0 ] && [ "$LEIN_ROOT" = "" ]; then
+    echo "WARNING: You're currently running as root; probably by accident."
+    echo "Press control-C to abort or Enter to continue as root."
+    echo "Set LEIN_ROOT to disable this warning."
+    read _
+fi
+
+NOT_FOUND=1
+ORIGINAL_PWD="$PWD"
+while [ ! -r "$PWD/project.clj" ] && [ "$PWD" != "/" ] && [ $NOT_FOUND -ne 0 ]
+do
+    cd ..
+    if [ "$(dirname "$PWD")" = "/" ]; then
+        NOT_FOUND=0
+        cd "$ORIGINAL_PWD"
+    fi
+done
+
+export LEIN_HOME="${LEIN_HOME:-"$HOME/.lein"}"
+
+for f in "$LEIN_HOME/leinrc" ".leinrc"; do
+  if [ -e "$f" ]; then
+    source "$f"
+  fi
+done
+
+if $cygwin; then
+    export LEIN_HOME=`cygpath -w "$LEIN_HOME"`
+fi
+
+LEIN_JAR="$LEIN_HOME/self-installs/leiningen-$LEIN_VERSION-standalone.jar"
+
+# normalize $0 on certain BSDs
+if [ "$(dirname "$0")" = "." ]; then
+    SCRIPT="$(which $(basename "$0"))"
+else
+    SCRIPT="$0"
+fi
+
+# resolve symlinks to the script itself portably
+while [ -h "$SCRIPT" ] ; do
+    ls=`ls -ld "$SCRIPT"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        SCRIPT="$link"
+    else
+        SCRIPT="$(dirname "$SCRIPT"$)/$link"
+    fi
+done
+
+BIN_DIR="$(dirname "$SCRIPT")"
+
+export LEIN_JVM_OPTS="${LEIN_JVM_OPTS-"-XX:+TieredCompilation -XX:TieredStopAtLevel=1"}"
+
+# This needs to be defined before we call HTTP_CLIENT below
+if [ "$HTTP_CLIENT" = "" ]; then
+    if type -p curl >/dev/null 2>&1; then
+        if [ "$https_proxy" != "" ]; then
+            CURL_PROXY="-x $https_proxy"
+        fi
+        HTTP_CLIENT="curl $CURL_PROXY -f -L -o"
+    else
+        HTTP_CLIENT="wget -O"
+    fi
+fi
+
+
+# When :eval-in :classloader we need more memory
+grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null && \
+    export LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Xms64m -Xmx512m"
+
+if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
+    # Running from source checkout
+    LEIN_DIR="$(dirname "$BIN_DIR")"
+
+    # Need to use lein release to bootstrap the leiningen-core library (for aether)
+    if [ ! -r "$LEIN_DIR/leiningen-core/.lein-bootstrap" ]; then
+        echo "Leiningen is missing its dependencies."
+        echo "Please run \"lein bootstrap\" in the leiningen-core/ directory"
+        echo "with a stable release of Leiningen. See CONTRIBUTING.md for details."
+        exit 1
+    fi
+
+    # If project.clj for lein or leiningen-core changes, we must recalculate
+    LAST_PROJECT_CHECKSUM=$(cat "$LEIN_DIR/.lein-project-checksum" 2> /dev/null)
+    PROJECT_CHECKSUM=$(sum "$LEIN_DIR/project.clj" "$LEIN_DIR/leiningen-core/project.clj")
+    if [ "$PROJECT_CHECKSUM" != "$LAST_PROJECT_CHECKSUM" ]; then
+        if [ -r "$LEIN_DIR/.lein-classpath" ]; then
+            rm "$LEIN_DIR/.lein-classpath"
+        fi
+    fi
+
+    # Use bin/lein to calculate its own classpath.
+    if [ ! -r "$LEIN_DIR/.lein-classpath" ] && [ "$1" != "classpath" ]; then
+        echo "Recalculating Leiningen's classpath."
+        ORIG_PWD="$PWD"
+        cd "$LEIN_DIR"
+
+        $0 classpath .lein-classpath
+        sum "$LEIN_DIR/project.clj" "$LEIN_DIR/leiningen-core/project.clj" > \
+            .lein-project-checksum
+        cd "$ORIG_PWD"
+    fi
+
+    mkdir -p "$LEIN_DIR/target/classes"
+    export LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Dclojure.compile.path=$LEIN_DIR/target/classes"
+    add_path CLASSPATH "$LEIN_DIR/leiningen-core/src/" "$LEIN_DIR/leiningen-core/resources/" \
+        "$LEIN_DIR/test:$LEIN_DIR/target/classes" "$LEIN_DIR/src" ":$LEIN_DIR/resources"
+
+    if [ -r "$LEIN_DIR/.lein-classpath" ]; then
+        add_path CLASSPATH "$(cat "$LEIN_DIR/.lein-classpath" 2> /dev/null)"
+    else
+        add_path CLASSPATH "$(cat "$LEIN_DIR/leiningen-core/.lein-bootstrap" 2> /dev/null)"
+    fi
+else # Not running from a checkout
+    add_path CLASSPATH "$LEIN_JAR"
+
+    BOOTCLASSPATH="-Xbootclasspath/a:$LEIN_JAR"
+
+    if [ ! -r "$LEIN_JAR" -a "$1" != "self-install" ]; then
+        self_install
+    fi
+fi
+
+# TODO: explain what to do when Java is missing
+export JAVA_CMD="${JAVA_CMD:-"java"}"
+export LEIN_JAVA_CMD="${LEIN_JAVA_CMD:-$JAVA_CMD}"
+
+if [[ "$(basename "$LEIN_JAVA_CMD")" == *drip* ]]; then
+    export DRIP_INIT="$(printf -- '-e\n(require (quote leiningen.repl))')"
+fi
+
+# Support $JAVA_OPTS for backwards-compatibility.
+export JVM_OPTS="${JVM_OPTS:-"$JAVA_OPTS"}"
+
+# Handle jline issue with cygwin not propagating OSTYPE through java subprocesses: https://github.com/jline/jline2/issues/62
+cygterm=false
+if $cygwin; then
+  case "$TERM" in
+    rxvt* | xterm* | vt*) cygterm=true ;;
+  esac
+fi
+
+if $cygterm; then
+  LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Djline.terminal=jline.UnixTerminal"
+  stty -icanon min 1 -echo > /dev/null 2>&1
+fi
+
+# TODO: investigate http://skife.org/java/unix/2011/06/20/really_executable_jars.html
+# If you're packaging this for a package manager (.deb, homebrew, etc)
+# you need to remove the self-install and upgrade functionality or see lein-pkg.
+if [ "$1" = "self-install" ]; then
+    if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
+        echo "Running self-install from a checkout is not supported."
+        echo "See CONTRIBUTING.md for SNAPSHOT-specific build instructions."
+        exit 1
+    fi
+    echo "Manual self-install is deprecated; it will run automatically when necessary."
+    self_install
+elif [ "$1" = "upgrade" ] || [ "$1" = "downgrade" ]; then
+    if [ "$LEIN_DIR" != "" ]; then
+        echo "The upgrade task is not meant to be run from a checkout."
+        exit 1
+    fi
+    if [ $SNAPSHOT = "YES" ]; then
+        echo "The upgrade task is only meant for stable releases."
+        echo "See the \"Hacking\" section of the README."
+        exit 1
+    fi
+    if [ ! -w "$SCRIPT" ]; then
+        echo "You do not have permission to upgrade the installation in $SCRIPT"
+        exit 1
+    else
+        TARGET_VERSION="${2:-stable}"
+        echo "The script at $SCRIPT will be upgraded to the latest $TARGET_VERSION version."
+        echo -n "Do you want to continue [Y/n]? "
+        read RESP
+        case "$RESP" in
+            y|Y|"")
+                echo
+                echo "Upgrading..."
+                TARGET="/tmp/lein-$$-upgrade"
+                if $cygwin; then
+                    TARGET=`cygpath -w $TARGET`
+                fi
+                LEIN_SCRIPT_URL="https://github.com/technomancy/leiningen/raw/$TARGET_VERSION/bin/lein"
+                $HTTP_CLIENT "$TARGET" "$LEIN_SCRIPT_URL"
+                if [ $? == 0 ]; then
+                    mv "$TARGET" "$SCRIPT" && chmod +x "$SCRIPT"
+                    exec "$SCRIPT" version
+                else
+                    download_failed_message "$LEIN_SCRIPT_URL"
+                fi;;
+            *)
+                echo "Aborted."
+                exit 1;;
+        esac
+    fi
+else
+    if $cygwin; then
+        # When running on Cygwin, use Windows-style paths for java
+        ORIGINAL_PWD=`cygpath -w "$ORIGINAL_PWD"`
+    fi
+
+    # apply context specific CLASSPATH entries
+    if [ -f .lein-classpath ]; then
+        add_path CLASSPATH "$(cat .lein-classpath)"
+    fi
+
+    if [ $DEBUG ]; then
+        echo "Leiningen's classpath: $CLASSPATH"
+    fi
+
+    if ([ "$LEIN_FAST_TRAMPOLINE" != "" ] || [ -r .lein-fast-trampoline ]) &&
+        [ -r project.clj ]; then
+        INPUTS="$@ $(cat project.clj) $LEIN_VERSION $(test -f "$LEIN_HOME/profiles.clj" && cat "$LEIN_HOME/profiles.clj")"
+        INPUT_CHECKSUM=$(echo $INPUTS | shasum - | cut -f 1 -d " ")
+        # Just don't change :target-path in project.clj, mkay?
+        TRAMPOLINE_FILE="target/trampolines/$INPUT_CHECKSUM"
+    else
+        TRAMPOLINE_FILE="$(mktemp /tmp/lein-trampoline-XXXXXXXXXXXXX)"
+        trap "rm -f $TRAMPOLINE_FILE" EXIT
+    fi
+
+    if $cygwin; then
+        TRAMPOLINE_FILE=`cygpath -w $TRAMPOLINE_FILE`
+    fi
+
+    if [ "$INPUT_CHECKSUM" != "" ] && [ -r "$TRAMPOLINE_FILE" ]; then
+        if [ $DEBUG ]; then
+            echo "Fast trampoline with $TRAMPOLINE_FILE."
+        fi
+        exec sh -c "exec $(cat $TRAMPOLINE_FILE)"
+    else
+        export TRAMPOLINE_FILE
+        "$LEIN_JAVA_CMD" -client \
+            "${BOOTCLASSPATH[@]}" \
+            $LEIN_JVM_OPTS \
+            -Dfile.encoding=UTF-8 \
+            -Dmaven.wagon.http.ssl.easy=false \
+            -Dleiningen.original.pwd="$ORIGINAL_PWD" \
+            -Dleiningen.script="$SCRIPT" \
+            -classpath "$CLASSPATH" \
+            clojure.main -m leiningen.core.main "$@"
+
+        EXIT_CODE=$?
+
+        if $cygterm ; then
+          stty icanon echo > /dev/null 2>&1
+        fi
+
+        ## TODO: [ -r "$TRAMPOLINE_FILE" ] may be redundant? A trampoline file
+        ## is always generated these days.
+        if [ -r "$TRAMPOLINE_FILE" ] && [ "$LEIN_TRAMPOLINE_WARMUP" = "" ]; then
+            TRAMPOLINE="$(cat $TRAMPOLINE_FILE)"
+            if [ "$INPUT_CHECKSUM" = "" ]; then
+                rm $TRAMPOLINE_FILE
+            fi
+            if [ "$TRAMPOLINE" = "" ]; then
+                exit $EXIT_CODE
+            else
+                exec sh -c "exec $TRAMPOLINE"
+            fi
+        else
+            exit $EXIT_CODE
+        fi
+    fi
+fi
+

bin/tmx

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+#
+# Modified TMUX start script from:
+#     http://forums.gentoo.org/viewtopic-t-836006-start-0.html
+#
+# Store it to `~/bin/tmx` and issue `chmod +x`.
+#
+
+# Works because bash automatically trims by assigning to variables and by 
+# passing arguments
+trim() { echo $1; }
+
+if [[ -z "$1" ]]; then
+    echo "Specify session name as the first argument"
+    exit
+fi
+
+# Only because I often issue `ls` to this script by accident
+if [[ "$1" == "ls" ]]; then
+    tmux ls
+    exit
+fi
+
+base_session="$1"
+# This actually works without the trim() on all systems except OSX
+tmux_nb=$(trim `tmux ls | grep "^$base_session" | wc -l`)
+if [[ "$tmux_nb" == "0" ]]; then
+    echo "Launching tmux base session $base_session ..."
+    tmux new-session -s $base_session
+else
+    # Make sure we are not already in a tmux session
+    if [[ -z "$TMUX" ]]; then
+        # Kill defunct sessions first
+        old_sessions=$(tmux ls 2>/dev/null | egrep "^[0-9]{14}.*[0-9]+\)$" | cut -f 1 -d:)
+        for old_session_id in $old_sessions; do
+            tmux kill-session -t $old_session_id
+        done
+
+        echo "Launching copy of base session $base_session ..."
+        # Session is is date and time to prevent conflict
+        session_id=`date +%Y%m%d%H%M%S`
+        # Create a new session (without attaching it) and link to base session 
+        # to share windows
+        tmux new-session -d -t $base_session -s $session_id
+        # Create a new window in that session
+        #tmux new-window
+        # Attach to the new session
+        tmux attach-session -t $session_id
+        # When we detach from it, kill the session
+        tmux kill-session -t $session_id
+    fi
+fi