commit d7ebb8e0d29ca91d835972ca0d2911374d6d1e3f Author: Tim McCarthy Date: Fri Aug 21 02:14:05 2015 -0700 Initial checkin diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..4efbafb --- /dev/null +++ b/deploy.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +echo "Deploying dotfiles..." + +pushd $HOME &> /dev/null + +FILES=($(ls -p .dotfiles | grep -v / | grep -v deploy)) + +for file in ${FILES[@]}; do + mv .$file .${file}.bak + ln -s .dotfiles/$file .$file +done + +mkdir -p .config +mv .config/fish .config/fish.bak +ln -s .dotfiles/fish .config/fish + +popd &> /dev/null + +echo "...done." diff --git a/fish/.gitignore b/fish/.gitignore new file mode 100644 index 0000000..63159c7 --- /dev/null +++ b/fish/.gitignore @@ -0,0 +1,2 @@ +fish_history +fishd.* diff --git a/fish/completions/adb.fish b/fish/completions/adb.fish new file mode 100644 index 0000000..f363973 --- /dev/null +++ b/fish/completions/adb.fish @@ -0,0 +1,5 @@ +function __fish_adb_devices + adb devices | tail -n +2 | cut -f 1 +end + +complete -c adb -n '__fish_contains_opt -s s' -a '(__fish_adb_devices)' -d 'Device' -f diff --git a/fish/config.fish b/fish/config.fish new file mode 100644 index 0000000..9a9fb68 --- /dev/null +++ b/fish/config.fish @@ -0,0 +1,32 @@ +# ============ +# Basics, etc… +# ============ + +# Default browser +set -g -x EDITOR "emacsclient" + +# Add ~/bin to PATH +set -g -x PATH ~/bin $PATH + +# ========= +# Functions +# ========= + +function ec + emacsclient -n $argv +end + +# IP addresses +function ip + curl icanhazip.com +end + +# edit config.fish (this file) +function cf + ec ~/.config/fish/config.fish +end + +# reload your Fish config +function src + source ~/.config/fish/config.fish; and clear +end diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish new file mode 100644 index 0000000..77653fd --- /dev/null +++ b/fish/functions/fish_prompt.fish @@ -0,0 +1,26 @@ +function fish_prompt + # $status gets nuked as soon as something else is run, e.g. set_color + # so it has to be saved asap. + set -l last_status $status + + fish_prompt_colors + + # Clear the line because fish seems to emit the prompt twice. The initial + # display, then when you press enter. + # printf "\033[K" + + # Current Directory + # 1st sed for colourising forward slashes + # 2nd sed for colourising the deepest path (the 'm' is the last char in the + # ANSI colour code that needs to be stripped) + printf $c1 + printf (prompt_pwd | sed "s,/,$c0/$c1,g" | sed "s,\(.*\)/[^m]*m,\1/$c3,") + + if test ! $last_status = "0" + printf $ce + else + printf $c4 + end + printf " > " + printf $c4 +end diff --git a/fish/functions/fish_prompt_colors.fish b/fish/functions/fish_prompt_colors.fish new file mode 100644 index 0000000..9ec5fcc --- /dev/null +++ b/fish/functions/fish_prompt_colors.fish @@ -0,0 +1,10 @@ +function fish_prompt_colors + # c0 to c4 progress from dark to bright + # ce is the error colour + set -g c0 (set_color 005284) + set -g c1 (set_color 0075cd) + set -g c2 (set_color 009eff) + set -g c3 (set_color 6dc7ff) + set -g c4 (set_color ffffff) + set -g ce (set_color $fish_color_error) +end diff --git a/fish/functions/fish_right_prompt.fish b/fish/functions/fish_right_prompt.fish new file mode 100644 index 0000000..83ff3c2 --- /dev/null +++ b/fish/functions/fish_right_prompt.fish @@ -0,0 +1,41 @@ +# prints "ARG1:ARG2" with appropriate colors +function section + printf ", " + printf $c1 + printf $argv[1] + printf $c0 + printf ":" + printf $c3 + printf $argv[2] + printf $c0 +end + +function machine_tag + hostname | cut -f1 -d. - | tr '[a-z]' '[A-Z]' +end + +function fish_right_prompt + # Current time + printf $c0 + printf "[" + printf (date "+$c2%H$c0:$c2%M") + + # Show last execution time + if test $CMD_DURATION + if test $CMD_DURATION -gt (math "1000 * 2") + set secs (math "$CMD_DURATION / 1000") + section took {$secs}s + end + end + + printf $c0 + printf "]" + + if set -q SSH_CLIENT + printf "[" + printf $c1 + printf (machine_tag) + printf $c0 + printf "]" + end +end diff --git a/fish/rvm.fish b/fish/rvm.fish new file mode 100644 index 0000000..59a096e --- /dev/null +++ b/fish/rvm.fish @@ -0,0 +1,35 @@ +function rvm --description='Ruby enVironment Manager' + # run RVM and capture the resulting environment + set --local env_file (mktemp -t rvm.fish.XXXXXXXXXX) + bash -c 'source ~/.rvm/scripts/rvm; rvm "$@"; status=$?; env > "$0"; exit $status' $env_file $argv + + # apply rvm_* and *PATH variables from the captured environment + and eval (grep '^rvm\|^[^=]*PATH\|^GEM_HOME' $env_file | grep -v '_clr=' | sed '/^[^=]*PATH/y/:/ /; s/^/set -xg /; s/=/ /; s/$/ ;/; s/(//; s/)//') + # clean up + rm -f $env_file +end + +function __handle_rvmrc_stuff --on-variable PWD + # Source a .rvmrc file in a directory after changing to it, if it exists. + # To disable this fature, set rvm_project_rvmrc=0 in $HOME/.rvmrc + if test "$rvm_project_rvmrc" != 0 + set -l cwd $PWD + while true + if contains $cwd "" $HOME "/" + if test "$rvm_project_rvmrc_default" = 1 + rvm default 1>/dev/null 2>&1 + end + break + else + if begin; test -s ".rvmrc"; or test -s ".ruby-version"; or test -s ".ruby-gemset"; end + eval "rvm reload" > /dev/null + break + else + set cwd (dirname "$cwd") + end + end + end + + set -e cwd + end +end diff --git a/gemrc b/gemrc new file mode 100644 index 0000000..1c0377d --- /dev/null +++ b/gemrc @@ -0,0 +1,2 @@ +install: --no-rdoc +update: --no-rdoc \ No newline at end of file diff --git a/gitconfig b/gitconfig new file mode 100644 index 0000000..283c6e2 --- /dev/null +++ b/gitconfig @@ -0,0 +1,10 @@ +[user] + name = Tim McCarthy + email = thoomfish@gmail.com +[color] + ui = true +[alias] + amend = commit --amend -C HEAD + lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit +[push] + default = simple diff --git a/irbrc b/irbrc new file mode 100644 index 0000000..f9410cf --- /dev/null +++ b/irbrc @@ -0,0 +1,2 @@ +require 'pp' +IRB.conf[:AUTO_INDENT] = true \ No newline at end of file diff --git a/nethackrc b/nethackrc new file mode 100644 index 0000000..e267358 --- /dev/null +++ b/nethackrc @@ -0,0 +1,4 @@ +OPTIONS=!autopickup,showexp,showscore,color,time +OPTIONS=catname:Meowth +OPTIONS=dogname:Dongs-REO-Speedwagon +OPTIONS=horsename:a Horse With No Name diff --git a/spacemacs b/spacemacs new file mode 100644 index 0000000..7cf2e8d --- /dev/null +++ b/spacemacs @@ -0,0 +1,182 @@ +;; -*- mode: emacs-lisp -*- +;; This file is loaded by Spacemacs at startup. +;; It must be stored in your home directory. + +(defun dotspacemacs/layers () + "Configuration Layers declaration." + (setq ttm-layers + '( + ;; ---------------------------------------------------------------- + ;; Example of useful layers you may want to use right away. + ;; Uncomment some layer names and press (Vim style) or + ;; (Emacs style) to install them. + ;; ---------------------------------------------------------------- + ;; auto-completion + ;; better-defaults + (colors :variables + colors-enable-rainbow-identifiers t) + emacs-lisp + git + ;; markdown + org + ;; (shell :variables + ;; shell-default-height 30 + ;; shell-default-position 'bottom) + ;; syntax-checking + version-control + )) + + ;; Enable osx layer only on Macs + (cond + ((string-equal system-type "darwin") + (add-to-list 'ttm-layers 'osx))) + + (setq-default + ;; List of additional paths where to look for configuration layers. + ;; Paths must have a trailing slash (i.e. `~/.mycontribs/') + dotspacemacs-configuration-layer-path '() + ;; List of configuration layers to load. If it is the symbol `all' instead + ;; of a list then all discovered layers will be installed. + dotspacemacs-configuration-layers ttm-layers + ;; List of additional packages that will be installed without being + ;; wrapped in a layer. If you need some configuration for these + ;; packages then consider to create a layer, you can also put the + ;; configuration in `dotspacemacs/config'. + dotspacemacs-additional-packages '() + ;; A list of packages and/or extensions that will not be install and loaded. + dotspacemacs-excluded-packages '() + ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that + ;; are declared in a layer which is not a member of + ;; the list `dotspacemacs-configuration-layers' + dotspacemacs-delete-orphan-packages t)) + +(defun dotspacemacs/init () + "Initialization function. +This function is called at the very startup of Spacemacs initialization +before layers configuration." + ;; This setq-default sexp is an exhaustive list of all the supported + ;; spacemacs settings. + (setq-default + ;; Either `vim' or `emacs'. Evil is always enabled but if the variable + ;; is `emacs' then the `holy-mode' is enabled at startup. + dotspacemacs-editing-style 'vim + ;; If non nil output loading progress in `*Messages*' buffer. + dotspacemacs-verbose-loading nil + ;; Specify the startup banner. Default value is `official', it displays + ;; the official spacemacs logo. An integer value is the index of text + ;; banner, `random' chooses a random text banner in `core/banners' + ;; directory. A string value must be a path to an image format supported + ;; by your Emacs build. + ;; If the value is nil then no banner is displayed. + dotspacemacs-startup-banner 'official + ;; List of items to show in the startup buffer. If nil it is disabled. + ;; Possible values are: `recents' `bookmarks' `projects'." + dotspacemacs-startup-lists '(recents projects) + ;; List of themes, the first of the list is loaded when spacemacs starts. + ;; Press T n to cycle to the next theme in the list (works great + ;; with 2 themes variants, one dark and one light) + dotspacemacs-themes '(solarized-light + solarized-dark + spacemacs-light + spacemacs-dark + leuven + monokai + zenburn) + ;; If non nil the cursor color matches the state color. + dotspacemacs-colorize-cursor-according-to-state t + ;; Default font. `powerline-scale' allows to quickly tweak the mode-line + ;; size to make separators look not too crappy. + dotspacemacs-default-font '("Source Code Pro" + :size 13 + :weight normal + :width normal + :powerline-scale 1.1) + ;; The leader key + dotspacemacs-leader-key "SPC" + ;; The leader key accessible in `emacs state' and `insert state' + dotspacemacs-emacs-leader-key "M-m" + ;; Major mode leader key is a shortcut key which is the equivalent of + ;; pressing ` m`. Set it to `nil` to disable it. + dotspacemacs-major-mode-leader-key "," + ;; Major mode leader key accessible in `emacs state' and `insert state' + dotspacemacs-major-mode-emacs-leader-key "C-M-m" + ;; The command key used for Evil commands (ex-commands) and + ;; Emacs commands (M-x). + ;; By default the command key is `:' so ex-commands are executed like in Vim + ;; with `:' and Emacs commands are executed with ` :'. + dotspacemacs-command-key ":" + ;; Location where to auto-save files. Possible values are `original' to + ;; auto-save the file in-place, `cache' to auto-save the file to another + ;; file stored in the cache directory and `nil' to disable auto-saving. + ;; Default value is `cache'. + dotspacemacs-auto-save-file-location 'cache + ;; If non nil then `ido' replaces `helm' for some commands. For now only + ;; `find-files' (SPC f f) is replaced. + dotspacemacs-use-ido t + ;; If non nil the paste micro-state is enabled. When enabled pressing `p` + ;; several times cycle between the kill ring content. + dotspacemacs-enable-paste-micro-state nil + ;; Guide-key delay in seconds. The Guide-key is the popup buffer listing + ;; the commands bound to the current keystrokes. + dotspacemacs-guide-key-delay 0.4 + ;; If non nil a progress bar is displayed when spacemacs is loading. This + ;; may increase the boot time on some systems and emacs builds, set it to + ;; nil ;; to boost the loading time. + dotspacemacs-loading-progress-bar t + ;; If non nil the frame is fullscreen when Emacs starts up. + ;; (Emacs 24.4+ only) + dotspacemacs-fullscreen-at-startup nil + ;; If non nil `spacemacs/toggle-fullscreen' will not use native fullscreen. + ;; Use to disable fullscreen animations in OSX." + dotspacemacs-fullscreen-use-non-native nil + ;; If non nil the frame is maximized when Emacs starts up. + ;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil. + ;; (Emacs 24.4+ only) + dotspacemacs-maximized-at-startup nil + ;; A value from the range (0..100), in increasing opacity, which describes + ;; the transparency level of a frame when it's active or selected. + ;; Transparency can be toggled through `toggle-transparency'. + dotspacemacs-active-transparency 90 + ;; A value from the range (0..100), in increasing opacity, which describes + ;; the transparency level of a frame when it's inactive or deselected. + ;; Transparency can be toggled through `toggle-transparency'. + dotspacemacs-inactive-transparency 90 + ;; If non nil unicode symbols are displayed in the mode line. + dotspacemacs-mode-line-unicode-symbols nil + ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth + ;; scrolling overrides the default behavior of Emacs which recenters the + ;; point when it reaches the top or bottom of the screen. + dotspacemacs-smooth-scrolling t + ;; If non-nil smartparens-strict-mode will be enabled in programming modes. + dotspacemacs-smartparens-strict-mode nil + ;; Select a scope to highlight delimiters. Possible value is `all', + ;; `current' or `nil'. Default is `all' + dotspacemacs-highlight-delimiters 'all + ;; If non nil advises quit functions to keep server open when quitting. + dotspacemacs-persistent-server t + ;; List of search tool executable names. Spacemacs uses the first installed + ;; tool of the list. Supported tools are `ag', `pt', `ack' and `grep'. + dotspacemacs-search-tools '("ag" "pt" "ack" "grep") + ;; The default package repository used if no explicit repository has been + ;; specified with an installed package. + ;; Not used for now. + dotspacemacs-default-package-repository nil + ) + ;; User initialization goes here + (add-to-list 'default-frame-alist '(height . 50)) + (add-to-list 'default-frame-alist '(width . 100)) + ) + +(defun dotspacemacs/config () + "Configuration function. + This function is called at the very end of Spacemacs initialization after +layers configuration." + (defadvice evil-inner-word (around underscore-as-word activate) + (let ((table (copy-syntax-table (syntax-table)))) + (modify-syntax-entry ?_ "w" table) + (with-syntax-table table + ad-do-it))) +) + +;; Do not write anything past this comment. This is where Emacs will +;; auto-generate custom variable definitions. diff --git a/vimrc b/vimrc new file mode 100644 index 0000000..032972e --- /dev/null +++ b/vimrc @@ -0,0 +1,23 @@ +syntax on +filetype off +filetype plugin indent on + +set background=dark +colorscheme sorcerer + +set number + +" indentation options +set autoindent +set smartindent + +set softtabstop=2 +set tabstop=2 +set shiftwidth=2 +set expandtab + +" turn off error sound +set vb t_vb= +" show line numbers in lower right +set ruler +set incsearch