fzf zsh

4 files changed, 20 insertions, 240 deletions

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index f182e5b..cecdae0 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,3 +1,18 @@
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
+" init.vim 4.0 by Joe
+"      _
+"     | | ___   ___
+"  _  | |/ _ \ / _ \
+" | |_| | (_) |  __/
+"  \___/ \___/ \___|
+"
+
+set runtimepath^=/home/jozan/.config/nvim runtimepath+=/home/jozan/.config/nvim/after
 let &packpath = &runtimepath
+source /home/jozan/.config/nvim/plug.vim
+source /home/jozan/.config/nvim/settings.vim
+source /home/jozan/.config/nvim/bindings.vim
+source /home/jozan/.config/nvim/sidebars.vim
+source /home/jozan/.config/nvim/plugins.vim
+source /home/jozan/.config/nvim/langs.vim
+source /home/jozan/.config/nvim/plug-config/coc.vim
 source ~/.vimrc
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index f43f40a..7145cb3 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -36,8 +36,10 @@ bindkey -M vicmd "j" history-beginning-search-forward
 autoload edit-command-line && zle -N edit-command-line
 bindkey "^e" edit-command-line
 
-[ -f "$XDG_CONFIG_HOME/zsh/alias.zsh" ]		&& source $ZDOTDIR/alias.zsh
-[ -f "$XDG_CONFIG_HOME/zsh/plugins.zsh" ]	&& source $ZDOTDIR/plugins.zsh
+[ -f "$ZDOTDIR/alias.zsh" ]		&& source $ZDOTDIR/alias.zsh
+[ -f "$ZDOTDIR/plugins.zsh" ]	&& source $ZDOTDIR/plugins.zsh
+[ -f "$HOME/Packages/fzf/shell/completion.zsh" ]	&& source $HOME/Packages/fzf/shell/completion.zsh
+[ -f "$HOME/Packages/fzf/shell/key-bindings.zsh" ]	&& source $HOME/Packages/fzf/shell/key-bindings.zsh
 
 globalias() {
 	if [[ $LBUFFER =~ '^[a-z0-9]+$' ]]; then
diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh
index f1434b3..b0b5080 100644
--- a/.config/zsh/alias.zsh
+++ b/.config/zsh/alias.zsh
@@ -30,7 +30,6 @@ alias gpo='git push origin'
 alias startdocker='sudo service vboxnet restart && docker-machine start docker-home'
 alias stopdocker='docker-machine stop docker-home'
 alias envdocker='eval `docker-machine env docker-home`'
-alias z='cd $(find . -type d | fzf)'
 alias cat='bat'
 alias vimz='nvim $(fzf)'
 alias v='nvim $(fzf)'
diff --git a/.vimrc b/.vimrc
index 931fe95..e69de29 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,236 +0,0 @@
-" .vimrc 4.0 by Joe
-"      _
-"     | | ___   ___
-"  _  | |/ _ \ / _ \
-" | |_| | (_) |  __/
-"  \___/ \___/ \___|
-"
-
-" Plugins
-call plug#begin('~/.vim/plugged')
-Plug 'brglng/vim-sidebar-manager'
-Plug 'honza/vim-snippets'
-Plug 'jceb/vim-orgmode'
-Plug 'jiangmiao/auto-pairs'
-Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-Plug 'junegunn/fzf.vim'
-Plug 'luochen1990/rainbow'
-Plug 'mbbill/undotree'
-Plug 'mg979/vim-visual-multi'
-Plug 'mhinz/vim-signify'
-Plug 'mhinz/vim-startify'
-Plug 'morhetz/gruvbox'
-Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
-Plug 'preservim/tagbar'
-Plug 'preservim/nerdcommenter'
-Plug 'preservim/nerdtree'
-Plug 'ryanoasis/vim-devicons'
-Plug 'sainnhe/gruvbox-material'
-Plug 'tpope/vim-fugitive'
-Plug 'tpope/vim-surround'
-Plug 'vifm/vifm.vim'
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
-" Plug 'vim-scripts/AutoComplPop'
-call plug#end()
-
-let mapleader="\\"
-let maplocalleader="\\"
-
-" Some basics:
-set bg=dark
-set clipboard^=unnamedplus
-"set complete+=kspell
-"set completeopt=menuone,longest
-set encoding=utf-8
-set go=a
-set hidden
-set makeprg=gmake
-set mouse=a
-set nocompatible
-set nohlsearch
-set number
-set shiftwidth=4
-set shortmess+=c
-set softtabstop=4
-set ruler
-set tabstop=4
-set undodir=/tmp
-set undofile
-set wildmode=longest,list,full
-syntax on
-filetype plugin indent on
-autocmd ColorScheme * highlight Normal ctermbg=NONE guibg=NONE
-colorscheme gruvbox-material
-
-" Some quick bindings
-nnoremap c "_c
-nnoremap <M-;> :call NERDComment(0,"toggle")<CR>
-nnoremap <M-x> :
-nnoremap <M-1> :!
-nnoremap <silent> <M-k> :bprevious<CR>
-nnoremap <silent> <M-j> :bnext<CR>
-nnoremap <C-h> <C-w>h
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-l> <C-w>l
-nnoremap <C-o> <C-w>o
-nnoremap <C-q> <C-w>q
-nnoremap <C-x>1 <C-w>o
-nnoremap <C-x>2 :sp<CR>
-nnoremap <C-x>3 :vsp<CR>
-nnoremap <C-x>0 <C-w>q
-nnoremap <silent> <leader>g :G<CR>
-nnoremap <silent> <leader>d :Vifm<CR>
-nnoremap <silent> <leader>e :Files<CR>
-nnoremap <silent> <leader>b :Buffers<CR>
-nnoremap <leader>s :w<CR>
-nnoremap <leader>w :w <BAR> :bp <BAR> :bd #<CR>
-nnoremap <leader>x :w <BAR> :bp <BAR> :bd #<CR>
-nmap <leader>1 <Plug>AirlineSelectTab1
-nmap <leader>2 <Plug>AirlineSelectTab2
-nmap <leader>3 <Plug>AirlineSelectTab3
-nmap <leader>4 <Plug>AirlineSelectTab4
-nmap <leader>5 <Plug>AirlineSelectTab5
-nmap <leader>6 <Plug>AirlineSelectTab6
-nmap <leader>7 <Plug>AirlineSelectTab7
-nmap <leader>8 <Plug>AirlineSelectTab8
-nmap <leader>9 <Plug>AirlineSelectTab9
-nmap <leader>0 <Plug>AirlineSelectTab10
-inoremap <expr> <C-j> pumvisible() ? "<C-n>" : "<C-j>"
-inoremap <expr> <C-k> pumvisible() ? "<C-p>" : "<C-k>"
-" inoremap <expr> <CR> pumvisible() ? "<C-y>" : "<CR>"
-" inoremap <expr> <TAB> pumvisible() ? "<C-y>" : "<ESC>"
-" inoremap <expr> <ESC> pumvisible() ? "<C-e>" : "<ESC>"
-
-" sidebars
-let g:NERDTreeWinPos = 'left'
-let g:NERDTreeWinSize = 30
-let g:NERDTreeQuitOnOpen = 0
-let g:tagbar_left = 1
-let g:tagbar_width = 30
-let g:tagbar_autoclose = 0
-let g:tagbar_autofocus = 1
-let g:tagbar_sort = 0
-let g:undotree_SetFocusWhenToggle = 1
-let g:undotree_SplitWidth = 30
-
-let g:sidebars = {
-			\ 'nerdtree': {
-			\     'position': 'left',
-			\     'check_win': {nr -> getwinvar(nr, '&filetype') ==# 'nerdtree'},
-			\     'open': 'NERDTree',
-			\     'close': 'NERDTreeClose'
-			\ },
-			\ 'tagbar': {
-			\     'position': 'left',
-			\     'check_win': {nr -> bufname(winbufnr(nr)) =~ '__Tagbar__'},
-			\     'open': 'TagbarOpen',
-			\     'close': 'TagbarClose'
-			\ },
-			\ 'undotree': {
-			\     'position': 'left',
-			\     'check_win': {nr -> getwinvar(nr, '&filetype') ==# 'undotree'},
-			\     'open': 'UndotreeShow',
-			\     'close': 'UndotreeHide'
-			\ }
-			\ }
-
-noremap <silent> <F1> :sp<CR><C-w>j:term<CR>:resize -10<CR>i
-noremap <silent> <F2> :call sidebar#toggle('nerdtree')<CR>
-noremap <F4> :make<space>-j5<space>
-noremap <silent> <F3> :call sidebar#toggle('tagbar')<CR>
-noremap <silent> <F5> :call sidebar#toggle('undotree')<CR>
-let g:startify_session_before_save = ['call sidebar#close_all()']
-
-" Startify
-" let g:startify_padding_left = 90
-let g:startify_custom_header = startify#pad([
-			\ '  _____________________________________ ',
-			\ ' /                                     \',
-			\ ' |    Hi, partner, welcome_back to     |',
-			\ ' |  _ __   ___  _____   _(_)_ __ ___   |',
-			\ ' | | ''_ \ / _ \/ _ \ \ / / | ''_ ` _ \  |',
-			\ ' | | | | |  __/ (_) \ V /| | | | | | | |',
-			\ ' | |_| |_|\___|\___/ \_/ |_|_| |_| |_| |',
-			\ ' \                                     /',
-			\ '  ------------------------------------- ',
-			\ '         \   ^__^                       ',
-			\ '          \  (oo)\_______               ',
-			\ '             (__)\       )\/\           ',
-			\ '                 ||----w |              ',
-			\ '                 ||     ||              ',
-			\ ])
-let g:startify_lists = [
-			\ { 'type': 'sessions',  'header': startify#pad(['Sessions'])	},
-			\ { 'type': 'files',     'header': startify#pad(['Recent'])		},
-			\ { 'type': 'bookmarks', 'header': startify#pad(['Bookmarks'])	},
-			\ { 'type': 'commands',  'header': startify#pad(['Commands'])	},
-			\ ]
-let g:startify_bookmarks = [
-			\ { 'v': '~/.vimrc' },
-			\ { 'z': '~/.config/zsh/.zshrc' },
-			\ { 'b': '~/.config/bspwm/bspwmrc' },
-			\ ]
-
-" Airline
-let g:airline#extensions#tabline#enabled = 1
-let g:airline#extensions#tabline#fnamemod = ':t'
-let g:airline_detect_modified = 1
-let g:airline_detect_paste = 1
-let g:airline_detect_crypt = 1
-let g:airline_theme = 'base16_gruvbox_dark_hard'
-let g:airline_powerline_fonts = 1
-let g:airline_symbols_ascii = 1
-let g:airline#parts#ffenc#skip_expected_string = 'utf-8[unix]'
-
-" Rainbow
-let g:rainbow_active = 1
-
-" NERD Commenter
-let g:NERDSpaceDelims = 1
-let g:NERDCompactSexyComs = 1
-let g:NERDDefaultAlign = 'left'
-let g:NERDAltDelims_java = 1
-let g:NERDCustomDelimiters = { 'c': { 'left': '/*','right': '*/' } }
-let g:NERDCommentEmptyLines = 1
-let g:NERDTrimTrailingWhitespace = 1
-let g:NERDToggleCheckAllLines = 1
-
-" Cursor mode
-let g:airline#extensions#cursormode#enabled = 1
-let g:cursormode_color_map = {
-			\	"i": 		"#d79921",
-			\	"n": 		"#d79921",
-			\	"R": 		"#cc241d",
-			\	"r": 		"#cc241d",
-			\	"v": 		"#b06597",
-			\	"V": 		"#b06597",
-			\	"\<C-V>":	"#b06597",
-			\}
-
-" 10 buffers jump
-let g:airline#extensions#tabline#buffer_idx_mode = 1
-
-" Org-mode
-let g:org_todo_keywords = ['TODO',  '|', 'DONE', 'CANCELED']
-" Disables automatic commenting on newline:
-autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
-autocmd BufDelete * if empty(filter(tabpagebuflist(), '!buflisted(v:val)')) | Startify | endif
-
-" Filetype {{{1
-augroup vimrc
-	" Filetype: Assembly {{{2
-	let g:asmsyntax = 'asm'
-	" Filetype: C {{{2
-	autocmd BufLeave *.{c,cpp} mark C
-	autocmd BufLeave *.h       mark H
-
-	" Filetype: Perl {{{2
-	let perl_include_pod = 1
-	autocmd FileType perl
-				\  setlocal com-=:# kp=perldoc\ -f
-				\| compiler perl
-augroup END
-
-source /home/jozan/.config/nvim/plug-config/coc.vim