Fixed missing spaceduck activation for vim
This commit is contained in:
parent
04455d3746
commit
7df5062178
3 changed files with 220 additions and 8 deletions
209
nvim/init.vim
Normal file
209
nvim/init.vim
Normal file
|
@ -0,0 +1,209 @@
|
||||||
|
let g:plugged_home = '~/.vim/plugged'
|
||||||
|
|
||||||
|
call plug#begin(g:plugged_home)
|
||||||
|
" UI related
|
||||||
|
Plug 'chriskempson/base16-vim'
|
||||||
|
Plug 'vim-airline/vim-airline'
|
||||||
|
Plug 'vim-airline/vim-airline-themes'
|
||||||
|
" Better Visual Guide
|
||||||
|
Plug 'Yggdroot/indentLine'
|
||||||
|
" syntax check
|
||||||
|
Plug 'w0rp/ale'
|
||||||
|
" Autocomplete
|
||||||
|
Plug 'ncm2/ncm2'
|
||||||
|
Plug 'roxma/nvim-yarp'
|
||||||
|
Plug 'ncm2/ncm2-bufword'
|
||||||
|
Plug 'ncm2/ncm2-path'
|
||||||
|
Plug 'ncm2/ncm2-jedi'
|
||||||
|
" Formater
|
||||||
|
Plug 'Chiel92/vim-autoformat'
|
||||||
|
" Theme
|
||||||
|
Plug 'pineapplegiant/spaceduck', { 'branch': 'main' }
|
||||||
|
" Python Plugins
|
||||||
|
Plug 'Valloric/YouCompleteMe'
|
||||||
|
Plug 'vim-syntastic/syntastic'
|
||||||
|
Plug 'nvie/vim-flake8'
|
||||||
|
Plug 'python-mode/python-mode'
|
||||||
|
Plug 'airblade/vim-gitgutter'
|
||||||
|
"
|
||||||
|
"general development plugins
|
||||||
|
Plug 'scrooloose/nerdtree'
|
||||||
|
Plug 'flazz/vim-colorschemes'
|
||||||
|
Plug 'davidhalter/jedi-vim'
|
||||||
|
Plug 'ervandew/supertab'
|
||||||
|
Plug 'ryanoasis/vim-webdevicons'
|
||||||
|
Plug 'direnv/direnv.vim'
|
||||||
|
Plug 'sheerun/vim-polyglot'
|
||||||
|
" This was fun and all, but getting data out sucked, so if they ever get an
|
||||||
|
" update, maybe try again
|
||||||
|
"Plugin 'ActivityWatch/aw-watcher-vim'
|
||||||
|
"
|
||||||
|
" Bind zonefile stuff
|
||||||
|
Plug 'seveas/bind.vim'
|
||||||
|
"
|
||||||
|
" extline extends rst stuff
|
||||||
|
Plug 'drmikehenry/vim-extline'
|
||||||
|
Plug 'brookhong/DBGPavim'
|
||||||
|
Plug 'dhruvasagar/vim-table-mode'
|
||||||
|
Plug 'godlygeek/tabular'
|
||||||
|
Plug 'plasticboy/vim-markdown'
|
||||||
|
" Additional languages
|
||||||
|
Plug 'nathanielc/vim-tickscript'
|
||||||
|
Plug 'fatih/vim-go'
|
||||||
|
Plug 'dbeniamine/cheat.sh-vim'
|
||||||
|
Plug 'jacqueswww/vim-vyper'
|
||||||
|
Plug 'tomlion/vim-solidity'
|
||||||
|
call plug#end()
|
||||||
|
|
||||||
|
filetype plugin indent on
|
||||||
|
" Set colors for spaceduck
|
||||||
|
if exists('+termguicolors')
|
||||||
|
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
|
||||||
|
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
|
||||||
|
set termguicolors
|
||||||
|
endif
|
||||||
|
let g:airline_theme = 'spaceduck'
|
||||||
|
if exists('+termguicolors')
|
||||||
|
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
|
||||||
|
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
|
||||||
|
set termguicolors
|
||||||
|
endif
|
||||||
|
|
||||||
|
colorscheme spaceduck
|
||||||
|
|
||||||
|
" set the number style to hybrid
|
||||||
|
set number relativenumber
|
||||||
|
|
||||||
|
|
||||||
|
" READ FROM .vimrc
|
||||||
|
|
||||||
|
set nocompatible " required
|
||||||
|
set splitright
|
||||||
|
filetype off " required
|
||||||
|
" Handy hack to force a write using sudo when you forget to 'sudo vi'
|
||||||
|
cmap w!! w !sudo tee > /dev/null %
|
||||||
|
|
||||||
|
set pastetoggle=<F10>
|
||||||
|
|
||||||
|
set incsearch
|
||||||
|
set encoding=utf-8
|
||||||
|
set wrap
|
||||||
|
set linebreak
|
||||||
|
set nolist
|
||||||
|
|
||||||
|
" Attempt to fix python/python3 issue
|
||||||
|
" To run py2 stuff, you can force with "vim --cmd 'let py2 = 1'
|
||||||
|
"if exists('py2') && has('python')
|
||||||
|
"elseif has('python3')
|
||||||
|
if !has('patch-8.1.201')
|
||||||
|
silent! python3 1
|
||||||
|
endif
|
||||||
|
|
||||||
|
"let g:deoplete#enable_at_startup = 1
|
||||||
|
"Plugin 'Shougo/deoplete.nvim'
|
||||||
|
|
||||||
|
" Add all your plugins here (note older versions of Vundle used Bundle instead
|
||||||
|
" of Plugin)
|
||||||
|
|
||||||
|
" All of your Plugins must be added before the following line
|
||||||
|
filetype plugin indent on " required
|
||||||
|
"Powerline setup
|
||||||
|
"set guifont=PowerLineSymbols\ DejaVu\ Sans\ Mono\ for\ Powerline\ 9
|
||||||
|
" set guifont=DejaVu\ Sans\ Mono\ for\ Powerline\ Plus\ Nerd\ File\ Types\ 9
|
||||||
|
set guifont=Sauce\ Code\ Powerline\ Plus\ Nerd\ File\ Types\ 9
|
||||||
|
" set guifont=Anonymous\ Pro\ for\ Powerline\ Regular/9
|
||||||
|
let g:Powerline_symbols = 'fancy'
|
||||||
|
let g:airline_powerline_fonts = 1
|
||||||
|
set laststatus=2
|
||||||
|
|
||||||
|
"NerdTree map to <f2>
|
||||||
|
map <F2> :NERDTreeToggle<CR>
|
||||||
|
|
||||||
|
"colorscheme jellybeans
|
||||||
|
|
||||||
|
"Make python-friendly tabs
|
||||||
|
set tabstop=4
|
||||||
|
set shiftwidth=4
|
||||||
|
set smarttab
|
||||||
|
set softtabstop=4
|
||||||
|
set autoindent
|
||||||
|
set expandtab
|
||||||
|
"let &colorcolumn="80,".join(range(81,999),",")
|
||||||
|
|
||||||
|
augroup vimrc_autocmds
|
||||||
|
autocmd!
|
||||||
|
"highlight characters past col 80
|
||||||
|
autocmd FileType python highlight Excess ctermbg=DarkGrey guibg=Black
|
||||||
|
autocmd FileType python match Excess /\%80v.*/
|
||||||
|
autocmd FileType python set nowrap
|
||||||
|
" autocmd FileType rst set textwidth=80
|
||||||
|
autocmd FileType markdown set textwidth=80
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
set mouse=a
|
||||||
|
|
||||||
|
" python-mode settings
|
||||||
|
" Python-mode
|
||||||
|
" Activate rope
|
||||||
|
" Keys:
|
||||||
|
" K Show python docs
|
||||||
|
" <Ctrl-Space> Rope autocomplete
|
||||||
|
" <Ctrl-c>g Rope goto definition
|
||||||
|
" <Ctrl-c>d Rope show documentation
|
||||||
|
" <Ctrl-c>f Rope find occurrences
|
||||||
|
" <Leader>b Set, unset breakpoint (g:pymode_breakpoint enabled)
|
||||||
|
" [[ Jump on previous class or function (normal, visual, operator
|
||||||
|
" modes)
|
||||||
|
" ]] Jump on next class or function (normal, visual, operator
|
||||||
|
" modes)
|
||||||
|
" [M Jump on previous class or method (normal, visual, operator
|
||||||
|
" modes)
|
||||||
|
" ]M Jump on next class or method (normal, visual, operator
|
||||||
|
" modes)
|
||||||
|
let g:pymode_rope = 0
|
||||||
|
|
||||||
|
" Documentation
|
||||||
|
let g:pymode_doc = 1
|
||||||
|
let g:pymode_doc_key = 'K'
|
||||||
|
|
||||||
|
"Linting
|
||||||
|
let g:pymode_lint = 1
|
||||||
|
"let g:pymode_lint_checker = "pyflakes,pep8"
|
||||||
|
let g:pymode_lint_checker = "flake8,pep8"
|
||||||
|
" Auto check on save
|
||||||
|
let g:pymode_lint_write = 1
|
||||||
|
|
||||||
|
" Support virtualenv
|
||||||
|
let g:pymode_virtualenv = 1
|
||||||
|
|
||||||
|
" Enable breakpoints plugin
|
||||||
|
let g:pymode_breakpoint = 1
|
||||||
|
let g:pymode_breakpoint_key = '<leader>b'
|
||||||
|
|
||||||
|
" syntax highlighting
|
||||||
|
let g:pymode_syntax = 1
|
||||||
|
let g:pymode_syntax_all = 1
|
||||||
|
let g:pymode_syntax_indent_errors = g:pymode_syntax_all
|
||||||
|
let g:pymode_syntax_space_errors = g:pymode_syntax_all
|
||||||
|
|
||||||
|
" Don't autofold code
|
||||||
|
let g:pymode_folding = 0
|
||||||
|
let g:riv_fold_level = 0
|
||||||
|
let g:riv_fold_auto_update = 0
|
||||||
|
nnoremap <space> za
|
||||||
|
|
||||||
|
let g:dbgPavimPort = 9000
|
||||||
|
let g:dbgPavimBreakAtEntry = 0
|
||||||
|
let g:dbgPavimOnce = 1
|
||||||
|
|
||||||
|
let python_highlight_all=1
|
||||||
|
syntax on
|
||||||
|
|
||||||
|
let g:pymode_python = 'python3'
|
||||||
|
|
||||||
|
" For table mode RST friendliness
|
||||||
|
let g:table_mode_corner_corner='+'
|
||||||
|
let g:table_mode_header_fillchar='='
|
||||||
|
let g:webdevicons_enable = 1
|
||||||
|
let g:webdevicons_enable_nerdtree = 1
|
||||||
|
autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
|
|
@ -44,7 +44,9 @@ Plugin 'davidhalter/jedi-vim'
|
||||||
Plugin 'ervandew/supertab'
|
Plugin 'ervandew/supertab'
|
||||||
Plugin 'ryanoasis/vim-webdevicons'
|
Plugin 'ryanoasis/vim-webdevicons'
|
||||||
Plugin 'direnv/direnv.vim'
|
Plugin 'direnv/direnv.vim'
|
||||||
Plugin 'ActivityWatch/aw-watcher-vim'
|
" This was fun and all, but getting data out sucked, so if they ever get an
|
||||||
|
" update, maybe try again
|
||||||
|
"Plugin 'ActivityWatch/aw-watcher-vim'
|
||||||
"
|
"
|
||||||
" Bind zonefile stuff
|
" Bind zonefile stuff
|
||||||
Plugin 'seveas/bind.vim'
|
Plugin 'seveas/bind.vim'
|
||||||
|
|
15
zsh/zshrc
15
zsh/zshrc
|
@ -47,11 +47,12 @@ HIST_STAMPS="yyyy-mm-dd"
|
||||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||||
# Add wisely, as too many plugins slow down shell startup.
|
# Add wisely, as too many plugins slow down shell startup.
|
||||||
# plugins=(git)
|
# plugins=(git)
|
||||||
plugins=(sudo taskwarrior common-aliases git-flow github keybase vi-mode fzf python)
|
plugins=(sudo taskwarrior common-aliases git-flow github vi-mode fzf python)
|
||||||
plugins+=(zsh-vi-mode)
|
#plugins+=(zsh-vi-mode)
|
||||||
|
plugins+=(fzf-tab)
|
||||||
|
|
||||||
# User configuration
|
# User configuration
|
||||||
export PATH="/usr/lib64/qt-3.3/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/home/kellya/bin:/home/kellya/incoming/git-annex.linux:/home/kellya/bin/keybase/bin:/home/kellya/.local/bin"
|
export PATH="/usr/lib64/qt-3.3/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/home/kellya/bin:/home/kellya/incoming/git-annex.linux:/home/kellya/bin/keybase/bin:/home/kellya/.local/bin:/home/kellya/.cargo/bin"
|
||||||
# export MANPATH="/usr/local/man:$MANPATH"
|
# export MANPATH="/usr/local/man:$MANPATH"
|
||||||
|
|
||||||
|
|
||||||
|
@ -86,7 +87,7 @@ alias atnone="task context none;"
|
||||||
alias icat="kitty +kitten icat"
|
alias icat="kitty +kitten icat"
|
||||||
alias d="kitty +kitten diff"
|
alias d="kitty +kitten diff"
|
||||||
#eval "$(ntfy shell-integration)"
|
#eval "$(ntfy shell-integration)"
|
||||||
source /usr/share/gems/gems/tmuxinator-0.6.11/completion/tmuxinator.zsh
|
#source /usr/share/gems/gems/tmuxinator-0.6.11/completion/tmuxinator.zsh
|
||||||
source ~/.private_aliases
|
source ~/.private_aliases
|
||||||
source /usr/bin/virtualenvwrapper.sh
|
source /usr/bin/virtualenvwrapper.sh
|
||||||
|
|
||||||
|
@ -101,7 +102,7 @@ alias ipython='ipython --no-confirm-exit'
|
||||||
#Variable Exports
|
#Variable Exports
|
||||||
export EDITOR='vim'
|
export EDITOR='vim'
|
||||||
export PATH="$PATH:/home/kellya/go/bin"
|
export PATH="$PATH:/home/kellya/go/bin"
|
||||||
export WORKON_HOME=/mnt/vdisks/projects/python_virtualenvs
|
#export WORKON_HOME=/mnt/vdisks/projects/python_virtualenvs
|
||||||
export LPASS_AGENT_TIMEOUT=0
|
export LPASS_AGENT_TIMEOUT=0
|
||||||
export PATH="/usr/local/heroku/bin:$PATH"
|
export PATH="/usr/local/heroku/bin:$PATH"
|
||||||
|
|
||||||
|
@ -111,7 +112,7 @@ for f (~/.functions/**/*(N.)) . $f
|
||||||
|
|
||||||
#This didn't work, but I'll leave it here in case someday it does
|
#This didn't work, but I'll leave it here in case someday it does
|
||||||
#export AGNOSTER_PROMPT_SEGMENTS=("prompt_status" "prompt_context" "prompt_virtualenv" "prompt_dir" "prompt_end")
|
#export AGNOSTER_PROMPT_SEGMENTS=("prompt_status" "prompt_context" "prompt_virtualenv" "prompt_dir" "prompt_end")
|
||||||
cat /home/kellya/.local/share/franklinlogo.txt
|
#cat /home/kellya/.local/share/franklinlogo.txt
|
||||||
|
|
||||||
#Stop the annoying git prompt
|
#Stop the annoying git prompt
|
||||||
prompt_git () {
|
prompt_git () {
|
||||||
|
@ -146,7 +147,7 @@ export PATH="$HOME/.poetry/bin:$PATH"
|
||||||
#FZF stuff
|
#FZF stuff
|
||||||
#source /usr/share/fzf/shell/key-bindings.zsh
|
#source /usr/share/fzf/shell/key-bindings.zsh
|
||||||
zvm_after_init_commands+=('[ -f /usr/share/fzf/shell/key-bindings.zsh ] && source /usr/share/fzf/shell/key-bindings.zsh')
|
zvm_after_init_commands+=('[ -f /usr/share/fzf/shell/key-bindings.zsh ] && source /usr/share/fzf/shell/key-bindings.zsh')
|
||||||
source ~/.oh-my-zsh/completions/fzf_completion
|
#source ~/.oh-my-zsh/completions/fzf_completion
|
||||||
export FZF_DEFAULT_OPTS="--extended"
|
export FZF_DEFAULT_OPTS="--extended"
|
||||||
export FZF_DEFAULT_COMMAND="fd --type f"
|
export FZF_DEFAULT_COMMAND="fd --type f"
|
||||||
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
|
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
|
||||||
|
|
Loading…
Reference in a new issue