Various fixes
This commit is contained in:
parent
9a9de900b4
commit
480740c617
5 changed files with 73 additions and 45 deletions
|
@ -328,10 +328,14 @@
|
|||
<true/>
|
||||
<key>LoadPrefsFromCustomFolder</key>
|
||||
<true/>
|
||||
<key>NSColorPanelMode</key>
|
||||
<string>6</string>
|
||||
<key>NSFontPanelAttributes</key>
|
||||
<string>1, 4</string>
|
||||
<key>NSNavLastRootDirectory</key>
|
||||
<string>~/dotfiles</string>
|
||||
<key>NSNavPanelExpandedSizeForOpenMode</key>
|
||||
<string>{712, 448}</string>
|
||||
<string>{712, 459}</string>
|
||||
<key>NSQuotedKeystrokeBinding</key>
|
||||
<string></string>
|
||||
<key>NSRepeatCountBinding</key>
|
||||
|
@ -347,7 +351,7 @@
|
|||
gAKACoAN0xAJChEVGVdOUy5rZXlzoxITFIADgASABaMWFxiABoAHgAiACVpJZGVudGlm
|
||||
aWVyVVdpZHRoVkhpZGRlblEwI0BowAAAAAAACNIhIiMkWiRjbGFzc25hbWVYJGNsYXNz
|
||||
ZXNcTlNEaWN0aW9uYXJ5oiMlWE5TT2JqZWN00xAJCicrGaMSExSAA4AEgAWjLC0YgAuA
|
||||
DIAIgAlRMSNAdCGdsi0OVtIhIjM0Xk5TTXV0YWJsZUFycmF5ozM1JVdOU0FycmF5XxAP
|
||||
DIAIgAlRMSNAdCAAAAAAANIhIjM0Xk5TTXV0YWJsZUFycmF5ozM1JVdOU0FycmF5XxAP
|
||||
TlNLZXllZEFyY2hpdmVy0Tg5VUFycmF5gAEACAARABoAIwAtADIANwBGAEwAUQBcAGMA
|
||||
ZgBoAGoAbABzAHsAfwCBAIMAhQCJAIsAjQCPAJEAnACiAKkAqwC0ALUAugDFAM4A2wDe
|
||||
AOcA7gDyAPQA9gD4APwA/gEAAQIBBAEGAQ8BFAEjAScBLwFBAUQBSgAAAAAAAAIBAAAA
|
||||
|
@ -363,14 +367,25 @@
|
|||
</data>
|
||||
<key>NSTableView Supports v2 KeyBingingTable</key>
|
||||
<true/>
|
||||
<key>NSToolbar Configuration com.apple.NSColorPanel</key>
|
||||
<dict>
|
||||
<key>TB Is Shown</key>
|
||||
<integer>1</integer>
|
||||
</dict>
|
||||
<key>NSWindow Frame NSColorPanel</key>
|
||||
<string>307 274 214 309 0 0 1440 878 </string>
|
||||
<key>NSWindow Frame NSFontPanel</key>
|
||||
<string>659 87 445 270 0 0 1440 878 </string>
|
||||
<key>NSWindow Frame Preferences</key>
|
||||
<string>472 398 606 456 0 0 1440 877 </string>
|
||||
<key>NSWindow Frame SUUpdateAlert</key>
|
||||
<string>410 364 620 392 0 0 1440 877 </string>
|
||||
<key>NSWindow Frame SharedPreferences</key>
|
||||
<string>30 232 958 433 0 0 1440 877 </string>
|
||||
<string>397 146 1018 447 0 0 1440 900 </string>
|
||||
<key>NSWindow Frame iTerm Window 0</key>
|
||||
<string>19 71 890 577 0 0 1440 877 </string>
|
||||
<string>0 10 890 577 0 0 1440 900 </string>
|
||||
<key>NSWindow Frame iTerm Window 1</key>
|
||||
<string>297 151 890 577 0 0 1440 877 </string>
|
||||
<key>NSWindow Frame iTerm Window 2</key>
|
||||
<string>436 70 890 577 0 0 1440 877 </string>
|
||||
<string>176 70 890 577 0 0 1440 900 </string>
|
||||
<key>New Bookmarks</key>
|
||||
<array>
|
||||
<dict>
|
||||
|
@ -542,9 +557,9 @@
|
|||
<key>Blue Component</key>
|
||||
<real>0.0</real>
|
||||
<key>Color Space</key>
|
||||
<string>sRGB</string>
|
||||
<string>Calibrated</string>
|
||||
<key>Green Component</key>
|
||||
<real>0.1491314172744751</real>
|
||||
<real>0.0</real>
|
||||
<key>Red Component</key>
|
||||
<real>1</real>
|
||||
</dict>
|
||||
|
@ -583,7 +598,7 @@
|
|||
<key>Cursor Guide Color</key>
|
||||
<dict>
|
||||
<key>Alpha Component</key>
|
||||
<real>0.058823529411764705</real>
|
||||
<real>0.1123199462890625</real>
|
||||
<key>Blue Component</key>
|
||||
<real>1</real>
|
||||
<key>Color Space</key>
|
||||
|
@ -924,13 +939,13 @@
|
|||
<key>Alpha Component</key>
|
||||
<real>1</real>
|
||||
<key>Blue Component</key>
|
||||
<real>0.73423302173614502</real>
|
||||
<real>0.67800000000000005</real>
|
||||
<key>Color Space</key>
|
||||
<string>sRGB</string>
|
||||
<string>Calibrated</string>
|
||||
<key>Green Component</key>
|
||||
<real>0.35916060209274292</real>
|
||||
<real>0.27000000000000002</real>
|
||||
<key>Red Component</key>
|
||||
<real>0.0</real>
|
||||
<real>0.023</real>
|
||||
</dict>
|
||||
<key>Mouse Reporting</key>
|
||||
<true/>
|
||||
|
@ -1010,20 +1025,24 @@
|
|||
<string>/Users/clean</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>NoSyncConfirmBeta</key>
|
||||
<true/>
|
||||
<key>NoSyncHaveWarnedAboutPasteConfirmationChange</key>
|
||||
<true/>
|
||||
<key>NoSyncInstallationId</key>
|
||||
<string>8FD26FF7-1B8C-4187-9B85-F5B954050646</string>
|
||||
<string>6E369C17-4B98-41A0-81E8-D8CCF4EAFEA8</string>
|
||||
<key>NoSyncNeverRemindPrefsChangesLostForFile</key>
|
||||
<true/>
|
||||
<key>NoSyncNeverRemindPrefsChangesLostForFile_selection</key>
|
||||
<integer>0</integer>
|
||||
<key>NoSyncNewWindowOrTabFromTmuxOpensTmux</key>
|
||||
<true/>
|
||||
<key>NoSyncNewWindowOrTabFromTmuxOpensTmux_selection</key>
|
||||
<integer>0</integer>
|
||||
<key>NoSyncPermissionToShowTip</key>
|
||||
<false/>
|
||||
<key>NoSyncTimeOfFirstLaunchOfVersionWithTip</key>
|
||||
<real>504956337.093835</real>
|
||||
<real>486966257.753326</real>
|
||||
<key>NoSyncTimeOfLastPromo</key>
|
||||
<real>455217537.05998898</real>
|
||||
<key>NoSyncTimeOfLastPromoDownload</key>
|
||||
<real>483065410.63003302</real>
|
||||
<key>OnlyWhenMoreTabs</key>
|
||||
<false/>
|
||||
<key>OpenTmuxWindowsIn</key>
|
||||
|
@ -1064,27 +1083,27 @@
|
|||
</dict>
|
||||
</dict>
|
||||
<key>PrefsCustomFolder</key>
|
||||
<string>/Users/clean/dotfiles</string>
|
||||
<string>/Users/sharpshark28/dotfiles</string>
|
||||
<key>Print In Black And White</key>
|
||||
<true/>
|
||||
<key>PromptOnQuit</key>
|
||||
<false/>
|
||||
<key>SUAutomaticallyUpdate</key>
|
||||
<true/>
|
||||
<key>SUEnableAutomaticChecks</key>
|
||||
<true/>
|
||||
<key>SUFeedAlternateAppNameKey</key>
|
||||
<string>iTerm</string>
|
||||
<key>SUFeedURL</key>
|
||||
<string>https://iterm2.com/appcasts/final.xml?shard=84</string>
|
||||
<string>https://iterm2.com/appcasts/final.xml?shard=68</string>
|
||||
<key>SUHasLaunchedBefore</key>
|
||||
<true/>
|
||||
<key>SULastCheckTime</key>
|
||||
<date>2017-01-01T09:39:35Z</date>
|
||||
<key>SUSendProfileInfo</key>
|
||||
<false/>
|
||||
<date>2017-01-21T21:15:07Z</date>
|
||||
<key>WordCharacters</key>
|
||||
<string>/-+\~_.</string>
|
||||
<key>iTerm Version</key>
|
||||
<string>3.0.20161231-nightly</string>
|
||||
<string>3.0.20170121-nightly</string>
|
||||
<key>kCPKSelectionViewPreferredModeKey</key>
|
||||
<integer>0</integer>
|
||||
<key>kCPKSelectionViewShowHSBTextFieldsKey</key>
|
||||
|
|
12
init.sh
12
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
|
||||
|
|
|
@ -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'
|
||||
|
|
14
vimrc
14
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'
|
||||
|
|
14
zshrc
14
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
|
||||
|
|
Loading…
Add table
Reference in a new issue