diff --git a/bash/bash_exports.symlink b/bash/bash_exports.symlink index d69fe49..d6526b3 100644 --- a/bash/bash_exports.symlink +++ b/bash/bash_exports.symlink @@ -15,4 +15,4 @@ export LESS_TERMCAP_us=$'\E[1;32m' export JAVA_HOME=`/usr/libexec/java_home -v 1.8` - +export ANDROID_HOME=/usr/local/opt/android-sdk diff --git a/bash/bash_exports.symlink b/bash/bash_exports.symlink index d69fe49..d6526b3 100644 --- a/bash/bash_exports.symlink +++ b/bash/bash_exports.symlink @@ -15,4 +15,4 @@ export LESS_TERMCAP_us=$'\E[1;32m' export JAVA_HOME=`/usr/libexec/java_home -v 1.8` - +export ANDROID_HOME=/usr/local/opt/android-sdk diff --git a/install/brew.sh b/install/brew.sh index 827e8eb..aba3498 100644 --- a/install/brew.sh +++ b/install/brew.sh @@ -17,3 +17,5 @@ brew install openssl brew install scala brew install youtube-dl +brew install unrar +brew install p7zip diff --git a/bash/bash_exports.symlink b/bash/bash_exports.symlink index d69fe49..d6526b3 100644 --- a/bash/bash_exports.symlink +++ b/bash/bash_exports.symlink @@ -15,4 +15,4 @@ export LESS_TERMCAP_us=$'\E[1;32m' export JAVA_HOME=`/usr/libexec/java_home -v 1.8` - +export ANDROID_HOME=/usr/local/opt/android-sdk diff --git a/install/brew.sh b/install/brew.sh index 827e8eb..aba3498 100644 --- a/install/brew.sh +++ b/install/brew.sh @@ -17,3 +17,5 @@ brew install openssl brew install scala brew install youtube-dl +brew install unrar +brew install p7zip diff --git a/vim/vim.symlink/ftplugin/json.vim b/vim/vim.symlink/ftplugin/json.vim new file mode 100644 index 0000000..9c704d5 --- /dev/null +++ b/vim/vim.symlink/ftplugin/json.vim @@ -0,0 +1,3 @@ +" Leader-o to prettify JSON +mapo :%!python -m json.tool + diff --git a/bash/bash_exports.symlink b/bash/bash_exports.symlink index d69fe49..d6526b3 100644 --- a/bash/bash_exports.symlink +++ b/bash/bash_exports.symlink @@ -15,4 +15,4 @@ export LESS_TERMCAP_us=$'\E[1;32m' export JAVA_HOME=`/usr/libexec/java_home -v 1.8` - +export ANDROID_HOME=/usr/local/opt/android-sdk diff --git a/install/brew.sh b/install/brew.sh index 827e8eb..aba3498 100644 --- a/install/brew.sh +++ b/install/brew.sh @@ -17,3 +17,5 @@ brew install openssl brew install scala brew install youtube-dl +brew install unrar +brew install p7zip diff --git a/vim/vim.symlink/ftplugin/json.vim b/vim/vim.symlink/ftplugin/json.vim new file mode 100644 index 0000000..9c704d5 --- /dev/null +++ b/vim/vim.symlink/ftplugin/json.vim @@ -0,0 +1,3 @@ +" Leader-o to prettify JSON +mapo :%!python -m json.tool + diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink index d4f50f1..b8a0b81 100644 --- a/vim/vimrc.symlink +++ b/vim/vimrc.symlink @@ -1,35 +1,42 @@ " load plugins from vundle -source ~/.vim/plugins.vim +source ~/.vim/plugins.vim " Load plugins +set clipboard=unnamed " sets clipboard to os default + +" Theme settings +set background=dark " Dark background +colorscheme darkspectrum " Colour theme +syntax on " Syntax highlighting +set scrolloff=3 " lines of text around cursor let g:airline_powerline_fonts = 1 +" Fonts and encoding set guifont=Inconsolata\ for\ Powerline:h16 " set font set encoding=utf8 " set encoding to utf8 -set ruler " display cursor position in status bar -set laststatus=2 " show the status line all the time -set title " show file-name in title -set hlsearch " highlight all search-hits -set incsearch " incremental searches -set showcmd " show the input of an *incomplete* command + +" Tabs-stop set tabstop=4 " size of hard tabstop set expandtab " always use spaces instead of tab characters set shiftwidth=4 " size of an indent set autoindent " automatic indentation of new lines + +" UI config set number " display line numbers -set nowrap " no line-breaking +set showcmd " show the input of an *incomplete* command set wildmenu " show possible completions of command line commands, file names, and more. -set clipboard=unnamed " sets clipboard to os default -set scrolloff=3 " lines of text around cursor -set ttyfast " faster redrawing +set title " show file-name in title +set ruler " display cursor position in status bar +set laststatus=2 " show the status line all the time +set nowrap " no line-breaking set visualbell " visual bell effect rather than beeping set noerrorbells " turn off bell +set ttyfast " faster redrawing +set lazyredraw " redraw only when needed to +set showmatch " highlight matching [{()}] -"Colour-theme settings -set background=dark -colorscheme darkspectrum -syntax on - -vnoremap . :normal . +" Searching +set hlsearch " highlight all search-hits +set incsearch " incremental searches "Mappings map :NERDTreeToggle @@ -37,6 +44,7 @@ map :ctrlp_map map'CtrlP' :ctrlp_cmd let mapleader="," " maps leader to comma (,) +vnoremap . :normal . "NERDtree stuff autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif "Close NERDtree if it is the last window @@ -54,3 +62,10 @@ let g:indentLine_color_gui = '#09AA08' let g:indentLine_char = '│' +" Backups +set backup +set backupdir=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp +set backupskip=/tmp/*,/private/tmp/* +set directory=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp +set writebackup +