dgy
/
hexagons
Archived
1
0
Fork 0
Code Releases Activity

afinando todavia mas nvim. aguante la educacion publica

This commit is contained in:
deadguy 2018-08-31 01:12:16 -03:00
parent a028c96af8
commit b09dabd179
9 changed files with 298 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.config/mutt/muttrc
View File

@ -37,10 +37,10 @@ set uncollapse_jump # no collapse on unread message
set sort_re # thread based on regex set sort_re # thread based on regex
set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*" set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+" set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
#set new_mail_command="notify-send -a neomutt -u normal 'You've Got Mail' '%n new messages, %u unread.' &" set new_mail_command="notify-send -a neomutt -u normal 'You Got Mail' '%n new messages, %u unread.' &"
set date_format ="%a %d %b %R" set date_format ="%a %d %b %R"
#set index_format ="%2C %Z %?X?A& ? %D %-45.45F %s (%-4.4c)" set index_format ="%2C %zs %?X?A& ? %D %-15.15F %s (%-4.4c)"
set index_format="%4C %Z %{%b %d %R} %-15.15L (%?l?%4l&%4c?) %s" #set index_format="%4C %Z %{%b %d %R} %-15.15L (%?l?%4l&%4c?) %s"
set alias_format = " %4n %t %-20a %r " set alias_format = " %4n %t %-20a %r "
# Header Options ------------------------------------- # Header Options -------------------------------------

29
.config/nvim/ftplugin/markdown.vim
View File

