From a6638e0224ef5c0de78d69b9f0d46c1d479bd59e Mon Sep 17 00:00:00 2001 From: George Anderson Date: Sun, 26 Aug 2018 00:48:02 +0100 Subject: [PATCH] Added vim plugin, alphabetized zshrc plugins --- .vimrc | 4 +++- .zshrc | 49 ++++++++++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/.vimrc b/.vimrc index 5b9c55b..3eba901 100644 --- a/.vimrc +++ b/.vimrc @@ -20,7 +20,7 @@ if exists('g:gui_oni') set noshowcmd else " Statements here -" Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server + Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server "with .//install.sh " --clang-completer " @@ -29,6 +29,7 @@ else set runtimepath^=~/.vim/bundle/ctrlp.vim Plugin 'vim-airline/vim-airline' Plugin 'vim-airline/vim-airline-themes' + Plugin 'ctrlpvim/ctrlp.vim' endif Plugin 'ap/vim-css-color' @@ -42,6 +43,7 @@ Plugin 'airblade/vim-gitgutter' Plugin 'vim-ruby/vim-ruby' Plugin 'peterhoeg/vim-qml' Plugin 'christoomey/vim-tmux-navigator' +Plugin 'purescript-contrib/purescript-vim' Plugin 'guns/vim-clojure-static' Plugin 'posva/vim-vue' diff --git a/.zshrc b/.zshrc index a8a464f..716dd90 100644 --- a/.zshrc +++ b/.zshrc @@ -1,13 +1,13 @@ # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH zmodload zsh/zprof -autoload -U promptinit; promptinit # Path to your oh-my-zsh installation. export ZSH="$HOME/.oh-my-zsh" export TERM="xterm-256color" export EDITOR="/usr/local/bin/nvim" + # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes @@ -63,38 +63,45 @@ ZSH_THEME="refined" # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. plugins=( + brew + colored-man + colorize + docker + docker-compose + django git git-extras git-flow - colored-man - colorize github - vagrant - virtualenv - pip - python - brew - osx - zsh-syntax-highlighting + node npm - docker - django - bower - celery node - sublime + osx + pip + python sudo supervisor + tmux + vi-mode + vagrant + virtualenv web-search + zsh-syntax-highlighting ) source $ZSH/oh-my-zsh.sh +fpath+=('/usr/local/lib/node_modules/pure-prompt/functions') +autoload -U promptinit; promptinit +prompt pure + # User configuration bindkey "^P" up-line-or-search setopt NO_NOMATCH +export PATH=$HOME/Android/Sdk/tools/bin:$PATH +export PATH=$HOME/android-studio/bin:$PATH # export MANPATH="/usr/local/man:$MANPATH" # You may need to manually set your language environment @@ -121,3 +128,15 @@ setopt NO_NOMATCH # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" + +###-tns-completion-start-### +if [ -f /home/george/.tnsrc ]; then + source /home/george/.tnsrc +fi + +export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64" +export ANDROID_HOME="$HOME/Android/Sdk" +export PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH" +export PATH="$HOME/bin:$HOME/.local/bin:$PATH" +export PATH="$HOME/.npm-global/bin/:$PATH" +###-tns-completion-end-###