Merge branch 'master' of ssh://ssh.paoda.moe:31059/paoda/dotfiles

This commit is contained in:
Rekai Musuka 2020-11-23 19:27:13 -06:00
commit d69860a0df
5 changed files with 42 additions and 19 deletions

View File

@ -1,5 +1,21 @@
" Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
" If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
" (see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
if (empty($TMUX))
if (has("nvim"))
" For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
let $NVIM_TUI_ENABLE_TRUE_COLOR=1
endif
" For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
" Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
if (has("termguicolors"))
set termguicolors
endif
endif
" Shortcuts " Shortcuts
map <C-o> :NERDTreeToggle<CR> nnoremap <silent><nowait> <space>o :NERDTreeToggle<CR>
nnoremap <silent><nowait> <space>s :TagbarToggle<CR> nnoremap <silent><nowait> <space>s :TagbarToggle<CR>
" Remove Highlight " Remove Highlight
@ -29,7 +45,6 @@ inoremap <silent><expr> <c-space> coc#refresh()
" coc.nvim quick fix " coc.nvim quick fix
nmap <leader>qf <Plug>(coc-fix-current) nmap <leader>qf <Plug>(coc-fix-current)
" Use tab for trigger completion with characters ahead and navigate. " Use tab for trigger completion with characters ahead and navigate.
" Used by coc.nvim " Used by coc.nvim
inoremap <silent><expr> <TAB> inoremap <silent><expr> <TAB>
@ -66,7 +81,7 @@ endfunction
" CoC Status in LightLine " CoC Status in LightLine
" Used by coc.nvim lightline.nvim " Used by coc.nvim lightline.nvim
let g:lightline = { let g:lightline = {
\ 'colorscheme': 'molokai', \ 'colorscheme': 'one',
\ 'active': { \ 'active': {
\ 'left': [ [ 'mode', 'paste' ], \ 'left': [ [ 'mode', 'paste' ],
\ [ 'cocstatus', 'readonly', 'filename', 'modified' ] ] \ [ 'cocstatus', 'readonly', 'filename', 'modified' ] ]
@ -94,11 +109,18 @@ nnoremap <silent><nowait> <space>c :<C-u>CocList commands<cr>
" Plugged Plugins " Plugged Plugins
call plug#begin(stdpath('data') . '/plugged') call plug#begin(stdpath('data') . '/plugged')
" Activity Tracking
" Plug 'ActivityWatch/aw-watcher-vim' " Blue Theme
Plug 'wadackel/vim-dogrun'
" Indent Detection
Plug 'tpope/vim-sleuth'
" One Dark Theme " One Dark Theme
Plug 'joshdick/onedark.vim' Plug 'rakr/vim-one'
" Activity Tracking
" Plug 'ActivityWatch/aw-watcher-vim'
" Monokai Theme " Monokai Theme
Plug 'tomasr/molokai' Plug 'tomasr/molokai'
@ -146,4 +168,4 @@ let g:rustfmt_autosave = 1
" Configuration " Configuration
set noshowmode " Not Needed because we have Lightline set noshowmode " Not Needed because we have Lightline
colorscheme molokai colorscheme one

View File

@ -22,9 +22,3 @@ dotfile() {
# Re-enable reverse-i-search # Re-enable reverse-i-search
bindkey '^R' history-incremental-search-backward bindkey '^R' history-incremental-search-backward
# Set Default Editor
export EDITOR="/usr/bin/nvim"
# Make mpv XDG Compliant
export MPV_HOME=~/.local/share/mpv

9
.zshenv Normal file
View File

@ -0,0 +1,9 @@
# Rust
export PATH="$HOME/.cargo/bin:$PATH"
# DenoJS
export DENO_INSTALL="/home/paoda/.deno"
export PATH="$DENO_INSTALL/bin:$PATH"
# Set Default Editor
export EDITOR="/usr/bin/nvim"

4
.zshrc
View File

@ -81,8 +81,6 @@ plugins=(git)
# .zhistory not .zsh_history # .zhistory not .zsh_history
export HISTFILE=$HOME/.zhistory export HISTFILE=$HOME/.zhistory
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh
# User configuration # User configuration
@ -112,7 +110,7 @@ source $ZSH/oh-my-zsh.sh
# alias ohmyzsh="mate ~/.oh-my-zsh" # alias ohmyzsh="mate ~/.oh-my-zsh"
# Source Personal Config # Source Personal Config
source ~/paoda.zsh source ~/.paodarc
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh