This commit is contained in:
Ivan Malison 2014-11-04 06:22:20 -08:00
parent 0e6a74f3f0
commit 4c4bd6c100
4 changed files with 141 additions and 138 deletions

View File

@ -1,135 +1,137 @@
{ {
"casks": [ "casks": [
"atom", "atom",
"alfred", "alfred",
"caffeine", "caffeine",
"firefox", "firefox",
"flux", "flux",
"google-chrome", "google-chrome",
"iterm2", "iterm2",
"java", "java",
"karabiner", "karabiner",
"macpass", "macpass",
"seil", "seil",
"slate", "slate",
"spotify", "spotify",
"sublime-text", "sublime-text",
"synergy", "synergy",
"transmission", "transmission",
"virtualbox", "virtualbox",
"vlc", "vlc",
"xquartz" "xquartz"
], ],
"formulas": [ "formulas": [
"ack", "ack",
"ant", "ant",
"at-spi2-atk", "at-spi2-atk",
"at-spi2-core", "at-spi2-core",
"atk", "atk",
"autoconf", "autoconf",
"automake", "automake",
"bash", "bash",
"binutils", "binutils",
"brew-cask", "brew-cask",
"cairo", "cairo",
"cmake", "cmake",
"coreutils", "coreutils",
"ctags", "ctags",
"d-bus", "d-bus",
"daemonize", "daemonize",
"diffutils", "diffutils",
"ed", "ed",
"emacs", "emacs --cocoa --srgb",
"file-formula", "file-formula",
"findutils", "findutils",
"fontconfig", "fontconfig",
"fontforge", "fontforge",
"freetype", "freetype",
"gawk", "gawk",
"gdbm", "gdbm",
"gdk-pixbuf", "gdk-pixbuf",
"gettext", "gettext",
"gist", "gist",
"git", "git",
"giter8", "giter8",
"glib", "glib",
"glib-networking", "glib-networking",
"gmp", "globals",
"gnome-icon-theme", "gmp",
"gnu-indent", "gnome-icon-theme",
"gnu-sed", "gnu-indent",
"gnu-tar", "gnu-sed",
"gnu-which", "gnu-tar",
"gnutls", "gnu-which",
"go", "gnutls",
"gobject-introspection", "go",
"grep", "gobject-introspection",
"gsettings-desktop-schemas", "grep",
"gssdp", "gsettings-desktop-schemas",
"gtk+3", "gssdp",
"gupnp", "gtk+3",
"gupnp-av", "gupnp",
"gupnp-tools", "gupnp-av",
"gzip", "gupnp-tools",
"harfbuzz", "gzip",
"heroku-toolbelt", "harfbuzz",
"htop-osx", "heroku-toolbelt",
"hub", "htop-osx",
"icu4c", "hub",
"intltool", "icu4c",
"jpeg", "intltool",
"less", "jpeg",
"libevent", "less",
"libffi", "libevent",
"libidn", "libffi",
"libpng", "libidn",
"libsoup", "libpng",
"libtasn1", "libsoup",
"libtiff", "libtasn1",
"libtool", "libtiff",
"lzip", "libtool",
"make", "lzip",
"mercurial", "make",
"netcat", "mercurial",
"nettle", "netcat",
"ngrep", "nettle",
"nmap", "ngrep",
"node", "nmap",
"openssh", "node",
"openssl", "openssh",
"ossp-uuid", "openssl",
"pandoc", "ossp-uuid",
"pango", "pandoc",
"pcre", "pango",
"pixman", "pcre",
"pkg-config", "pixman",
"portmidi", "pkg-config",
"pstree", "portmidi",
"pv", "pstree",
"pypy", "pv",
"python", "pypy",
"python3", "python",
"readline", "python3",
"reattach-to-user-namespace", "readline",
"rsync", "reattach-to-user-namespace",
"sbt", "rsync",
"scala", "sbt",
"sdl", "scala",
"sdl_image", "sdl",
"sdl_mixer", "sdl_image",
"sdl_ttf", "sdl_mixer",
"sleuthkit", "sdl_ttf",
"sqlite", "sleuthkit",
"subversion", "sqlite",
"tig", "subversion",
"tmux", "tig",
"unzip", "tmux",
"vim", "unzip",
"watch", "vim",
"wdiff", "watch",
"webp", "wdiff",
"wget", "webp",
"xz", "weechat",
"zsh" "wget",
] "xz",
"zsh"
]
} }

@ -1 +1 @@
Subproject commit 0bbe0fa7a8599540ae515b9abd61c086acd2d49a Subproject commit 01a995a455240882ea5b3f6d1df4188c1b50df5e

View File

@ -28,3 +28,8 @@ function _current_dot_directory {
local directory="$(git rev-parse --show-toplevel 2> /dev/null || pwd)" local directory="$(git rev-parse --show-toplevel 2> /dev/null || pwd)"
_dot_directory $directory _dot_directory $directory
} }
# Make emacs the default editor.
export EDITOR="emacs -Q"
export ALTERNATE_EDITOR=""
export VISUAL="$EDITOR"

View File

@ -3,10 +3,6 @@ if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/n
elif infocmp xterm-256color >/dev/null 2>&1; then elif infocmp xterm-256color >/dev/null 2>&1; then
export TERM=xterm-256color export TERM=xterm-256color
fi fi
# Make emacs the default editor.
export EDITOR="$(which emacsclient) -t"
export ALTERNATE_EDITOR=""
export VISUAL="$EDITOR"
# Larger bash history (allow 32³ entries; default is 500) # Larger bash history (allow 32³ entries; default is 500)
export HISTSIZE=32768 export HISTSIZE=32768