Browse Source

Config updates

master
Scott Barker 2 years ago
parent
commit
fae4254a1a

+ 3
- 1
git/.gitconfig View File

@@ -5,7 +5,7 @@ email = scott@sdbarker.com
[core]
editor = vim
excludesfile = ~/.gitignore
whitespace = cr-at-eol
whitespace = cr-at-eol

[color]
ui = true
@@ -28,3 +28,5 @@ this = !git init && git add . && git commit -m \"initial commit\"

[credential]
helper = cache --timeout 300
[http "https://gopkg.in"]
followRedirects = true

+ 1
- 1
htop/htoprc View File

@@ -4,7 +4,7 @@ fields=0 48 38 2 46 47 49 1
sort_key=46
sort_direction=1
hide_threads=0
hide_kernel_threads=0
hide_kernel_threads=1
hide_userland_threads=0
shadow_other_users=0
show_thread_names=0

+ 2
- 2
tmux/.tmux.conf View File

@@ -12,8 +12,8 @@ set-window-option -g utf8 on # utf8 support
set -g status-utf8 on

# Disable mouse
set-window-option -g mode-mouse off
set-option -g mouse-select-pane off
# set-window-option -g mode-mouse off
# set-option -g mouse-select-pane off

# Window Title
set-option -g set-titles on

+ 6
- 0
vim/.vim/configs/ftbehaviors.vim View File

@@ -61,3 +61,9 @@ augroup END
" Automagically change the working directory to that which contains the file
" thats in the current buffer
autocmd BufEnter * lcd %:p:h

augroup golang
au FileType go nmap <leader>b <Plug>(go-build)
au FileType go nmap <leader>t <Plug>(go-test)
au FileType go nmap <leader>c <Plug>(go-coverage-toggle)
augroup END

+ 7
- 4
vim/.vim/configs/keybindings.vim View File

@@ -12,11 +12,14 @@ map <Leader>rt :SuperRetab 2
" Build sass
map <Leader>k :!sass --update "%"<CR>

" Build coffeescript
map <Leader>G :!gulp<CR>

" Build coffeescript
map <Leader>K :!coffee --output "../script/" --compile "%"<CR>

" Open NERDTree
map <Leader>t :NERDTree<cr>
map <Leader>T :NERDTree<cr>

" Bind Control-b in insert mode to delete the current word, and continue typing
imap <C-b> <esc>diwa
@@ -44,7 +47,7 @@ imap <C-f> <C-x><C-f>
noremap <space> :call ToggleFold()<CR>

" Bind ctrl-space to toggle all folds opened/closed
noremap <C-space> :call ToggleAllFolds()<CR>
"noremap <C-space> :call ToggleAllFolds()<CR>

" Toggle line numbers
map <C-l> :set invnu<CR>
@@ -59,11 +62,11 @@ map <S-u> <C-r>
" ,c to delete the current buffer, and discard the changes.
" This would be ctrl+x, but this is easier to hit and not the
" cut hotkey in windows
map ,c :bd!<CR>
" map <Leader>c :bd!<CR>

" Get the hell out, NOW!
" Don't ask questions. Don't write buffers. Just quit.
map ,q :qa!<CR>
map <Leader>q :qa!<CR>

" Save as sudo
map <Leader>ws :w !sudo tee %<CR>

+ 2
- 1
vim/.vim/configs/syntaxbehaviors.vim View File

@@ -14,9 +14,10 @@ set tabstop=2
set shiftwidth=2
set noexpandtab
set cindent
filetype indent on

" This makes vim not re-indent
set cinkeys=0{,0},!^F,o,O,e " default is: 0{,0},0),:,0#,!^F,o,O,e
"set cinkeys=0{,0},!^F,o,O,e " default is: 0{,0},0),:,0#,!^F,o,O,e

set autoindent


+ 19
- 8
vim/.vimrc View File

@@ -9,11 +9,13 @@ set t_Co=256
set t_ut=

set nocompatible " be iMproved, required
filetype off " required
"filetype off " required

let $VIMDIR = "$HOME/.vim"
let $VIMRC = "$HOME/.vimrc"

"let g:pymode_python = 'python3'

" set the runtime path to include Vundle and initialize
set rtp+=$VIMDIR/bundle/vundle/
call vundle#rc()
@@ -27,11 +29,20 @@ Plugin 'gmarik/vundle'

Plugin 'bling/vim-airline'
let g:airline_powerline_fonts=1
" Python autocomplete
"Plugin 'davidhalter/jedi-vim'
Plugin 'Valloric/YouCompleteMe'
let g:ycm_collect_identifiers_from_tags_files = 1
let g:ycm_enable_diagnostic_signs = 1
let g:ycm_cache_omnifunc = 1
let g:ycm_key_invoke_completion = '<C-b>'
Plugin 'ervandew/supertab'
Plugin 'fatih/vim-go'
Plugin 'Glench/Vim-Jinja2-Syntax'
Plugin 'kchmck/vim-coffee-script'
Plugin 'kien/ctrlp.vim'
Plugin 'leshill/vim-json'
Plugin 'mattn/emmet-vim'
"Plugin 'mattn/emmet-vim'
Plugin 'mutewinter/nginx.vim'
Plugin 'mutewinter/vim-css3-syntax'
Plugin 'nanotech/jellybeans.vim'
@@ -42,15 +53,15 @@ Plugin 'scrooloose/nerdcommenter'
Plugin 'scrooloose/nerdtree'
Plugin 'scrooloose/syntastic'
let g:syntastic_always_populate_loc_list = 1
Plugin 'slim-template/vim-slim'
"Plugin 'slim-template/vim-slim'
Plugin 'techlivezheng/vim-plugin-minibufexpl'
Plugin 'terryma/vim-multiple-cursors'
Plugin 'tpope/vim-haml'
Plugin 'tpope/vim-surround'
"Plugin 'terryma/vim-multiple-cursors'
"Plugin 'tpope/vim-haml'
"lugin 'tpope/vim-surround'
Plugin 'vim-scripts/matchit.zip'
Plugin 'vim-surround'
"Plugin 'vim-surround'

Plugin 'godlygeek/tabular'
"Plugin 'godlygeek/tabular'
Plugin 'plasticboy/vim-markdown'

set wildignore+=*.swp,*.swo,*.pyc

+ 1
- 1
zsh/.zshrc View File

@@ -34,7 +34,7 @@ bindkey '^R' history-incremental-search-backward


# Override existing commands
alias ls='ls -alhG'
alias ls='ls -alh --color=always'
alias lst='tree -phAC'
alias tm='tmux'
alias tl='tmux list-sessions'

Loading…
Cancel
Save