From b09dabd179fae6bea7cc7b3b0a86345d19552b45 Mon Sep 17 00:00:00 2001 From: deadguy Date: Fri, 31 Aug 2018 01:12:16 -0300 Subject: [PATCH] afinando todavia mas nvim. aguante la educacion publica --- .config/mutt/muttrc | 6 +- .config/nvim/ftplugin/markdown.vim | 29 +- .config/nvim/ftplugin/python.vim | 6 +- .config/nvim/ftplugin/sh.vim | 4 +- .config/nvim/init.vim | 449 +++++++++++++++-------------- .config/zsh/alias.zsh | 8 +- .xinitrc | 2 +- paketes.txt | 18 +- paurketos.txt | 4 + 9 files changed, 298 insertions(+), 228 deletions(-) diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc index 5202af2..1cb4f60 100644 --- a/.config/mutt/muttrc +++ b/.config/mutt/muttrc @@ -37,10 +37,10 @@ set uncollapse_jump # no collapse on unread message set sort_re # thread based on regex set reply_regexp = "^(([Rr][Ee]?(\[[0-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 index_format ="%2C %Z %?X?A& ? %D %-45.45F %s (%-4.4c)" -set index_format="%4C %Z %{%b %d %R} %-15.15L (%?l?%4l&%4c?) %s" +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 alias_format = " %4n %t %-20a %r " # Header Options ------------------------------------- diff --git a/.config/nvim/ftplugin/markdown.vim b/.config/nvim/ftplugin/markdown.vim index 93cbe7c..2771c4b 100644 --- a/.config/nvim/ftplugin/markdown.vim +++ b/.config/nvim/ftplugin/markdown.vim @@ -3,4 +3,31 @@ setl sts=2 setl sw=2 setl et setl tw=80 -setlocal colorcolumn=79 \ No newline at end of file +setlocal colorcolumn=79 + +function! Prose() + call pencil#init() + " manual reformatting shortcuts + nnoremap Q gqap + xnoremap Q gq + nnoremap Q vapJgqap + + " force top correction on most recent misspelling + nnoremap [s1z= + inoremap u[s1z=`]Au + + " replace common punctuation + iabbrev -- – + iabbrev --- — + iabbrev << « + iabbrev >> » +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 \ No newline at end of file diff --git a/.config/nvim/ftplugin/python.vim b/.config/nvim/ftplugin/python.vim index 632b50c..b4f803a 100644 --- a/.config/nvim/ftplugin/python.vim +++ b/.config/nvim/ftplugin/python.vim @@ -11,17 +11,19 @@ setlocal formatoptions+=croq setlocal omnifunc=pythoncomplete#Complete setlocal cinwords=if,elif,else,for,while,try,except,finally,def,class,with -let g:LanguageClient_autoStart = 1 - augroup pystuff autocmd! autocmd BufEnter call ncm2#enable_for_buffer() autocmd BufNewFile *.py 0r ~/.config/nvim/templates/py.skeleton + autocmd InsertEnter *.py Semshi pause + autocmd InsertLeave *.py Semshi enable augroup END nnoremap y :0,$!yapf nnoremap c I# +let g:LanguageClient_autoStart = 1 + let g:ale_sign_column_always = 1 let g:ale_set_loclist = 0 let g:ale_set_quickfix = 1 diff --git a/.config/nvim/ftplugin/sh.vim b/.config/nvim/ftplugin/sh.vim index 433e4cb..550d165 100644 --- a/.config/nvim/ftplugin/sh.vim +++ b/.config/nvim/ftplugin/sh.vim @@ -8,4 +8,6 @@ if !exists("b:sh_indent_options") let b:sh_indent_options = {} endif -let b:sh_indent_options['continuation-line'] = 4 \ No newline at end of file +let b:sh_indent_options['continuation-line'] = 4 + +let b:ale_linters = ['shellcheck'] \ No newline at end of file diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index eb19580..1b763b0 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -9,62 +9,71 @@ let python_highlight_all=1 " Plug updates itself automatically if empty(glob('~/.config/nvim/autoload/plug.vim')) - silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs - \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - autocmd VimEnter * PlugInstall --sync | source $MYVIMRC + silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs + \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + autocmd VimEnter * PlugInstall --sync | source $MYVIMRC endif 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') - set grepprg=ag\ --nogroup\ --nocolor + set grepprg=ag\ --nogroup\ --nocolor endif " }}} " Plugins {{{ call plug#begin('~/.config/nvim/plugged') Plug 'junegunn/vim-plug' -Plug 'w0rp/ale' -Plug 'sbdchd/neoformat' +" Languages Plug 'lervag/vimtex', { 'for': 'tex' } 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 'christoomey/vim-tmux-navigator' Plug '/usr/bin/fzf' Plug 'junegunn/fzf.vim' +" Modes 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 'zefei/vim-wintabs' Plug 'jiangmiao/auto-pairs' -Plug 'chrisbra/vim-diff-enhanced' +" Python Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'} Plug 'hkupty/iron.nvim', { 'do': ':UpdateRemotePlugins' } -Plug 'roxma/nvim-yarp' -Plug 'ncm2/ncm2' -Plug 'ncm2/ncm2-jedi' -Plug 'ncm2/ncm2-match-highlight' +Plug 'zchee/deoplete-jedi' Plug 'autozimu/LanguageClient-neovim', { - \ 'branch': 'next', + \ 'branch': 'next', \ 'do': 'bash install.sh', \ } call plug#end() let g:plug_window = 'rightbelow topleft new' + +nnoremap pi :PlugInstall +nnoremap pu :PlugUpdate +nnoremap pU :PlugUpgrade +nnoremap pc :PlugClean " }}} " Options {{{ -" Search down int subfolders +" Search down into subfolders " Provides tab-completion for all file-related tasks " - :b lets you autocomplete any open buffer set path+=** - set binary set clipboard^=unnamedplus " system clipboard (requires +clipboard) set encoding=utf-8 " The encoding displayed. set fileencoding=utf-8 " The encoding written to file. -let mapleader="\" -let localleader="," set shell=/bin/zsh " Setting shell to zsh set number " Line numbers on set showmode " Always show mode @@ -104,8 +113,9 @@ set foldenable " Fold by default set foldlevelstart=10 set foldnestmax=10 " Deepest fold is 10 levels set foldmethod=marker " Markers are used to specify folds. -set completeopt=noinsert,menuone,noselect -set completeopt-=preview " Don't show preview scratch buffers +set completeopt=noinsert,menuone,preview,noselect +"set completefunc=LanguageClient#complete +set formatexpr=LanguageClient#textDocument_rangeFormatting_sync() set noexpandtab " Do not turn tabs into spaces set tabstop=4 " Number of spaces a equals set softtabstop=4 @@ -131,8 +141,7 @@ set complete+=] set completeopt-=preview set completeopt+=noinsert,longest,noselect,menuone set formatoptions+=n -let formatlistpat='^\s*\(\d\+[\]:.)}\t ]\|[*-][\t ]\)\s*' -set matchpairs=(:),{:},[:],<:> +"set matchpairs=(:),{:},[:],<:> " Display all matching files when we tab complete set wildmenu @@ -161,31 +170,9 @@ set wildmode=longest:list,full match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' -" use ripgrep as grepprg -if executable('rg') - set grepprg=rg\ --vimgrep\ --hidden\ --no-ignore-vcs - 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 +let mapleader="\" +let localleader="," +let formatlistpat='^\s*\(\d\+[\]:.)}\t ]\|[*-][\t ]\)\s*' " }}} " Statusline {{{ @@ -220,7 +207,7 @@ function! LinterStatus() abort \) endfunction -set statusline+=%#SpecialKey# +set statusline+=%#Keyword# set statusline+=%{StatuslineGit()} set statusline+=%#CursorLineNr# set statusline+=\ %{LinterStatus()} @@ -238,12 +225,13 @@ set statusline+=\ %{winnr()} if !exists("autocommands_loaded") && has("autocmd") let autocommands_loaded = 1 - autocmd BufWritePre * :%s/\s\+$//e " Auto remove all trailing whitespace on :w - ":au FocusLost * :wa " Autosave files when focus is lost + " Auto remove all trailing whitespace on :w + autocmd BufWritePre * :%s/\s\+$//e " Disables automatic commenting on newline autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o + " Python file template autocmd BufNewFile *.py 0r ~/.config/nvim/templates/py.skeleton aug terminal_stuff @@ -255,7 +243,7 @@ if !exists("autocommands_loaded") && has("autocmd") aug END autocmd FileType fzf set noshowmode noruler - \| autocmd BufLeave set showmode ruler + \| autocmd BufLeave set showmode ruler " Automatic syntax highlighting for files aug set_file_types @@ -297,76 +285,6 @@ let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+' 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 ir :IronRepl - -let g:iron_repl_open_cmd = 'vsplit' -let g:iron_map_defaults = 0 - -nmap + (iron-send-motion) -vmap + (iron-send-motion) -nmap rr (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 {{{ function! ranger() let l:temp = tempname() @@ -392,6 +310,67 @@ function! ranger() redraw! endfunction + +nnoremap R :call ranger() +" }}} + +" {{{ 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 (ale_previous_wrap) +nmap (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 :NERDTreeToggle +nnoremap :NERDTreeFind " }}} " Tmux navigator {{{ @@ -404,97 +383,152 @@ nnoremap M-Right :TmuxNavigateRight nnoremap M-Tab :TmuxNavigatePrevious " }}} +" 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(), 1, + \ 0 ? fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'up:60%') + \ : fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'right:50%:hidden', '?'), + \ 0) + +command! -bang -nargs=? -complete=dir Files + \ call fzf#vim#files(, fzf#vim#with_preview(), 0) + +" only use FZF shortcuts in non diff-mode +if !&diff + nnoremap :Files + nnoremap :Rg + nnoremap :History + nnoremap :Buffers +endif +" }}} + " Goyo {{{ function! s:goyo_enter() - let b:quitting = 0 - let b:quitting_bang = 0 - autocmd QuitPre let b:quitting = 1 - cabbrev q! let b:quitting_bang = 1 q! + let b:quitting = 0 + let b:quitting_bang = 0 + autocmd QuitPre let b:quitting = 1 + cabbrev q! let b:quitting_bang = 1 q! endfunction function! s:goyo_leave() - " Quit Vim if this is the only remaining buffer - if b:quitting && len(filter(range(1, bufnr('$')), 'buflisted(v:val)')) == 1 - if b:quitting_bang - qa! - else - qa - endif - endif + " Quit Vim if this is the only remaining buffer + if b:quitting && len(filter(range(1, bufnr('$')), 'buflisted(v:val)')) == 1 + if b:quitting_bang + qa! + else + qa + endif + endif endfunction autocmd! User GoyoEnter call goyo_enter() autocmd! User GoyoLeave call goyo_leave() " }}} -" 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(), 1, - \ 0 ? fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'up:60%') - \ : fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'right:50%:hidden', '?'), - \ 0) - -command! -bang -nargs=? -complete=dir Files - \ call fzf#vim#files(, fzf#vim#with_preview(), 0) - -" only use FZF shortcuts in non diff-mode -if !&diff - nnoremap :Files - nnoremap :Rg +" Enhanced Diff {{{ +" started In Diff-Mode set diffexpr (plugin not loaded yet) +if &diff + let &diffexpr='EnhancedDiff#Diff("git diff", "--diff-algorithm=patience")' endif " }}} -"Mappings {{{ -" Open ranger as a file chooser -nnoremap R :call ranger() +" Papercolor {{{ +set background=dark +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 :bnew +nnoremap :WintabsClose +nnoremap :WintabsNext +nnoremap :WintabsPrevious +" }}} + +" Semshi {{{ +let g:semshi#mark_selected_nodes = 2 +let g:semshi#error_sign = v:false +" }}} + +" Iron {{{ +nnoremap ir :IronRepl + +let g:iron_repl_open_cmd = '10split' +let g:iron_map_defaults = 0 + +nmap + (iron-send-motion) +vmap + (iron-send-motion) +nmap rr (iron-repeat-cmd) +" }}} + +" LSP {{{ +let g:LanguageClient_serverCommands = { + \ 'python': ['/usr/bin/pyls'], + \ 'cpp': ['clangd'], + \ 'bash': ['/usr/bin/shellcheck'], + \ } -nnoremap :NERDTreeToggle -nnoremap :NERDTreeFind nnoremap :call LanguageClient_contextMenu() -map :setlocal spell! spelllang=es -map :setlocal spell! spelllang=en -map :set nospell -map :!w:!pdflatex % +" }}} -nmap (ale_previous_wrap) -nmap (ale_next_wrap) +"Mappings {{{ +" Spell checking +nnoremap :setlocal spell! spelllang=es +nnoremap :setlocal spell! spelllang=en +nnoremap :set nospell +nnoremap :!w:!pdflatex % +" Neoformat nnoremap f :Neoformat vnoremap f :Neoformat -nnoremap pi :PlugInstall -nnoremap pu :PlugUpdate -nnoremap pU :PlugUpgrade -nnoremap pc :PlugClean - -" fzf & rg -nnoremap :Files -nnoremap :Rg -nnoremap :History -nnoremap :Buffers - -" super quick search and replace +" Super quick search and replace nnoremap ' :'{,'}s/\<=expand("")\>/ nnoremap ¿ :%s/\<=expand("")\>/ @@ -510,23 +544,24 @@ nnoremap :resize +1 inoremap jk cnoremap jk -" edit and source config file +" Edit and source config file nnoremap ev :vsplit $MYVIMRC nnoremap sv :source $MYVIMRC -" fast saves +" Fast saves nnoremap w :w! -" exit quickly +" Exit quickly nnoremap q :q! +" Splits nnoremap T :terminal nnoremap s :split nnoremap v :vsplit nnoremap nv :vnew nnoremap ns :new -" 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 inoremap u inoremap u @@ -537,7 +572,7 @@ nnoremap i " Fix indentation nnoremap i mzgg=G`z -" deedee +" Deedee nnoremap - ddp inoremap ddi @@ -574,6 +609,7 @@ vnoremap v>gv| nnoremap v g noremap g inoremap g @@ -591,12 +627,6 @@ nnoremap N :norm! Nzz vnoremap n :norm! nzz vnoremap N :norm! Nzz -" Tabs -nnoremap :bnew -nnoremap :WintabsClose -nnoremap :WintabsNext -nnoremap :WintabsPrevious - " Alt to switch windows nnoremap nnoremap @@ -638,19 +668,12 @@ tnoremap l :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 {{{ -" Don't close window, when deleting a buffer +" Don't close window when deleting a buffer command! Bclose call BufcloseCloseIt() function! BufcloseCloseIt() - let l:currentBufNum = bufnr("%") - let l:alternateBufNum = bufnr("#") + let l:currentBufNum = bufnr("%") + let l:alternateBufNum = bufnr("#") if buflisted(l:alternateBufNum) buffer # @@ -692,7 +715,7 @@ endfunction vnoremap sw "hy \ :let b:sub = input('global replacement: ') \ if b:sub !=? '' - \ let b:rep = substitute(getreg('h'), '/', '\\/', 'g') + \ let b:rep = substitute(getreg('h'), '/', '\\/', 'g') \ execute '%s/'.b:rep."/".b:sub.'/g' \ unlet b:sub b:rep \ endif diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh index d365f9b..d407608 100644 --- a/.config/zsh/alias.zsh +++ b/.config/zsh/alias.zsh @@ -23,7 +23,6 @@ alias surfraw='surfraw -browser=$BROWSER' # open in gui browser alias foxy='FoxDot & disown' alias bm='bashmount' alias kat='cat' -alias cat='bat' # MAXIMUM VERBOSITY YIELDS MAXIMUM RESULTS alias chmod='chmod -v' @@ -39,8 +38,9 @@ alias mount='mount -v | column -t' alias umount='umount -v' # Con opciones por defecto +alias cat='bat --style=numbers,changes,header --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 ytdl='youtube-dl -ic' 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 df='df -hT --total' # Human readable, print filetype, 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 inxi='inxi -Fz' 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" # Comandos -alias sudo="sudo " +alias _="sudo " alias logout="bspc quit 1" alias svi="sudo nvim" alias pacmir='sudo pacman-mirrors -f5' diff --git a/.xinitrc b/.xinitrc index 86c9f2d..540a0a1 100644 --- a/.xinitrc +++ b/.xinitrc @@ -32,7 +32,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi -xset dpms 1200 1800 2700 & +xset dpms 0 2700 3000 & xset s noexpose & setxkbmap -option caps:escape diff --git a/paketes.txt b/paketes.txt index 3476a8f..be650de 100644 --- a/paketes.txt +++ b/paketes.txt @@ -17,6 +17,8 @@ command-not-found compton cpupower crda +cups-pdf +cups-pk-helper dash delayed-hibernation dhclient @@ -31,9 +33,11 @@ dunst dunstify ecryptfs-utils efibootmgr +ethtool exfat-utils f2fs-tools fakeroot +fd ffmpegthumbnailer file-roller firefox @@ -59,7 +63,7 @@ htop hub hunspell-es_any hunspell-es_ar -imagemagick +inkscape intel-ucode iputils ipw2100-fw @@ -101,6 +105,7 @@ ntfs-3g oblogout odt2txt offlineimap +openbsd-netcat os-prober p7zip parallel @@ -109,7 +114,6 @@ pavucontrol perl-curses-ui perl-glib-object-introspection perl-image-exiftool -perl-lwp-protocol-https perl-text-charwidth pkgconf pulseaudio-jack @@ -124,6 +128,7 @@ python-pip python-pydocstyle python-pyperclip python-pytest-flake8 +python-rope python-setproctitle python-virtualenv qt5ct @@ -139,10 +144,13 @@ s-nail sc3-plugins seahorse shellcheck +smartmontools +source-highlight spectre-meltdown-checker sublime-text surfraw sxhkd +system-config-printer systemd-sysvcompat telegram-desktop termite @@ -150,7 +158,9 @@ texlive-fontsextra texlive-formatsextra texlive-science the_silver_searcher -tlp +thermald +tlp-rdw +tlpui tmux transmission-cli unace @@ -164,6 +174,7 @@ wireless_tools wmctrl wmutils wpa_actiond +x86_energy_perf_policy xdo xdotool xf86-input-evdev @@ -185,6 +196,7 @@ xss-lock yapf yay youtube-dl +youtube-viewer zathura-cb zathura-pdf-poppler zsh-completions diff --git a/paurketos.txt b/paurketos.txt index 18e1776..e26b91a 100644 --- a/paurketos.txt +++ b/paurketos.txt @@ -2,7 +2,9 @@ adwaita-qt5 bashmount batify bfs +canon-pixma-ip7200-printer cherry-font +figlet-fonts gimp-paint-studio gimp-plugin-akkana-git gimp-plugin-create-layer-mask-from @@ -26,11 +28,13 @@ perl-uri-find pmount proggyfonts pymdown-extensions +python-lolcat python-proc realtimeconfigquickscan-git reaper shadowfox-updater terminus-font-ll2-td1 +toilet-fonts transmission-remote-cli-git ttf-ibm-plex ttf-sarasa-gothic