@ -3,4 +3,31 @@ setl sts=2
setl sw=2 setl sw=2
setl et setl et
setl tw=80 setl tw=80
setlocal colorcolumn=79 setlocal colorcolumn=79
function! Prose()
call pencil#init()
" manual reformatting shortcuts
nnoremap <buffer> <silent> Q gqap
xnoremap <buffer> <silent> Q gq
nnoremap <buffer> <silent> <leader>Q vapJgqap
" force top correction on most recent misspelling
nnoremap <buffer> <c-s> [s1z=<c-o>
inoremap <buffer> <c-s> <c-g>u<Esc>[s1z=`]A<c-g>u
" replace common punctuation
iabbrev <buffer> -- –
iabbrev <buffer> --- —
iabbrev <buffer> << «
iabbrev <buffer> >> »
endfunction
augroup pystuff
autocmd!
autocmd BufEnter call Prose()
autocmd BufNewFile *.md call Prose()
augroup END
set statusline=%<%f\ %h%m%r%w\ \ %{PencilMode()}\ %=\ col\ %c%V\ \ line\ %l\,%L\ %P
set rulerformat=%-12.(%l,%c%V%)%{PencilMode()}\ %P

6
.config/nvim/ftplugin/python.vim
View File

@ -11,17 +11,19 @@ setlocal formatoptions+=croq
setlocal omnifunc=pythoncomplete#Complete setlocal omnifunc=pythoncomplete#Complete
setlocal cinwords=if,elif,else,for,while,try,except,finally,def,class,with setlocal cinwords=if,elif,else,for,while,try,except,finally,def,class,with
let g:LanguageClient_autoStart = 1
augroup pystuff augroup pystuff
autocmd! autocmd!
autocmd BufEnter call ncm2#enable_for_buffer() autocmd BufEnter call ncm2#enable_for_buffer()
autocmd BufNewFile *.py 0r ~/.config/nvim/templates/py.skeleton autocmd BufNewFile *.py 0r ~/.config/nvim/templates/py.skeleton
autocmd InsertEnter *.py Semshi pause
autocmd InsertLeave *.py Semshi enable
augroup END augroup END
nnoremap <buffer> <localleader>y :0,$!yapf<Cr> nnoremap <buffer> <localleader>y :0,$!yapf<Cr>
nnoremap <buffer> <localleader>c I#<esc> nnoremap <buffer> <localleader>c I#<esc>
let g:LanguageClient_autoStart = 1
let g:ale_sign_column_always = 1 let g:ale_sign_column_always = 1
let g:ale_set_loclist = 0 let g:ale_set_loclist = 0
let g:ale_set_quickfix = 1 let g:ale_set_quickfix = 1

4
.config/nvim/ftplugin/sh.vim
View File

@ -8,4 +8,6 @@ if !exists("b:sh_indent_options")
let b:sh_indent_options = {} let b:sh_indent_options = {}
endif endif
let b:sh_indent_options['continuation-line'] = 4 let b:sh_indent_options['continuation-line'] = 4
let b:ale_linters = ['shellcheck']

449
.config/nvim/init.vim
View File

@ -9,62 +9,71 @@ let python_highlight_all=1
" Plug updates itself automatically " Plug updates itself automatically
if empty(glob('~/.config/nvim/autoload/plug.vim')) if empty(glob('~/.config/nvim/autoload/plug.vim'))
silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif endif
if executable('rg') if executable('rg')
set grepprg=rg\ --vimgrep\ --no-heading set grepprg=rg\ --vimgrep\ --hidden\ --no-heading
set grepformat=%f:%l:%c:%m,%f:%l:%m
elseif executable('ag') elseif executable('ag')
set grepprg=ag\ --nogroup\ --nocolor set grepprg=ag\ --nogroup\ --nocolor
endif endif
" }}} " }}}
" Plugins {{{ " Plugins {{{
call plug#begin('~/.config/nvim/plugged') call plug#begin('~/.config/nvim/plugged')
Plug 'junegunn/vim-plug' Plug 'junegunn/vim-plug'
Plug 'w0rp/ale' " Languages
Plug 'sbdchd/neoformat'
Plug 'lervag/vimtex', { 'for': 'tex' } Plug 'lervag/vimtex', { 'for': 'tex' }
Plug 'plasticboy/vim-markdown', { 'for': 'markdown' } Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }
Plug 'supercollider/scvim' " Formatting
Plug 'w0rp/ale'
Plug 'sbdchd/neoformat', {'on': 'Neoformat'}
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
Plug 'Shougo/neco-syntax'
Plug 'Shougo/neco-vim'
" Navigation
Plug 'scrooloose/nerdtree', { 'on': ['NERDTreeFind', 'NERDTreeToggle'] } Plug 'scrooloose/nerdtree', { 'on': ['NERDTreeFind', 'NERDTreeToggle'] }
Plug 'christoomey/vim-tmux-navigator' Plug 'christoomey/vim-tmux-navigator'
Plug '/usr/bin/fzf' Plug '/usr/bin/fzf'
Plug 'junegunn/fzf.vim' Plug 'junegunn/fzf.vim'
" Modes
Plug 'junegunn/goyo.vim', { 'on': 'Goyo' } Plug 'junegunn/goyo.vim', { 'on': 'Goyo' }
Plug 'reedes/vim-pencil', { 'for': ['tex', 'markdown', 'text'] }
Plug 'chrisbra/vim-diff-enhanced'
" UI
Plug 'NLKNguyen/papercolor-theme' Plug 'NLKNguyen/papercolor-theme'
Plug 'zefei/vim-wintabs' Plug 'zefei/vim-wintabs'
Plug 'jiangmiao/auto-pairs' Plug 'jiangmiao/auto-pairs'
Plug 'chrisbra/vim-diff-enhanced' " Python
Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'} Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'}
Plug 'hkupty/iron.nvim', { 'do': ':UpdateRemotePlugins' } Plug 'hkupty/iron.nvim', { 'do': ':UpdateRemotePlugins' }
Plug 'roxma/nvim-yarp' Plug 'zchee/deoplete-jedi'
Plug 'ncm2/ncm2'
Plug 'ncm2/ncm2-jedi'
Plug 'ncm2/ncm2-match-highlight'
Plug 'autozimu/LanguageClient-neovim', { Plug 'autozimu/LanguageClient-neovim', {
\ 'branch': 'next', \ 'branch': 'next',
\ 'do': 'bash install.sh', \ 'do': 'bash install.sh',
\ } \ }
call plug#end() call plug#end()
let g:plug_window = 'rightbelow topleft new' let g:plug_window = 'rightbelow topleft new'
nnoremap <leader>pi :PlugInstall<CR>
nnoremap <leader>pu :PlugUpdate<CR>
nnoremap <leader>pU :PlugUpgrade<CR>
nnoremap <leader>pc :PlugClean<CR>
" }}} " }}}
" Options {{{ " Options {{{
" Search down int subfolders " Search down into subfolders
" Provides tab-completion for all file-related tasks " Provides tab-completion for all file-related tasks
" - :b lets you autocomplete any open buffer " - :b lets you autocomplete any open buffer
set path+=** set path+=**
set binary set binary
set clipboard^=unnamedplus " system clipboard (requires +clipboard) set clipboard^=unnamedplus " system clipboard (requires +clipboard)
set encoding=utf-8 " The encoding displayed. set encoding=utf-8 " The encoding displayed.
set fileencoding=utf-8 " The encoding written to file. set fileencoding=utf-8 " The encoding written to file.
let mapleader="\<SPACE>"
let localleader=","
set shell=/bin/zsh " Setting shell to zsh set shell=/bin/zsh " Setting shell to zsh
set number " Line numbers on set number " Line numbers on
set showmode " Always show mode set showmode " Always show mode
@ -104,8 +113,9 @@ set foldenable " Fold by default
set foldlevelstart=10 set foldlevelstart=10
set foldnestmax=10 " Deepest fold is 10 levels set foldnestmax=10 " Deepest fold is 10 levels
set foldmethod=marker " Markers are used to specify folds. set foldmethod=marker " Markers are used to specify folds.
set completeopt=noinsert,menuone,noselect set completeopt=noinsert,menuone,preview,noselect
set completeopt-=preview " Don't show preview scratch buffers "set completefunc=LanguageClient#complete
set formatexpr=LanguageClient#textDocument_rangeFormatting_sync()
set noexpandtab " Do not turn tabs into spaces set noexpandtab " Do not turn tabs into spaces
set tabstop=4 " Number of spaces a <Tab> equals set tabstop=4 " Number of spaces a <Tab> equals
set softtabstop=4 set softtabstop=4
@ -131,8 +141,7 @@ set complete+=]
set completeopt-=preview set completeopt-=preview
set completeopt+=noinsert,longest,noselect,menuone set completeopt+=noinsert,longest,noselect,menuone
set formatoptions+=n set formatoptions+=n
let formatlistpat='^\s*\(\d\+[\]:.)}\t ]\|[*-][\t ]\)\s*' "set matchpairs=(:),{:},[:],<:>
set matchpairs=(:),{:},[:],<:>
" Display all matching files when we tab complete " Display all matching files when we tab complete
set wildmenu set wildmenu
@ -161,31 +170,9 @@ set wildmode=longest:list,full
match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
" use ripgrep as grepprg let mapleader="\<SPACE>"
if executable('rg') let localleader=","
set grepprg=rg\ --vimgrep\ --hidden\ --no-ignore-vcs let formatlistpat='^\s*\(\d\+[\]:.)}\t ]\|[*-][\t ]\)\s*'
set grepformat=%f:%l:%c:%m,%f:%l:%m
endif
"highlight MatchParen cterm=bold ctermbg=none ctermfg=9
"highlight TermCursor ctermfg=green guifg=green
"highlight DiffAdd ctermbg=2
"highlight DiffDelete ctermbg=1
"highlight DiffChange ctermbg=238
"highlight DiffChange ctermbg=242
" }}}
" Papercolor {{{
set background=dark
let g:PaperColor_Theme_Options = {
\ 'theme': {
\ 'default.dark': {
\ 'transparent_background': 1,
\ 'allow_italic': 1
\ }
\ }
\ }
colorscheme PaperColor
" }}} " }}}
" Statusline {{{ " Statusline {{{
@ -220,7 +207,7 @@ function! LinterStatus() abort
\) \)
endfunction endfunction
set statusline+=%#SpecialKey# set statusline+=%#Keyword#
set statusline+=%{StatuslineGit()} set statusline+=%{StatuslineGit()}
set statusline+=%#CursorLineNr# set statusline+=%#CursorLineNr#
set statusline+=\ %{LinterStatus()} set statusline+=\ %{LinterStatus()}
@ -238,12 +225,13 @@ set statusline+=\ %{winnr()}
if !exists("autocommands_loaded") && has("autocmd") if !exists("autocommands_loaded") && has("autocmd")
let autocommands_loaded = 1 let autocommands_loaded = 1
autocmd BufWritePre * :%s/\s\+$//e " Auto remove all trailing whitespace on :w " Auto remove all trailing whitespace on :w
":au FocusLost * :wa " Autosave files when focus is lost autocmd BufWritePre * :%s/\s\+$//e
" Disables automatic commenting on newline " Disables automatic commenting on newline
autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
" Python file template
autocmd BufNewFile *.py 0r ~/.config/nvim/templates/py.skeleton autocmd BufNewFile *.py 0r ~/.config/nvim/templates/py.skeleton
aug terminal_stuff aug terminal_stuff
@ -255,7 +243,7 @@ if !exists("autocommands_loaded") && has("autocmd")
aug END aug END
autocmd FileType fzf set noshowmode noruler autocmd FileType fzf set noshowmode noruler
\| autocmd BufLeave <buffer> set showmode ruler \| autocmd BufLeave <buffer> set showmode ruler
" Automatic syntax highlighting for files " Automatic syntax highlighting for files
aug set_file_types aug set_file_types
@ -297,76 +285,6 @@ let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+'
let g:netrw_winsize=25 let g:netrw_winsize=25
" }}} " }}}
" {{{ Ale
"let g:ale_set_highlights = 0
"let g:ale_echo_msg_error_str = 'E'
"let g:ale_echo_msg_warning_str = 'W'
let g:ale_echo_msg_format = '[%linter%] %s% (code)% [%severity%]'
let g:ale_statusline_format = ['⨉ %d', '⚠ %d', '⬥ ok']
let g:ale_lint_delay = 500 " relint max once per [amount] milliseconds
highlight ALEError cterm=undercurl ctermfg=196
highlight ALEInfo cterm=undercurl ctermfg=14
hi ALEErrorSign ctermfg=red ctermbg=none
hi ALEWarningSign ctermfg=yellow ctermbg=none
" }}}
" Iron {{{
nnoremap <leader>ir :IronRepl<CR>
let g:iron_repl_open_cmd = 'vsplit'
let g:iron_map_defaults = 0
nmap + <S-v><Plug>(iron-send-motion)
vmap + <Plug>(iron-send-motion)
nmap rr <Plug>(iron-repeat-cmd)
" }}}
" LSP {{{
let g:LanguageClient_serverCommands = {
\ 'python': ['/usr/bin/pyls'],
\ }
call ncm2#override_source('LanguageClient_python', {'enable': 0})
" }}}
" Wintabs {{{
let g:wintabs_ui_active_higroup = 'TabLineSel'
let g:wintabs_switchbuf='useopen,usetab'
let g:wintabs_display='statusline'
let intertabSpace= ''
let activeVimTabChar = '┃ '
let g:wintabs_ui_sep_leftmost=activeVimTabChar
let g:wintabs_ui_sep_inbetween=' '
let g:wintabs_ui_sep_rightmost=' '
let g:wintabs_ui_active_vimtab_left=activeVimTabChar
let g:wintabs_ui_active_vimtab_right=' '
let g:wintabs_ui_active_left=activeVimTabChar
let g:wintabs_ui_active_right=' '
let g:wintabs_ui_buffer_name_format='%t'
let g:wintabs_ui_vimtab_name_format='%n'
let g:wintabs_ui_arrow_left='«'
let g:wintabs_ui_arrow_right='»'
" }}}
" NerdTree {{{
autocmd StdinReadPre * let s:std_in=1
let NERDTreeIgnore=['\.rbc$', '\~$', '\.pyc$', '\.pyo$', '\.db$', '\.sqlite$', '.o$', 'bower_components', 'node_modules', '__pycache__']
let g:NERDTreeSortOrder=['^__\.py$', '\/$', '*', '\.swp$', '\.bak$', '\~$']
let NERDTreeNaturalSort = 1
let NERDTreeShowHidden=1
let NERDTreeWinPos=1
let NERDTreeRespectWildIgnore = 1
let NERDTreeMinimalUI=1
let NERDTreeDirArrows = 1
let NERDTreeCascadeSingleChildDir=1
let NERDTreeCascadeOpenSingleChildDir=1
let NERDTreeQuitOnOpen = 1
let NERDTreeHijackNetrw = 0
let NERDTreeAutoCenter = 1
let g:NERDTreeDirArrowExpandable = '↠'
let g:NERDTreeDirArrowCollapsible = '↡'
" }}}
" Ranger {{{ " Ranger {{{
function! <SID>ranger() function! <SID>ranger()
let l:temp = tempname() let l:temp = tempname()
@ -392,6 +310,67 @@ function! <SID>ranger()
redraw! redraw!
endfunction endfunction
nnoremap <leader>R :call <SID>ranger()<CR>
" }}}
" {{{ Ale
let g:ale_linters_explicit = 1
let g:ale_echo_msg_format = '[%linter%] %s% (code)% [%severity%]'
let g:ale_lint_delay = 500 " relint max once per [amount] milliseconds
let g:ale_pattern_options = {
\ '\.min\.js$': {'ale_linters': [], 'ale_fixers': []},
\ '\.min\.css$': {'ale_linters': [], 'ale_fixers': []},
\}
highlight ALEError cterm=undercurl ctermfg=196
highlight ALEInfo cterm=undercurl ctermfg=14
hi ALEErrorSign ctermfg=red ctermbg=none
hi ALEWarningSign ctermfg=yellow ctermbg=none
nmap <silent> <F10> <Plug>(ale_previous_wrap)
nmap <silent> <F11> <Plug>(ale_next_wrap)
" }}}
" Deoplete {{{
let g:deoplete#enable_at_startup = 1
"set completeopt-=preview
call deoplete#custom#option('max_list', 100000)
call deoplete#custom#option('min_pattern_length', 2)
call deoplete#custom#source('LanguageClient',
\ 'min_pattern_length',
\ 2)
if !exists('g:deoplete#omni#input_patterns')
let g:deoplete#omni#input_patterns = {}
endif
let g:deoplete#sources#jedi#server_timeout = 120
let g:deoplete#sources#jedi#show_docstring = 1
let g:deoplete#enable_ignore_case = 1
let g:deoplete#enable_smart_case = 1
let g:context_filetype#same_filetypes = {}
let g:context_filetype#same_filetypes._ = '_'
"}}}
" NerdTree {{{
autocmd StdinReadPre * let s:std_in=1
let NERDTreeIgnore=['\.rbc$', '\~$', '\.pyc$', '\.pyo$', '\.db$', '\.sqlite$', '.o$', 'bower_components', 'node_modules', '__pycache__']
let g:NERDTreeSortOrder=['^__\.py$', '\/$', '*', '\.swp$', '\.bak$', '\~$']
let NERDTreeNaturalSort = 1
let NERDTreeShowHidden=1
let NERDTreeWinPos=1
let NERDTreeRespectWildIgnore = 1
let NERDTreeMinimalUI=1
let NERDTreeDirArrows = 1
let NERDTreeCascadeSingleChildDir=1
let NERDTreeCascadeOpenSingleChildDir=1
let NERDTreeQuitOnOpen = 1
let NERDTreeHijackNetrw = 0
let NERDTreeAutoCenter = 1
let g:NERDTreeDirArrowExpandable = '↠'
let g:NERDTreeDirArrowCollapsible = '↡'
nnoremap <silent> <F2> :NERDTreeToggle<CR>
nnoremap <silent> <F3> :NERDTreeFind<CR>
" }}} " }}}
" Tmux navigator {{{ " Tmux navigator {{{
@ -404,97 +383,152 @@ nnoremap <silent> M-Right :TmuxNavigateRight<cr>
nnoremap <silent> M-Tab :TmuxNavigatePrevious<cr> nnoremap <silent> M-Tab :TmuxNavigatePrevious<cr>
" }}} " }}}
" Fzf {{{
" use bottom positioned 30% height bottom split
let g:fzf_layout = { 'down': '~30%' }
let g:fzf_action = {
\ 'ctrl-t': 'tab split',
\ 'ctrl-s': 'split',
\ 'ctrl-v': 'vsplit' }
let g:fzf_colors =
\ { 'fg': ['fg', 'Normal'],
\ 'bg': ['bg', 'Clear'],
\ 'hl': ['fg', 'String'],
\ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
\ 'bg+': ['bg', 'CursorLine', 'CursorColumn'],
\ 'hl+': ['fg', 'Statement'],
\ 'info': ['fg', 'PreProc'],
\ 'prompt': ['fg', 'Conditional'],
\ 'pointer': ['fg', 'Exception'],
\ 'marker': ['fg', 'Keyword'],
\ 'spinner': ['fg', 'Label'],
\ 'header': ['fg', 'Comment'] }
command! -bang -nargs=* Rg
\ call fzf#vim#grep(
\ 'rg --column --line-number --hidden --ignore-case --no-heading --color=always '.shellescape(<q-args>), 1,
\ <bang>0 ? fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'up:60%')
\ : fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'right:50%:hidden', '?'),
\ <bang>0)
command! -bang -nargs=? -complete=dir Files
\ call fzf#vim#files(<q-args>, fzf#vim#with_preview(), <bang>0)
" only use FZF shortcuts in non diff-mode
if !&diff
nnoremap <C-p> :Files<Cr>
nnoremap <C-g> :Rg<Cr>
nnoremap <C-h> :History<CR>
nnoremap <C-b> :Buffers<CR>
endif
" }}}
" Goyo {{{ " Goyo {{{
function! s:goyo_enter() function! s:goyo_enter()
let b:quitting = 0 let b:quitting = 0
let b:quitting_bang = 0 let b:quitting_bang = 0
autocmd QuitPre <buffer> let b:quitting = 1 autocmd QuitPre <buffer> let b:quitting = 1
cabbrev <buffer> q! let b:quitting_bang = 1 <bar> q! cabbrev <buffer> q! let b:quitting_bang = 1 <bar> q!
endfunction endfunction
function! s:goyo_leave() function! s:goyo_leave()
" Quit Vim if this is the only remaining buffer " Quit Vim if this is the only remaining buffer
if b:quitting && len(filter(range(1, bufnr('$')), 'buflisted(v:val)')) == 1 if b:quitting && len(filter(range(1, bufnr('$')), 'buflisted(v:val)')) == 1
if b:quitting_bang if b:quitting_bang
qa! qa!
else else
qa qa
endif endif
endif endif
endfunction endfunction
autocmd! User GoyoEnter call <SID>goyo_enter() autocmd! User GoyoEnter call <SID>goyo_enter()
autocmd! User GoyoLeave call <SID>goyo_leave() autocmd! User GoyoLeave call <SID>goyo_leave()
" }}} " }}}
" Fzf {{{ " Enhanced Diff {{{
" use bottom positioned 30% height bottom split " started In Diff-Mode set diffexpr (plugin not loaded yet)
let g:fzf_layout = { 'down': '~30%' } if &diff
let g:fzf_action = { let &diffexpr='EnhancedDiff#Diff("git diff", "--diff-algorithm=patience")'
\ 'ctrl-t': 'tab split',
\ 'ctrl-s': 'split',
\ 'ctrl-v': 'vsplit' }
let g:fzf_colors =
\ { 'fg': ['fg', 'Normal'],
\ 'bg': ['bg', 'Clear'],
\ 'hl': ['fg', 'String'],
\ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
\ 'bg+': ['bg', 'CursorLine', 'CursorColumn'],
\ 'hl+': ['fg', 'Statement'],
\ 'info': ['fg', 'PreProc'],
\ 'prompt': ['fg', 'Conditional'],
\ 'pointer': ['fg', 'Exception'],
\ 'marker': ['fg', 'Keyword'],
\ 'spinner': ['fg', 'Label'],
\ 'header': ['fg', 'Comment'] }
command! -bang -nargs=* Rg
\ call fzf#vim#grep(
\ 'rg --column --line-number --hidden --ignore-case --no-heading --color=always '.shellescape(<q-args>), 1,
\ <bang>0 ? fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'up:60%')
\ : fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'right:50%:hidden', '?'),
\ <bang>0)
command! -bang -nargs=? -complete=dir Files
\ call fzf#vim#files(<q-args>, fzf#vim#with_preview(), <bang>0)
" only use FZF shortcuts in non diff-mode
if !&diff
nnoremap <C-p> :Files<Cr>
nnoremap <C-g> :Rg<Cr>
endif endif
" }}} " }}}
"Mappings {{{ " Papercolor {{{
" Open ranger as a file chooser set background=dark
nnoremap <leader>R :call <SID>ranger()<CR> let g:PaperColor_Theme_Options = {
\ 'theme': {
\ 'default.dark': {
\ 'transparent_background': 1,
\ 'allow_italic': 1
\ }
\ }
\ }
colorscheme PaperColor
" }}}
" Wintabs {{{
let g:wintabs_ui_active_higroup = 'TabLineSel'
let g:wintabs_switchbuf='useopen,usetab'
let g:wintabs_display='statusline'
let intertabSpace= ''
let activeVimTabChar = '┃ '
let g:wintabs_ui_sep_leftmost=activeVimTabChar
let g:wintabs_ui_sep_inbetween=' '
let g:wintabs_ui_sep_rightmost=' '
let g:wintabs_ui_active_vimtab_left=activeVimTabChar
let g:wintabs_ui_active_vimtab_right=' '
let g:wintabs_ui_active_left=activeVimTabChar
let g:wintabs_ui_active_right=' '
let g:wintabs_ui_buffer_name_format='%t'
let g:wintabs_ui_vimtab_name_format='%n'
let g:wintabs_ui_arrow_left='«'
let g:wintabs_ui_arrow_right='»'
nnoremap <silent> <C-,> :bnew<CR>
nnoremap <silent> <M-,> :WintabsClose<CR>
nnoremap <silent> <C-l> :WintabsNext<CR>
nnoremap <silent> <C-h> :WintabsPrevious<CR>
" }}}
" Semshi {{{
let g:semshi#mark_selected_nodes = 2
let g:semshi#error_sign = v:false
" }}}
" Iron {{{
nnoremap <leader>ir :IronRepl<CR>
let g:iron_repl_open_cmd = '10split'
let g:iron_map_defaults = 0
nmap + <S-v><Plug>(iron-send-motion)
vmap + <Plug>(iron-send-motion)
nmap rr <Plug>(iron-repeat-cmd)
" }}}
" LSP {{{
let g:LanguageClient_serverCommands = {
\ 'python': ['/usr/bin/pyls'],
\ 'cpp': ['clangd'],
\ 'bash': ['/usr/bin/shellcheck'],
\ }
nnoremap <silent> <F2> :NERDTreeToggle<CR>
nnoremap <silent> <F3> :NERDTreeFind<CR>
nnoremap <F5> :call LanguageClient_contextMenu()<CR> nnoremap <F5> :call LanguageClient_contextMenu()<CR>
map <F6> :setlocal spell! spelllang=es<CR> " }}}
map <F7> :setlocal spell! spelllang=en<CR>
map <F8> :set nospell<CR>
map <F9> :!w<Enter>:!pdflatex <C-r>%<Enter>
nmap <silent> <F10> <Plug>(ale_previous_wrap) "Mappings {{{
nmap <silent> <F11> <Plug>(ale_next_wrap) " Spell checking
nnoremap <F6> :setlocal spell! spelllang=es<CR>
nnoremap <F7> :setlocal spell! spelllang=en<CR>
nnoremap <F8> :set nospell<CR>
nnoremap <F9> :!w<Enter>:!pdflatex <C-r>%<Enter>
" Neoformat
nnoremap <leader>f :Neoformat<CR> nnoremap <leader>f :Neoformat<CR>
vnoremap <leader>f :Neoformat<CR> vnoremap <leader>f :Neoformat<CR>
nnoremap <leader>pi :PlugInstall<CR> " Super quick search and replace
nnoremap <leader>pu :PlugUpdate<CR>
nnoremap <leader>pU :PlugUpgrade<CR>
nnoremap <leader>pc :PlugClean<CR>
" fzf & rg
nnoremap <C-p> :Files<Cr>
nnoremap <C-g> :Rg<Cr>
nnoremap <C-h> :History<CR>
nnoremap <C-b> :Buffers<CR>
" super quick search and replace
nnoremap <Space>' :'{,'}s/\<<C-r>=expand("<cword>")<CR>\>/ nnoremap <Space>' :'{,'}s/\<<C-r>=expand("<cword>")<CR>\>/
nnoremap <Space>¿ :%s/\<<C-r>=expand("<cword>")<CR>\>/ nnoremap <Space>¿ :%s/\<<C-r>=expand("<cword>")<CR>\>/
@ -510,23 +544,24 @@ nnoremap <silent> <Down> :resize +1<CR>
inoremap jk <esc> inoremap jk <esc>
cnoremap jk <C-c> cnoremap jk <C-c>
" edit and source config file " Edit and source config file
nnoremap <silent> <leader>ev :vsplit $MYVIMRC<CR> nnoremap <silent> <leader>ev :vsplit $MYVIMRC<CR>
nnoremap <silent> <leader>sv :source $MYVIMRC<CR> nnoremap <silent> <leader>sv :source $MYVIMRC<CR>
" fast saves " Fast saves
nnoremap <leader>w :w!<CR> nnoremap <leader>w :w!<CR>
" exit quickly " Exit quickly
nnoremap <leader>q :q!<CR> nnoremap <leader>q :q!<CR>
" Splits
nnoremap <leader>T :terminal<CR> nnoremap <leader>T :terminal<CR>
nnoremap <leader>s :split<CR> nnoremap <leader>s :split<CR>
nnoremap <leader>v :vsplit<CR> nnoremap <leader>v :vsplit<CR>
nnoremap <leader>nv :vnew<CR> nnoremap <leader>nv :vnew<CR>
nnoremap <leader>ns :new<CR> nnoremap <leader>ns :new<CR>
" ensure that ctrl+u in insert mode can be reversed " Ensure that ctrl+u in insert mode can be reversed
" http://vim.wikia.com/wiki/Recover_from_accidental_Ctrl-U " http://vim.wikia.com/wiki/Recover_from_accidental_Ctrl-U
inoremap <c-u> <c-g>u<c-u> inoremap <c-u> <c-g>u<c-u>
inoremap <c-w> <c-g>u<c-w> inoremap <c-w> <c-g>u<c-w>
@ -537,7 +572,7 @@ nnoremap <silent> <CR> i<CR><ESC>
" Fix indentation " Fix indentation
nnoremap <leader>i mzgg=G`z<CR> nnoremap <leader>i mzgg=G`z<CR>
" deedee " Deedee
nnoremap - dd<CR>p nnoremap - dd<CR>p
inoremap <c-d> <esc>ddi inoremap <c-d> <esc>ddi
@ -574,6 +609,7 @@ vnoremap <S-Tab> <gv
nnoremap <Tab> v>gv| nnoremap <Tab> v>gv|
nnoremap <S-Tab> v<gv nnoremap <S-Tab> v<gv
" Line movements
noremap <silent> <Home> g<Home> noremap <silent> <Home> g<Home>
noremap <silent> <End> g<End> noremap <silent> <End> g<End>
inoremap <silent> <Home> <C-o>g<Home> inoremap <silent> <Home> <C-o>g<Home>
@ -591,12 +627,6 @@ nnoremap <silent> N :norm! Nzz<CR>
vnoremap <silent> n :norm! nzz<CR> vnoremap <silent> n :norm! nzz<CR>
vnoremap <silent> N :norm! Nzz<CR> vnoremap <silent> N :norm! Nzz<CR>
" Tabs
nnoremap <silent> <C-,> :bnew<CR>
nnoremap <silent> <M-,> :WintabsClose<CR>
nnoremap <silent> <C-l> :WintabsNext<CR>
nnoremap <silent> <C-h> :WintabsPrevious<CR>
" Alt to switch windows " Alt to switch windows
nnoremap <M-j> <C-W><C-J> nnoremap <M-j> <C-W><C-J>
nnoremap <M-k> <C-W><C-K> nnoremap <M-k> <C-W><C-K>
@ -638,19 +668,12 @@ tnoremap <M-l> <C-\><C-n><C-w>l
:command! QA qa :command! QA qa
" }}} " }}}
" Enhanced Diff {{{
" started In Diff-Mode set diffexpr (plugin not loaded yet)
if &diff
let &diffexpr='EnhancedDiff#Diff("git diff", "--diff-algorithm=patience")'
endif
" }}}
" Stuff i'll probably use if i remember to {{{ " Stuff i'll probably use if i remember to {{{
" Don't close window, when deleting a buffer " Don't close window when deleting a buffer
command! Bclose call <SID>BufcloseCloseIt() command! Bclose call <SID>BufcloseCloseIt()
function! <SID>BufcloseCloseIt() function! <SID>BufcloseCloseIt()
let l:currentBufNum = bufnr("%") let l:currentBufNum = bufnr("%")
let l:alternateBufNum = bufnr("#") let l:alternateBufNum = bufnr("#")
if buflisted(l:alternateBufNum) if buflisted(l:alternateBufNum)
buffer # buffer #
@ -692,7 +715,7 @@ endfunction
vnoremap <Leader>sw "hy vnoremap <Leader>sw "hy
\ :let b:sub = input('global replacement: ') <Bar> \ :let b:sub = input('global replacement: ') <Bar>
\ if b:sub !=? '' <Bar> \ if b:sub !=? '' <Bar>
\ let b:rep = substitute(getreg('h'), '/', '\\/', 'g') <Bar> \ let b:rep = substitute(getreg('h'), '/', '\\/', 'g') <Bar>
\ execute '%s/'.b:rep."/".b:sub.'/g' <Bar> \ execute '%s/'.b:rep."/".b:sub.'/g' <Bar>
\ unlet b:sub b:rep <Bar> \ unlet b:sub b:rep <Bar>
\ endif <CR> \ endif <CR>

8
.config/zsh/alias.zsh
View File

@ -23,7 +23,6 @@ alias surfraw='surfraw -browser=$BROWSER' # open in gui browser
alias foxy='FoxDot & disown' alias foxy='FoxDot & disown'
alias bm='bashmount' alias bm='bashmount'
alias kat='cat' alias kat='cat'
alias cat='bat'
# MAXIMUM VERBOSITY YIELDS MAXIMUM RESULTS # MAXIMUM VERBOSITY YIELDS MAXIMUM RESULTS
alias chmod='chmod -v' alias chmod='chmod -v'
@ -39,8 +38,9 @@ alias mount='mount -v | column -t'
alias umount='umount -v' alias umount='umount -v'
# Con opciones por defecto # Con opciones por defecto
alias cat='bat --style=numbers,changes,header --color=always'
alias find='fd -H --color=always' alias find='fd -H --color=always'
alias ncdu='ncdu --color dark -rr -x --exclude .git' alias du='ncdu --color dark -rr -x --exclude .git'
alias rg='rg -p' alias rg='rg -p'
alias ytdl='youtube-dl -ic' alias ytdl='youtube-dl -ic'
alias ls='ls -F --color=always --group-directories-first' alias ls='ls -F --color=always --group-directories-first'
@ -54,7 +54,7 @@ alias dir='dir --color=always'
alias type='type -a' # See what the command you want to run points to alias type='type -a' # See what the command you want to run points to
alias df='df -hT --total' # Human readable, print filetype, and total alias df='df -hT --total' # Human readable, print filetype, and total
alias free='free -ht' # Human readable and total alias free='free -ht' # Human readable and total
alias du='du -d1 -h | sort -rh' # Human readable, max depth alias duu='du -d1 -h | sort -rh' # Human readable, max depth
alias info='info --vi-keys' # GNU info act like man command alias info='info --vi-keys' # GNU info act like man command
alias inxi='inxi -Fz' alias inxi='inxi -Fz'
alias slop='slop --highlight --tolerance=0 --color=0.3,0.4,0.6,0.4 -f '%wx%h+%x+%y'' alias slop='slop --highlight --tolerance=0 --color=0.3,0.4,0.6,0.4 -f '%wx%h+%x+%y''
@ -62,7 +62,7 @@ alias ping='ping -c 5 '
alias dd="dd status=progress" alias dd="dd status=progress"
# Comandos # Comandos
alias sudo="sudo " alias _="sudo "
alias logout="bspc quit 1" alias logout="bspc quit 1"
alias svi="sudo nvim" alias svi="sudo nvim"
alias pacmir='sudo pacman-mirrors -f5' alias pacmir='sudo pacman-mirrors -f5'

2
.xinitrc
View File

@ -32,7 +32,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
unset f unset f
fi fi
xset dpms 1200 1800 2700 & xset dpms 0 2700 3000 &
xset s noexpose & xset s noexpose &
setxkbmap -option caps:escape setxkbmap -option caps:escape

18
paketes.txt
View File

@ -17,6 +17,8 @@ command-not-found
compton compton
cpupower cpupower
crda crda
cups-pdf
cups-pk-helper
dash dash
delayed-hibernation delayed-hibernation
dhclient dhclient
@ -31,9 +33,11 @@ dunst
dunstify dunstify
ecryptfs-utils ecryptfs-utils
efibootmgr efibootmgr
ethtool
exfat-utils exfat-utils
f2fs-tools f2fs-tools
fakeroot fakeroot
fd
ffmpegthumbnailer ffmpegthumbnailer
file-roller file-roller
firefox firefox
@ -59,7 +63,7 @@ htop
hub hub
hunspell-es_any hunspell-es_any
hunspell-es_ar hunspell-es_ar
imagemagick inkscape
intel-ucode intel-ucode
iputils iputils
ipw2100-fw ipw2100-fw
@ -101,6 +105,7 @@ ntfs-3g
oblogout oblogout
odt2txt odt2txt
offlineimap offlineimap
openbsd-netcat
os-prober os-prober
p7zip p7zip
parallel parallel
@ -109,7 +114,6 @@ pavucontrol
perl-curses-ui perl-curses-ui
perl-glib-object-introspection perl-glib-object-introspection
perl-image-exiftool perl-image-exiftool
perl-lwp-protocol-https
perl-text-charwidth perl-text-charwidth
pkgconf pkgconf
pulseaudio-jack pulseaudio-jack
@ -124,6 +128,7 @@ python-pip
python-pydocstyle python-pydocstyle
python-pyperclip python-pyperclip
python-pytest-flake8 python-pytest-flake8
python-rope
python-setproctitle python-setproctitle
python-virtualenv python-virtualenv
qt5ct qt5ct
@ -139,10 +144,13 @@ s-nail
sc3-plugins sc3-plugins
seahorse seahorse
shellcheck shellcheck
smartmontools
source-highlight
spectre-meltdown-checker spectre-meltdown-checker
sublime-text sublime-text
surfraw surfraw
sxhkd sxhkd
system-config-printer
systemd-sysvcompat systemd-sysvcompat
telegram-desktop telegram-desktop
termite termite
@ -150,7 +158,9 @@ texlive-fontsextra
texlive-formatsextra texlive-formatsextra
texlive-science texlive-science
the_silver_searcher the_silver_searcher
tlp thermald
tlp-rdw
tlpui
tmux tmux
transmission-cli transmission-cli
unace unace
@ -164,6 +174,7 @@ wireless_tools
wmctrl wmctrl
wmutils wmutils
wpa_actiond wpa_actiond
x86_energy_perf_policy
xdo xdo
xdotool xdotool
xf86-input-evdev xf86-input-evdev
@ -185,6 +196,7 @@ xss-lock
yapf yapf
yay yay
youtube-dl youtube-dl
youtube-viewer
zathura-cb zathura-cb
zathura-pdf-poppler zathura-pdf-poppler
zsh-completions zsh-completions

4
paurketos.txt
View File

@ -2,7 +2,9 @@ adwaita-qt5
bashmount bashmount
batify batify
bfs bfs
canon-pixma-ip7200-printer
cherry-font cherry-font
figlet-fonts
gimp-paint-studio gimp-paint-studio
gimp-plugin-akkana-git gimp-plugin-akkana-git
gimp-plugin-create-layer-mask-from gimp-plugin-create-layer-mask-from
@ -26,11 +28,13 @@ perl-uri-find
pmount pmount
proggyfonts proggyfonts
pymdown-extensions pymdown-extensions
python-lolcat
python-proc python-proc
realtimeconfigquickscan-git realtimeconfigquickscan-git
reaper reaper
shadowfox-updater shadowfox-updater
terminus-font-ll2-td1 terminus-font-ll2-td1
toilet-fonts
transmission-remote-cli-git transmission-remote-cli-git
ttf-ibm-plex ttf-ibm-plex
ttf-sarasa-gothic ttf-sarasa-gothic