Compare commits

..

4 Commits

Author SHA1 Message Date
Shadowfacts 4eb3b1cbc9
Things 2020-12-11 18:39:23 -05:00
Shadowfacts 060625079d
God knows what iTerm changes 2020-05-05 22:32:38 -04:00
Shadowfacts 87231e63d9
Misc .vimrc changes 2020-05-05 22:31:55 -04:00
Shadowfacts 39572c7691
Change gvim colorscheme 2020-05-05 22:30:25 -04:00
5 changed files with 851 additions and 64 deletions

3
.gitignore vendored
View File

@ -28,3 +28,6 @@
!.gradle/gradle.properties
!iterm2_settings/*
!.config/fish/config.fish
!.config/fish/conf.d/omf.fish

View File

@ -6,5 +6,5 @@ if has("gui_macvim")
nnoremap <D-o> :Files<CR>
endif
colorscheme one
colorscheme challenger_deep

19
.vimrc
View File

@ -10,6 +10,7 @@ Plug 'tpope/vim-sensible'
Plug 'scrooloose/nerdtree'
Plug 'danilo-augusto/vim-afterglow'
Plug 'rakr/vim-one'
Plug 'challenger-deep-theme/vim'
Plug '/usr/local/opt/fzf'
Plug 'junegunn/fzf.vim'
Plug 'elixir-editors/vim-elixir'
@ -28,13 +29,15 @@ Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'posva/vim-vue'
Plug 'airblade/vim-gitgutter'
" Plug 'vim-airline/vim-airline'
Plug 'rhysd/vim-crystal'
Plug 'dag/vim-fish'
" call vundle#end()
call plug#end()
map <C-n> :NERDTreeToggle<CR>
nnoremap K :YcmCompleter GoTo<CR>
nnoremap <D-r> :YcmCompleter RefactorRename
" nnoremap K :YcmCompleter GoTo<CR>
" nnoremap <D-r> :YcmCompleter RefactorRename
nnoremap <D-o> :Files<CR>
nnoremap <D-O> :Files<CR>
@ -54,15 +57,20 @@ set scrolloff=5
set sidescrolloff=5
set ignorecase
set smartcase
set cursorline
set splitbelow splitright
let g:mapleader=","
let g:mix_format_on_save = 1
let g:NERDDefaultAlign = 'left'
let g:NERDCommentEmptyLines = 1
autocmd BufNewFile,BufRead *.md setlocal ft=markdown
autocmd BufNewFile,BufRead *.md setlocal ft=markdown wrap linebreak
autocmd BufNewFile,BufRead *.html.ejs setlocal ft=html
autocmd FileType elixir setlocal shiftwidth=2 tabstop=2
autocmd FileType asm setlocal shiftwidth=2 tabstop=2
autocmd FileType crystal setlocal shiftwidth=2 tabstop=2
autocmd FileType yaml setlocal shiftwidth=2 tabstop=2
" Add optional packages.
"
@ -166,6 +174,7 @@ nmap <silent> ]g <Plug>(coc-diagnostic-next)
" Remap keys for gotos
nmap <silent> <C-]> <Plug>(coc-definition)
nmap <silent> <C-w><C-]> <C-w>s<C-]>
nmap <silent> gy <Plug>(coc-type-definition)
nmap <silent> gi <Plug>(coc-implementation)
nmap <silent> gr <Plug>(coc-references)
@ -215,8 +224,8 @@ omap if <Plug>(coc-funcobj-i)
omap af <Plug>(coc-funcobj-a)
" Use <C-d> for select selections ranges, needs server support, like: coc-tsserver, coc-python
nmap <silent> <C-d> <Plug>(coc-range-select)
xmap <silent> <C-d> <Plug>(coc-range-select)
" nmap <silent> <C-d> <Plug>(coc-range-select)
" xmap <silent> <C-d> <Plug>(coc-range-select)
" Use `:Format` to format current buffer
command! -nargs=0 Format :call CocAction('format')

24
.zshrc
View File

@ -17,20 +17,18 @@ alias fuck='$(thefuck $(fc -ln -1))'
alias subl="/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl"
alias git=hub
alias python=python3
alias pip=pip3
alias oldruby="/usr/bin/ruby"
alias ruby="/usr/local/opt/ruby/bin/ruby"
# alias oldruby="/usr/bin/ruby"
# alias ruby="/usr/local/opt/ruby/bin/ruby"
# Erlang/Elixir persistent shell history
export ERL_AFLAGS="-kernel shell_history enabled"
# lazily load nvm
# export NVM_DIR=~/.nvm
#. $(brew --prefix nvm)/nvm.sh
# . $(brew --prefix nvm)/nvm.sh
# nvm() {
# unset -f nvm
@ -68,6 +66,12 @@ export ERL_AFLAGS="-kernel shell_history enabled"
# yarn "$@"
# }
export NODE_OPTIONS="--max-old-space-size=8000"
# Ruby
export PATH="$HOME/.rbenv/bin:$PATH"
eval "$(rbenv init -)"
# Go up N directories
up() {
str=""
@ -107,6 +111,16 @@ ca() {
git commit --amend "$@"
}
# pbedit: interactively edit the contents of the clipboard
pbedit() {
tmpfile=`mktemp /tmp/pbedit.XXXXX`
pbpaste > $tmpfile
if vim -c "set nofixeol" $tmpfile ; then
pbcopy < $tmpfile
fi
rm $tmpfile
}
# default file openings
alias -s ipr=open
alias -s xcodeproj=open

File diff suppressed because it is too large Load Diff