--- a/.hgignore Sat Nov 09 12:58:55 2013 -0500
+++ b/.hgignore Tue Jan 14 17:25:35 2014 -0500
@@ -12,6 +12,7 @@
vim/tmp
vim/bundle/gundo
+vim/bundle/nand2tetris-hdl
mutt/temp
mutt/cache
--- a/.hgsub Sat Nov 09 12:58:55 2013 -0500
+++ b/.hgsub Tue Jan 14 17:25:35 2014 -0500
@@ -4,8 +4,8 @@
vim/bundle/AnsiEsc.vim = [git]git://github.com/sjl/AnsiEsc.vim.git
vim/bundle/YouCompleteMe = [git]git://github.com/Valloric/YouCompleteMe.git
vim/bundle/abolish = [git]git://github.com/tpope/vim-abolish.git
+vim/bundle/ack = [git]git://github.com/mileszs/ack.vim.git
vim/bundle/argumentative = [git]git://github.com/PeterRincker/vim-argumentative.git
-vim/bundle/ack = [git]git://github.com/mileszs/ack.vim.git
vim/bundle/badwolf = [hg]https://bitbucket.org/sjl/badwolf/
vim/bundle/clam = [hg]https://bitbucket.org/sjl/clam.vim/
vim/bundle/clojure-static = [git]git://github.com/sjl/vim-clojure-static.git
@@ -17,6 +17,7 @@
vim/bundle/gundo = [hg]https://bitbucket.org/sjl/gundo.vim/
vim/bundle/html5 = [git]git://github.com/othree/html5.vim.git
vim/bundle/indent-object = [git]git://github.com/michaeljsmith/vim-indent-object.git
+vim/bundle/jack = [git]git://github.com/zirrostig/vim-jack-syntax.git
vim/bundle/javascript = [git]git://github.com/pangloss/vim-javascript.git
vim/bundle/linediff = [git]git://github.com/AndrewRadev/linediff.vim.git
vim/bundle/markdown = [git]git://github.com/tpope/vim-markdown.git
--- a/.hgsubstate Sat Nov 09 12:58:55 2013 -0500
+++ b/.hgsubstate Tue Jan 14 17:25:35 2014 -0500
@@ -17,6 +17,7 @@
eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo
34b407d2344a3c2a94b56e9d443e18e01e8544d9 vim/bundle/html5
78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
+d1f19733ff5594cf5d6fb498fc599f02326860a6 vim/bundle/jack
395f8901b34cc871c9576886938a6efda0eb7268 vim/bundle/javascript
78646801aac4d3d85e7c4e9570deccfce81a50e7 vim/bundle/linediff
dcdab0cd55da5e0b8655c000d99d96624cd6404c vim/bundle/markdown
--- a/fish/config.fish Sat Nov 09 12:58:55 2013 -0500
+++ b/fish/config.fish Tue Jan 14 17:25:35 2014 -0500
@@ -234,6 +234,19 @@
set -g -x MAVEN_OPTS "-Xmx512M -XX:MaxPermSize=512M"
set -g -x _JAVA_OPTIONS "-Djava.awt.headless=true"
+function headed_java -d "Put Java into headed mode"
+ echo "Changing _JAVA_OPTIONS"
+ echo "from: $_JAVA_OPTIONS"
+ set -g -e _JAVA_OPTIONS
+ echo " to: $_JAVA_OPTIONS"
+end
+function headless_java -d "Put Java into headless mode"
+ echo "Changing _JAVA_OPTIONS"
+ echo "from: $_JAVA_OPTIONS"
+ set -g -x _JAVA_OPTIONS "-Djava.awt.headless=true"
+ echo " to: $_JAVA_OPTIONS"
+end
+
# }}}
# Python variables {{{
--- a/vim/vimrc Sat Nov 09 12:58:55 2013 -0500
+++ b/vim/vimrc Tue Jan 14 17:25:35 2014 -0500
@@ -616,6 +616,14 @@
" }}}
" Filetype-specific ------------------------------------------------------- {{{
+" Assembly {{{
+
+augroup ft_asm
+ au!
+ au FileType asm setlocal noexpandtab shiftwidth=8 tabstop=8 softtabstop=8
+augroup END
+
+" }}}
" C {{{
augroup ft_c
@@ -960,6 +968,15 @@
augroup END
" }}}
+" Nand2Tetris HDL {{{
+
+augroup ft_n2thdl
+ au!
+
+ au BufNewFile,BufRead *.hdl set filetype=n2thdl
+augroup END
+
+" }}}
" Nginx {{{
augroup ft_nginx
@@ -1486,6 +1503,8 @@
" YouCompleteMe {{{
let g:ycm_min_num_of_chars_for_completion = 4
+let g:ycm_seed_identifiers_with_syntax = 1
+let g:ycm_collect_identifiers_from_tags_files = 1
" }}}
--- a/weechat/alias.conf Sat Nov 09 12:58:55 2013 -0500
+++ b/weechat/alias.conf Tue Jan 14 17:25:35 2014 -0500
@@ -1,5 +1,5 @@
#
-# alias.conf -- weechat v0.4.1
+# alias.conf -- WeeChat v0.3.8
#
[cmd]
--- a/weechat/buffers.conf Sat Nov 09 12:58:55 2013 -0500
+++ b/weechat/buffers.conf Tue Jan 14 17:25:35 2014 -0500
@@ -1,5 +1,5 @@
#
-# buffers.conf -- weechat v0.4.1
+# buffers.conf -- WeeChat v0.3.8
#
[color]
--- a/weechat/charset.conf Sat Nov 09 12:58:55 2013 -0500
+++ b/weechat/charset.conf Tue Jan 14 17:25:35 2014 -0500
@@ -1,5 +1,5 @@
#
-# charset.conf -- weechat v0.4.1
+# charset.conf -- WeeChat v0.3.8
#
[default]
--- a/weechat/logger.conf Sat Nov 09 12:58:55 2013 -0500
+++ b/weechat/logger.conf Tue Jan 14 17:25:35 2014 -0500
@@ -1,5 +1,5 @@
#
-# logger.conf -- weechat v0.4.1
+# logger.conf -- WeeChat v0.3.8
#
[look]
@@ -15,8 +15,6 @@
info_lines = off
mask = "$plugin.$name.weechatlog"
name_lower_case = on
-nick_prefix = ""
-nick_suffix = ""
path = "%h/logs/"
replacement_char = "_"
time_format = "%Y-%m-%d %H:%M:%S"
--- a/weechat/plugins.conf Sat Nov 09 12:58:55 2013 -0500
+++ b/weechat/plugins.conf Tue Jan 14 17:25:35 2014 -0500
@@ -1,5 +1,5 @@
#
-# plugins.conf -- weechat v0.4.1
+# plugins.conf -- WeeChat v0.3.8
#
[var]
--- a/weechat/relay.conf Sat Nov 09 12:58:55 2013 -0500
+++ b/weechat/relay.conf Tue Jan 14 17:25:35 2014 -0500
@@ -1,5 +1,5 @@
#
-# relay.conf -- weechat v0.4.1
+# relay.conf -- WeeChat v0.3.8
#
[look]
@@ -7,7 +7,6 @@
raw_messages = 256
[color]
-client = cyan
status_active = lightblue
status_auth_failed = lightred
status_connecting = yellow
@@ -21,17 +20,7 @@
allowed_ips = ""
bind_address = ""
compression_level = 6
-ipv6 = on
max_clients = 5
password = ""
-ssl_cert_key = "%h/ssl/relay.pem"
-websocket_allowed_origins = ""
-
-[irc]
-backlog_max_minutes = 1440
-backlog_max_number = 256
-backlog_since_last_disconnect = on
-backlog_tags = "irc_privmsg"
-backlog_time_format = "[%H:%M] "
[port]
--- a/weechat/rmodifier.conf Sat Nov 09 12:58:55 2013 -0500
+++ b/weechat/rmodifier.conf Tue Jan 14 17:25:35 2014 -0500
@@ -1,5 +1,5 @@
#
-# rmodifier.conf -- weechat v0.4.1
+# rmodifier.conf -- WeeChat v0.3.8
#
[look]
--- a/weechat/urlgrab.conf Sat Nov 09 12:58:55 2013 -0500
+++ b/weechat/urlgrab.conf Tue Jan 14 17:25:35 2014 -0500
@@ -1,5 +1,5 @@
#
-# urlgrab.conf -- weechat v0.4.1
+# urlgrab.conf -- WeeChat v0.3.8
#
[color]
--- a/weechat/weechat.conf Sat Nov 09 12:58:55 2013 -0500
+++ b/weechat/weechat.conf Tue Jan 14 17:25:35 2014 -0500
@@ -1,5 +1,5 @@
#
-# weechat.conf -- weechat v0.4.1
+# weechat.conf -- WeeChat v0.3.8
#
[debug]
@@ -9,7 +9,6 @@
command_before_plugins = ""
display_logo = on
display_version = on
-sys_rlimit = ""
[look]
align_end_of_lines = message
@@ -26,7 +25,6 @@
color_inactive_prefix_buffer = on
color_inactive_time = off
color_inactive_window = off
-color_nick_offline = off
color_pairs_auto_reset = 5
color_real_white = off
command_chars = ""
@@ -56,11 +54,10 @@
item_time_format = "%H:%M"
jump_current_to_previous_buffer = on
jump_previous_buffer_when_closing = on
-jump_smart_back_to_buffer = on
mouse = off
mouse_timer_delay = 100
-nick_prefix = ""
-nick_suffix = ""
+nickmode = on
+nickmode_empty = off
paste_bracketed = off
paste_bracketed_timer_delay = 10
paste_max_lines = 3
@@ -69,11 +66,9 @@
prefix_align_max = 15
prefix_align_min = 0
prefix_align_more = "+"
-prefix_align_more_after = on
prefix_buffer_align = right
prefix_buffer_align_max = 0
prefix_buffer_align_more = "+"
-prefix_buffer_align_more_after = on
prefix_error = "=!="
prefix_join = "✔"
prefix_network = "--"
@@ -93,8 +88,6 @@
separator_vertical = ""
set_title = on
time_format = "%a, %d %b %Y %T"
-window_separator_horizontal = on
-window_separator_vertical = on
[palette]
@@ -112,13 +105,8 @@
chat_inactive_window = darkgray
chat_nick = lightcyan
chat_nick_colors = "027,048,068,070,081,082,099,112,129,136,169,178,208,226"
-chat_nick_offline = darkgray
-chat_nick_offline_highlight = default
-chat_nick_offline_highlight_bg = darkgray
chat_nick_other = cyan
-chat_nick_prefix = green
chat_nick_self = white
-chat_nick_suffix = green
chat_prefix_action = white
chat_prefix_buffer = brown
chat_prefix_buffer_inactive_buffer = darkgray
@@ -265,42 +253,6 @@
title.type = window
[layout]
-main.buffer = "core;weechat;1"
-main.buffer = "irc;server.simple;1"
-main.buffer = "irc;server.sjl;1"
-main.buffer = "irc;server.bit;1"
-main.buffer = "irc;simple.#simple;2"
-main.buffer = "irc;simple.#engineering;3"
-main.buffer = "irc;simple.#backend;4"
-main.buffer = "irc;simple.##/b/anksimple;5"
-main.buffer = "irc;simple.#c2c;6"
-main.buffer = "irc;simple.#ops;7"
-main.buffer = "irc;simple.#frontend;8"
-main.buffer = "irc;simple.#internal;9"
-main.buffer = "irc;simple.#security;10"
-main.buffer = "irc;simple.##@;11"
-main.buffer = "irc;simple.#support;12"
-main.buffer = "irc;simple.##vim;13"
-main.buffer = "irc;simple.##dance;14"
-main.buffer = "irc;simple.##adorbs;15"
-main.buffer = "irc;sjl.##simple;16"
-main.buffer = "irc;simple.##music;17"
-main.buffer = "irc;bit.&bitlbee;18"
-main.buffer = "irc;sjl.#riemann;19"
-main.buffer = "irc;sjl.#mercurial;20"
-main.buffer = "irc;sjl.#clojure;21"
-main.buffer = "irc;sjl.#weechat;22"
-main.buffer = "irc;sjl.#mutt;23"
-main.buffer = "irc;sjl.#nethack;24"
-main.buffer = "irc;sjl.#dwarffortress;25"
-main.buffer = "irc;sjl.#scala;26"
-main.buffer = "irc;sjl.#lisp;27"
-main.buffer = "irc;sjl.#vagrant;28"
-main.buffer = "irc;sjl.#amara_alumni;29"
-main.buffer = "irc;sjl.#postgresql;30"
-main.window = "1;0;0;0;irc;simple.#internal"
-main.current = on
-_zoom.window = "1;0;0;0;irc;simple.##vim"
[notify]
--- a/weechat/xfer.conf Sat Nov 09 12:58:55 2013 -0500
+++ b/weechat/xfer.conf Tue Jan 14 17:25:35 2014 -0500
@@ -1,5 +1,5 @@
#
-# xfer.conf -- weechat v0.4.1
+# xfer.conf -- WeeChat v0.3.8
#
[look]
@@ -28,7 +28,6 @@
[file]
auto_accept_chats = off
auto_accept_files = off
-auto_accept_nicks = ""
auto_rename = on
auto_resume = on
convert_spaces = on