applied stash

.config/oni/config.js

@@ -27,7 +27,6 @@ exports.configuration = {
     "language.vue.languageServer.command":"vls",
     "experimental.indentLines.enabled": true,
     "oni.useDefaultConfig": true,
-    "tab.mode" : "tabs",
     "oni.bookmarks": ["~/Documents"],
     "editor.textMateHighlighting.enabled" : true,
     "editor.fontSize": "15px",

.tmux.conf.local

@@ -273,5 +273,3 @@ bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
 bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
 bind -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
 
-run-shell ~/.tmux/resurrect/resurrect.tmux
-

.vim/init.vim

@@ -1 +1 @@
-/Users/George/.vimrc
+/home/george/dotfiles/.vim/../.vimrc

.vimrc

@@ -14,34 +14,28 @@ Plugin 'gmarik/vundle'
 " Keep bundle commands between here and filetype plugin indent on.
 " scripts on GitHub repos
 if exists('g:gui_oni')
-  set noshowmode
-  set noruler
-  set laststatus=0
-  set noshowcmd
+    set noshowmode
+    set noruler
+    set laststatus=0
+    set noshowcmd
 else 
-  " Statements here
-  Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server
-                                  "with ./<plugin location>/install.sh
-                                  " --clang-completer
-                                  "
-  Plugin 'jistr/vim-nerdtree-tabs'
-  "Configure ctrlp
-  "" Ignore some folders and files for CtrlP indexing
-  let g:ctrlp_custom_ignore = {
-  \ 'dir':  '\.git$\|\.yardoc\|node_modules\|vendor\|log\|tmp$',
-  \ 'file': '\.so$\|\.dat$|\.DS_Store$'
-  \ }
-  set runtimepath^=~/.vim/bundle/ctrlp.vim
-  Plugin 'vim-airline/vim-airline'
-  Plugin 'vim-airline/vim-airline-themes'
-  Plugin 'ctrlpvim/ctrlp.vim'
+    " Statements here
+    Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server
+                                    "with ./<plugin location>/install.sh
+                                    " --clang-completer
+                                    "
+    Plugin 'jistr/vim-nerdtree-tabs'
+    "Configure ctrlp
+    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'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-fireplace'
 Plugin 'tpope/vim-rails'
-Plugin 'tpope/vim-surround'
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'scrooloose/nerdtree'
 Plugin 'airblade/vim-gitgutter'
@@ -99,9 +93,9 @@ if _curfile =~ "Makefile" || _curfile =~ "makefile" || _curfile =~ ".*\.mk"
     set noexpandtab
 else
     set expandtab
-    set tabstop=2
-    set shiftwidth=2
-    set softtabstop=2
+    set tabstop=4
+    set shiftwidth=4
+    set softtabstop=4
 endif
 
 "===================== Reselect visual block after indent/outdent ===========

.zshrc

@@ -92,18 +92,27 @@ plugins=(
 
 source $ZSH/oh-my-zsh.sh
 
+fpath+=('/usr/local/lib/node_modules/pure-prompt/functions')
 fpath+=('/home/george/.npm-global/lib/node_modules/pure-prompt/functions')
+
 autoload -U promptinit; promptinit
 prompt pure
 
 compinit
+
+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"
+export PATH="$HOME/.local/kitty.app/bin:$PATH"
+
 # Completion for kitty
 #kitty + complete setup zsh | source /dev/stdin
 
 # User configuration
 
 bindkey "^P" up-line-or-search
-bindkey jk vi-cmd-mode
 setopt NO_NOMATCH
 
 export PATH=$HOME/Android/Sdk/tools/bin:$PATH
@@ -136,16 +145,10 @@ export PATH=$HOME/android-studio/bin:$PATH
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 alias dc="docker-compose"
 alias d="docker"
-alias psc="psc-package"
 
 ###-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-###