fix gitmodules finally, update configs
parent
3b975fd51e
commit
e45bc92d6b
|
|
@ -10,19 +10,18 @@
|
||||||
set -g default-command "/bin/bash --login"
|
set -g default-command "/bin/bash --login"
|
||||||
set -g default-shell "/bin/bash"
|
set -g default-shell "/bin/bash"
|
||||||
|
|
||||||
source ~/projects/laughing-hipster/tools/powerline/powerline/powerline/bindings/tmux/powerline.conf
|
|
||||||
|
|
||||||
set -g default-terminal "screen-256color"
|
set -g default-terminal "xterm-256color"
|
||||||
|
|
||||||
# set esc-wait off, so vim works
|
# set esc-wait off, so vim works
|
||||||
set-option -sg escape-time 0
|
set-option -sg escape-time 0
|
||||||
|
|
||||||
|
|
||||||
#set prefix to ctrl-a
|
#set prefix to ctrl-a
|
||||||
unbind-key C-b
|
unbind-key C-b
|
||||||
set-option -g prefix C-a
|
set-option -g prefix C-a
|
||||||
unbind-key C-a ; bind-key C-a send-prefix
|
unbind-key C-a ; bind-key C-a send-prefix
|
||||||
|
|
||||||
|
|
||||||
# some nice ops
|
# some nice ops
|
||||||
set-option -g bell-action any
|
set-option -g bell-action any
|
||||||
set-option -g history-limit 10000
|
set-option -g history-limit 10000
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ set backupcopy=yes
|
||||||
set autoread
|
set autoread
|
||||||
set selection=exclusive
|
set selection=exclusive
|
||||||
set ttimeoutlen=50
|
set ttimeoutlen=50
|
||||||
" set termguicolors
|
set termguicolors
|
||||||
" Use the OS clipboard by default (on versions compiled with `+clipboard`)
|
" Use the OS clipboard by default (on versions compiled with `+clipboard`)
|
||||||
set clipboard=unnamedplus
|
set clipboard=unnamedplus
|
||||||
" Enhance command-line completion
|
" Enhance command-line completion
|
||||||
|
|
@ -155,7 +155,7 @@ nmap <leader>n :NERDTreeToggle %:p:h<CR>
|
||||||
nmap <leader>m :NERDTreeClose<CR>:NERDTreeFind<CR>
|
nmap <leader>m :NERDTreeClose<CR>:NERDTreeFind<CR>
|
||||||
|
|
||||||
" strips whitespace
|
" strips whitespace
|
||||||
noremap <leader>ss :call StripWhitespace()<CR>
|
noremap <leader>ws :call StripWhitespace()<CR>
|
||||||
|
|
||||||
" Strip trailing whitespace (,ss)
|
" Strip trailing whitespace (,ss)
|
||||||
function! StripWhitespace()
|
function! StripWhitespace()
|
||||||
|
|
@ -217,7 +217,8 @@ let g:go_highlight_structs = 1
|
||||||
let g:go_highlight_operators = 1
|
let g:go_highlight_operators = 1
|
||||||
let g:go_highlight_build_constraints = 1
|
let g:go_highlight_build_constraints = 1
|
||||||
let g:go_highlight_extra_types = 1
|
let g:go_highlight_extra_types = 1
|
||||||
let g:go_fmt_command = "goreturns"
|
let g:go_fmt_command = "goimports"
|
||||||
|
let g:go_fmt_autosave = 1
|
||||||
" -b -w -p"
|
" -b -w -p"
|
||||||
|
|
||||||
let g:syntastic_go_checkers = ['go', 'errcheck', 'gofmt', 'golint', 'govet']
|
let g:syntastic_go_checkers = ['go', 'errcheck', 'gofmt', 'golint', 'govet']
|
||||||
|
|
|
||||||
|
|
@ -131,27 +131,31 @@
|
||||||
|
|
||||||
# URL shorthands
|
# URL shorthands
|
||||||
[url "git@github.com:"]
|
[url "git@github.com:"]
|
||||||
insteadOf = "gh:"
|
insteadOf = https://github.com/
|
||||||
pushInsteadOf = "github:"
|
pushInsteadOf = "github:"
|
||||||
pushInsteadOf = "git://github.com/"
|
pushInsteadOf = "git://github.com/"
|
||||||
|
|
||||||
[url "git://github.com/"]
|
[url "git://github.com/"]
|
||||||
insteadOf = "github:"
|
insteadOf = "github:"
|
||||||
|
|
||||||
[url "git@gist.github.com:"]
|
[url "git@gist.github.com:"]
|
||||||
insteadOf = "gst:"
|
insteadOf = "gst:"
|
||||||
pushInsteadOf = "gist:"
|
pushInsteadOf = "gist:"
|
||||||
pushInsteadOf = "git://gist.github.com/"
|
pushInsteadOf = "git://gist.github.com/"
|
||||||
|
|
||||||
[url "git://gist.github.com/"]
|
[url "git://gist.github.com/"]
|
||||||
insteadOf = "gist:"
|
insteadOf = "gist:"
|
||||||
|
|
||||||
[push]
|
[push]
|
||||||
default = current
|
default = current
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
default = current
|
default = current
|
||||||
|
|
||||||
[user]
|
[user]
|
||||||
email = adam.veldhousen@liveauctioneers.com
|
email = adam.veldhousen@liveauctioneers.com
|
||||||
name = Adam Veldhousen
|
name = Adam Veldhousen
|
||||||
signingkey = 415C0B9C
|
signingkey = 4FA79E5B6598505C8DFA30A7A466CEE1415C0B9C
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 20a54b079c8be65db941776f0b824054bb297b31
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit d77cc30a3be26cf34411af70c5e2b595eef2d46d
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 99be8480bb39f2b9daa52f03a22941a45cd1b8cf
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 98f32381182c5850a40ed60abec0c1320b7be270
|
|
||||||
Loading…
Reference in New Issue