diff --git a/com.googlecode.iterm2.plist b/com.googlecode.iterm2.plist
index c7f4919..825cfd8 100644
--- a/com.googlecode.iterm2.plist
+++ b/com.googlecode.iterm2.plist
@@ -328,10 +328,14 @@
LoadPrefsFromCustomFolder
+ NSColorPanelMode
+ 6
+ NSFontPanelAttributes
+ 1, 4
NSNavLastRootDirectory
~/dotfiles
NSNavPanelExpandedSizeForOpenMode
- {712, 448}
+ {712, 459}
NSQuotedKeystrokeBinding
NSRepeatCountBinding
@@ -347,7 +351,7 @@
gAKACoAN0xAJChEVGVdOUy5rZXlzoxITFIADgASABaMWFxiABoAHgAiACVpJZGVudGlm
aWVyVVdpZHRoVkhpZGRlblEwI0BowAAAAAAACNIhIiMkWiRjbGFzc25hbWVYJGNsYXNz
ZXNcTlNEaWN0aW9uYXJ5oiMlWE5TT2JqZWN00xAJCicrGaMSExSAA4AEgAWjLC0YgAuA
- DIAIgAlRMSNAdCGdsi0OVtIhIjM0Xk5TTXV0YWJsZUFycmF5ozM1JVdOU0FycmF5XxAP
+ DIAIgAlRMSNAdCAAAAAAANIhIjM0Xk5TTXV0YWJsZUFycmF5ozM1JVdOU0FycmF5XxAP
TlNLZXllZEFyY2hpdmVy0Tg5VUFycmF5gAEACAARABoAIwAtADIANwBGAEwAUQBcAGMA
ZgBoAGoAbABzAHsAfwCBAIMAhQCJAIsAjQCPAJEAnACiAKkAqwC0ALUAugDFAM4A2wDe
AOcA7gDyAPQA9gD4APwA/gEAAQIBBAEGAQ8BFAEjAScBLwFBAUQBSgAAAAAAAAIBAAAA
@@ -363,14 +367,25 @@
NSTableView Supports v2 KeyBingingTable
+ NSToolbar Configuration com.apple.NSColorPanel
+
+ TB Is Shown
+ 1
+
+ NSWindow Frame NSColorPanel
+ 307 274 214 309 0 0 1440 878
+ NSWindow Frame NSFontPanel
+ 659 87 445 270 0 0 1440 878
+ NSWindow Frame Preferences
+ 472 398 606 456 0 0 1440 877
+ NSWindow Frame SUUpdateAlert
+ 410 364 620 392 0 0 1440 877
NSWindow Frame SharedPreferences
- 30 232 958 433 0 0 1440 877
+ 397 146 1018 447 0 0 1440 900
NSWindow Frame iTerm Window 0
- 19 71 890 577 0 0 1440 877
+ 0 10 890 577 0 0 1440 900
NSWindow Frame iTerm Window 1
- 297 151 890 577 0 0 1440 877
- NSWindow Frame iTerm Window 2
- 436 70 890 577 0 0 1440 877
+ 176 70 890 577 0 0 1440 900
New Bookmarks
@@ -542,9 +557,9 @@
Blue Component
0.0
Color Space
- sRGB
+ Calibrated
Green Component
- 0.1491314172744751
+ 0.0
Red Component
1
@@ -583,7 +598,7 @@
Cursor Guide Color
Alpha Component
- 0.058823529411764705
+ 0.1123199462890625
Blue Component
1
Color Space
@@ -924,13 +939,13 @@
Alpha Component
1
Blue Component
- 0.73423302173614502
+ 0.67800000000000005
Color Space
- sRGB
+ Calibrated
Green Component
- 0.35916060209274292
+ 0.27000000000000002
Red Component
- 0.0
+ 0.023
Mouse Reporting
@@ -1010,20 +1025,24 @@
/Users/clean
+ NoSyncConfirmBeta
+
NoSyncHaveWarnedAboutPasteConfirmationChange
NoSyncInstallationId
- 8FD26FF7-1B8C-4187-9B85-F5B954050646
+ 6E369C17-4B98-41A0-81E8-D8CCF4EAFEA8
NoSyncNeverRemindPrefsChangesLostForFile
NoSyncNeverRemindPrefsChangesLostForFile_selection
0
- NoSyncNewWindowOrTabFromTmuxOpensTmux
-
- NoSyncNewWindowOrTabFromTmuxOpensTmux_selection
- 0
+ NoSyncPermissionToShowTip
+
NoSyncTimeOfFirstLaunchOfVersionWithTip
- 504956337.093835
+ 486966257.753326
+ NoSyncTimeOfLastPromo
+ 455217537.05998898
+ NoSyncTimeOfLastPromoDownload
+ 483065410.63003302
OnlyWhenMoreTabs
OpenTmuxWindowsIn
@@ -1064,27 +1083,27 @@
PrefsCustomFolder
- /Users/clean/dotfiles
+ /Users/sharpshark28/dotfiles
Print In Black And White
PromptOnQuit
+ SUAutomaticallyUpdate
+
SUEnableAutomaticChecks
SUFeedAlternateAppNameKey
iTerm
SUFeedURL
- https://iterm2.com/appcasts/final.xml?shard=84
+ https://iterm2.com/appcasts/final.xml?shard=68
SUHasLaunchedBefore
SULastCheckTime
- 2017-01-01T09:39:35Z
- SUSendProfileInfo
-
+ 2017-01-21T21:15:07Z
WordCharacters
/-+\~_.
iTerm Version
- 3.0.20161231-nightly
+ 3.0.20170121-nightly
kCPKSelectionViewPreferredModeKey
0
kCPKSelectionViewShowHSBTextFieldsKey
diff --git a/init.sh b/init.sh
index 9b2ae24..0611db6 100644
--- a/init.sh
+++ b/init.sh
@@ -1,7 +1,4 @@
#!/bin/bash
-echo "-= Creating necessary directories =-"
-mkdir -p ~/.config ~/.config/nvim
-
echo "-= Installing System Dependencies =-"
brew install zsh tmux neovim/neovim/neovim python3 ag
brew tap caskroom/cask
@@ -14,14 +11,19 @@ brew cask install font-fira-code
echo "-= Assigning Zsh as Default Shell =-"
chsh -s $(which zsh)
-echo "-= Upgrading NeoVim with Python =-"
+echo "-= Upgrading NeoVim with Python and Package Manager =-"
pip3 install neovim
+curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs \
+ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
echo "-= Setting Zsh as default shell =-"
chsh -s /usr/local/bin/zsh
echo "-= Removing any existing configs =-"
-rm ~/.zshrc ~/.tmux.conf ~/.config/nvim/init.vim 2> /dev/null
+rm -rf ~/.vim ~/.vimrc ~/.zshrc ~/.tmux ~/.tmux.conf ~/.config/nvim 2> /dev/null
+
+echo "-= Creating necessary directories =-"
+mkdir -p ~/.config ~/.config/nvim
echo "-= Symlinking new configs =-"
ln -s ~/dotfiles/zshrc ~/.zshrc
diff --git a/tmux.conf b/tmux.conf
index 5f501f3..e1e6e97 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -12,13 +12,16 @@ bind | split-window -h -c '#{pane_current_path}'
bind - split-window
bind _ split-window -c '#{pane_current_path}'
-# Theme
-set -g @themepack 'block/yellow'
+# Move bar to top
+set -g status-position top
# Fix System Clipboard
set -g default-shell $SHELL
set -g default-command 'reattach-to-user-namespace -l ${SHELL}'
+# Theme
+set -g @themepack 'block/gray'
+
# Plugins
set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible'
diff --git a/vimrc b/vimrc
index f1756e5..6470f56 100644
--- a/vimrc
+++ b/vimrc
@@ -1,3 +1,4 @@
+set nomodeline
set encoding=utf8
" Stop word wrapping
@@ -37,14 +38,7 @@ set sidescrolloff=5
set mouse=r
let $NVIM_TUI_ENABLE_CURSOR_SHAPE=1
-" Plugins with vim-plug
-if empty(glob('~/.vim/autoload/plug.vim'))
- silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
- \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
- autocmd VimEnter * PlugInstall | source $MYVIMRC
-endif
-
-call plug#begin('~/.vim/plugged')
+call plug#begin('~/.local/share/nvim/plugged')
" Required
Plug 'Shougo/unite.vim'
@@ -61,10 +55,6 @@ Plug 'ctrlpvim/ctrlp.vim', { 'on': 'CtrlP' }
Plug 'mhinz/vim-grepper'
Plug 'Shougo/vimfiler.vim', { 'on': 'VimFiler' }
-" Languages
-Plug 'pangloss/vim-javascript'
-Plug 'helino/vim-json'
-
" Code Editing
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
Plug 'w0rp/ale'
diff --git a/zshrc b/zshrc
index 2c001c3..129a31f 100644
--- a/zshrc
+++ b/zshrc
@@ -11,3 +11,17 @@ if [ "$TMUX" = "" ]; then tmux; fi
# Auto CD
setopt auto_cd
+
+# Typo Correction
+setopt correctall
+alias git status='nocorrect git status'
+
+# Plugins
+if [[ ! -f ~/.antigen.zsh ]]; then
+ curl https://raw.githubusercontent.com/zsh-users/antigen/master/antigen.zsh > ~/.antigen.zsh
+fi
+source ~/.antigen.zsh
+
+antigen bundle zsh-users/zsh-syntax-highlighting
+antigen bundle zsh-users/zsh-autosuggestions
+antigen bundle git