Couple fish abbreviations. I stopped symlinking my init.vim to Matt's old one. Cut the chord so to speak. Added some fzf functionallity, GGrep and Work, which greps git files, and fuzzy findz ~/Workspace/ respectively. Other than that, just a couple vim keys and settings, and I modularized my tmux and I am running power tmux now. It's actually awesome.

This commit is contained in:
Shawn Anderson 2020-10-04 18:31:56 -07:00
parent e5f3772aaa
commit 165d472ba5
26 changed files with 1125 additions and 1119 deletions

2
.gitignore vendored
View File

@ -10,3 +10,5 @@ dotfiles/.config/tmux/resurrect/
dotfiles/.config/coc/mru
dotfiles/.config/coc/extensions/coc-yank-data/yank
dotfiles/.config/coc/memos.json
dotfiles/.config/coc/history.json
dotfiles/.config/nvim/library/

View File

@ -1,21 +0,0 @@
{
"outline": {
"%2Fhome%2Fygg%2FWorkspace%2Fconfiguration%F0%9F%A7%AA%2Fdotfiles%2F": {
"local%2Fshare%2Ffzf": [
"rg"
]
}
},
"commands": {
"%2Fhome%2Fygg%2FWorkspace%2Fconfiguration%F0%9F%A7%AA%2Fdotfiles%2F": {
"config%2Fnvim%2Fplugconfig%2Fneoclide": [
"vim",
"kkkk",
"kkkkkkjjjjj"
]
},
"%2Fhome%2Fygg%2FWorkspace%2FUbuntu%F0%9F%A6%8B%2Fpanel-django%2Fpanel_django%2Fapps%2Fubuntu": [
"pythonset"
]
}
}

View File

@ -53,3 +53,4 @@ end
# See fishfile for installed plugins through fisherman
abbr gc git commit -m
abbr gp git push origin master
abbr python python

View File

@ -1 +0,0 @@
library/MattDev_NvimConfig⛺/after

View File

@ -1 +0,0 @@
library/MattDev_NvimConfig⛺/autoload

View File

@ -1 +0,0 @@
library/MattDev_NvimConfig/coc-settings.json

File diff suppressed because it is too large Load Diff

View File

@ -1 +0,0 @@
library/MattDev_NvimConfig⛺/colors

View File

@ -1 +0,0 @@
library/MattDev_NvimConfig⛺/init.vim

View File

@ -0,0 +1,29 @@
runtime plugins.vim
runtime settings.vim
runtime themes.vim
runtime autocommands.vim
runtime coc.vim
runtime keys.vim
" Check code as python3 by default
let g:neomake_python_python_maker = neomake#makers#ft#python#python()
let g:neomake_python_flake8_maker = neomake#makers#ft#python#flake8()
let g:neomake_python_python_maker.exe = 'python3 -m py_compile'
let g:neomake_python_flake8_maker.exe = 'python3 -m flake8'
" Disable error messages inside the buffer, next to the problematic line
let g:neomake_virtualtext_current_error = 1
"------------------------------------------------------------------------------
" Shawn Anderson as of September 30th 2020
noremap <leader>f 0
noremap <leader>j $
set ignorecase " ignores case of letters on searches
set smartcase " Override the 'ignorecase' option if the search pattern contains upper case characters
map <leader>/ :nohl<CR>
noremap <C-j> jj
noremap <C-k> kk
" This makes the location of the current open file always the current working
" directory of vim. This pairs very nicely with tmux. Added - Sept 15th 2020
autocmd BufEnter * lcd %:p:h

View File

@ -1,21 +0,0 @@
runtime plugins.vim
runtime settings.vim
runtime themes.vim
runtime autocommands.vim
runtime coc.vim
runtime keys.vim
" Check code as python3 by default
let g:neomake_python_python_maker = neomake#makers#ft#python#python()
let g:neomake_python_flake8_maker = neomake#makers#ft#python#flake8()
let g:neomake_python_python_maker.exe = 'python3 -m py_compile'
let g:neomake_python_flake8_maker.exe = 'python3 -m flake8'
" Disable error messages inside the buffer, next to the problematic line
let g:neomake_virtualtext_current_error = 1
"------------------------------------------------------------------------------
" Shawn Anderson as of September 30th 2020
noremap <leader>f 0
noremap <leader>j $
map <leader>/ :nohl<CR>

View File

@ -40,8 +40,8 @@ Plug 'junegunn/fzf.vim'
"`:Helptags` | Help tags [1]
"`:Filetypes` | File types
"------------------+-----------------------------------------------------------------------
nnoremap <C-p> :Commands<CR>fzf#
"nnoremap <C-p><C-p> :History<CR>
nnoremap <C-f> :Commands<CR>fzf#
nnoremap <C-p> :History<CR>
"nnoremap <C-p><C-r> :History:<CR>
"nnoremap <C-p><C-s> :History/<CR>
"nnoremap <C-p><C-t> :Files<CR>
@ -55,4 +55,23 @@ nnoremap <C-p> :Commands<CR>fzf#
"nnoremap <C-p><C-l> :Lines<CR>
"For jmcomets/vim-pony
nnoremap <leader>d :Commands<CR>^D
nnoremap <leader>d :Commands<CR>'DjangoGoto
" Workspace Search
command! -bang Work call fzf#vim#files('~/Workspace', <bang>0)
" Grep current git project
command! -bang -nargs=* Work2
\ call fzf#vim#files(
\ 'git grep --line-number -- '.shellescape(<q-args>), 0,
\ fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), <bang>0)
command! -bang -nargs=* GGrep
\ call fzf#vim#grep(
\ 'git grep --line-number -- '.shellescape(<q-args>), 0,
\ fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), <bang>0)
command! -bang -nargs=* Rg
\ call fzf#vim#grep(
\ 'rg --column --line-number --no-heading --color=always --smart-case -- '.shellescape(<q-args>), 1,
\ fzf#vim#with_preview(), <bang>0)

View File

@ -1 +0,0 @@
library/MattDev_NvimConfig⛺/plugged

View File

@ -39,7 +39,7 @@ runtime plugconfig/arielrossanigo/dir-configs-override.vim.vim
runtime plugconfig/voldikss/vim-floaterm.vim
runtime plugconfig/justinmk/vim-sneak.vim
runtime plugconfig/honza/vim-snippets.vim
runtime plugconfig/unblevable/quick-scope.vim
"runtime plugconfig/unblevable/quick-scope.vim
runtime plugconfig/junegunn/vim-github-dashboard.vim
runtime plugconfig/jmcomets/vim-pony.vim
Plug 'psliwka/vim-smoothie'
@ -176,7 +176,7 @@ let g:indentLine_char = '┊'
" Distraction free programming
Plug 'junegunn/goyo.vim'
" Goyo mappings
nmap <C-g> :Goyo 60x60
nmap <C-g> :Goyo<CR>
" Tell vim-plug we finished declaring plugins, so it can load them

View File

@ -2,6 +2,9 @@
unbind C-b
set -g prefix ^A
# Goyo
bind G set status
# New Window
unbind ^C
bind c new-window -c '#{pane_current_path}'

View File

@ -1,6 +1,6 @@
# change pane numbers to start with 1 instead of 0
set -g base-index 1
set -g pane-base-index 1
#set -g base-index 1
#set -g pane-base-index 1
# Set fish as default shell
set -g default-shell /usr/bin/fish