.profile

@@ -85,17 +85,18 @@ alias la="ls -Fa"
 alias ll="ls -Fla"
 alias l="ls -FC"
 alias d="l"
-alias tree="tree -CF"
+alias tree="tree -C -F"
 alias grep="grep --color --exclude-dir={.svn,.git,node_modules}"
-alias man='LESS_TERMCAP_md=$(tput bold; tput setaf 4) LESS_TERMCAP_me=$(tput sgr0) LESS_TERMCAP_mb=$(tput blink) LESS_TERMCAP_us=$(tput setaf 2) LESS_TERMCAP_ue=$(tput sgr0) LESS_TERMCAP_so=$(tput smso) LESS_TERMCAP_se=$(tput rmso) PAGER="${commands[less]:-$PAGER}" man'
+alias man='LESS_TERMCAP_md=$(tput bold && tput setaf 4 || :) LESS_TERMCAP_me=$(tput sgr0 || :) LESS_TERMCAP_mb=$(tput blink || :) LESS_TERMCAP_us=$(tput setaf 2 || :) LESS_TERMCAP_ue=$(tput sgr0 || :) LESS_TERMCAP_so=$(tput smso || :) LESS_TERMCAP_se=$(tput rmso || :) PAGER="${commands[less]:-$PAGER}" man'
 alias node-print="node -e 'let [,f=\".\",e=\"this\"]=process.argv,ctx; try{ctx=require(f)}catch{ctx=require(path.resolve(f))}; eval(\`(async function(){ with(this) return (\${e}); })\`).call(ctx).then(console.log,console.error)'"
 alias ts-node-print="TS_NODE_FILES=true node -r ts-node/register -e 'let [,f=\".\",e=\"this\"]=process.argv,ctx; try{ctx=require(f)}catch{ctx=require(path.resolve(f))} eval(\`(async function(){ with(this) return (\${e}); })\`).call(ctx).then(console.log,console.error)'"
+alias vi=vim
 
 # color diffs
-! command -v colordiff &>/dev/null  ||  alias diff="colordiff"
+! command -v colordiff >/dev/null  ||  alias diff="colordiff"
 
 # color json
-! command -v json &>/dev/null  ||  alias json="json -o inspect"
+! command -v json >/dev/null  ||  alias json="json -o inspect"
 
 # MacVim shell aliases
 if [ "$OS" = "Darwin" ]; then

.vimrc

@@ -28,20 +28,23 @@ imap <S-Tab> <Esc><<i
 set foldmethod=syntax
 set foldlevelstart=99
 
-" coping to Mac OS X clipboard (kinda)
-vmap <C-c> :w !pbcopy<CR><CR>
+" simplify working with the system clipboard
+vmap <C-c> "+y
+nmap <C-c> V"+y
+vmap <C-x> "+x
+nmap <C-x> V"+x
+imap <C-v> <Esc>"+Pi
 
 " no more ex mode!
-nnoremap Q <nop>
+nmap Q <nop>
 
 " force syntax on a few file types
 autocmd BufNewFile,BufReadPost *.json set filetype=json syntax=javascript
-autocmd BufNewFile,BufReadPost *.es6 set filetype=javascript
 autocmd BufNewFile,BufReadPost *.md set filetype=markdown
 autocmd BufNewFile,BufReadPost *.go set filetype=go
 
-" run js-beautify with the = key
-autocmd FileType javascript setlocal equalprg=js-beautify\ -q\ -t\ -w\ 140\ -f\ -
+" run prettier with the = key
+autocmd FileType * setlocal equalprg=npx\ -q\ prettier\ --stdin-filepath\ %
 
 " VIM-PLUG PLUGINS (WITH FIRST-RUN AUTOINSTALL)
 if empty(glob('~/.vim/autoload/plug.vim'))