From da360d330484c5003c7ac40e4f706b93de728eee Mon Sep 17 00:00:00 2001 From: CadaverLab Date: Sat, 30 Sep 2017 01:32:17 -0300 Subject: [PATCH] delirious due to lack of sleep and continuing fever --- .config/nvim/init.original | 154 +++++++++++++++++++++++ .config/nvim/init.vim | 243 ++++++++++++++++--------------------- .config/sxhkd/sxhkdrc | 2 +- .tmux.conf | 9 +- 4 files changed, 262 insertions(+), 146 deletions(-) create mode 100644 .config/nvim/init.original diff --git a/.config/nvim/init.original b/.config/nvim/init.original new file mode 100644 index 0000000..ade2597 --- /dev/null +++ b/.config/nvim/init.original @@ -0,0 +1,154 @@ +let g:python_host_prog = '/usr/bin/python2' +let g:python3_host_prog = '/usr/bin/python3' +let g:tagbar_ctags_bin = '/usr/bin/ctags' + +filetype plugin on +syntax on +set path+=** +let g:mapleader = ' ' +set timeoutlen=100 +set scrolloff=7 +set number +set background=dark +set tgc +set acd +set nosol +set ic +set scs +set cul +set hid +set lz +set sb +set spr +set title +set titleold="Terminal" +set titlestring=%F +set sc +set ru +set vb +set slm=mouse +set udf +set ts=4 +set sw=4 +set fcl=all +set si +set showmatch +set noswapfile +set nobackup +set nowb +set ttyfast +set wildmenu +set wildignore=.svn,CVS,.git,*.o,*.a,*.class,*.mo,*.la,*.so,*.obj,*.swp,*.jpg,*.jpeg,*.png,*.xpm,*.gif +set wildmode=longest:list,full +set formatoptions+=w + +" Tweaks for browsing +let g:netrw_banner=0 " disable annoying banner +let g:netrw_browse_split=4 " open in prior window +let g:netrw_altv=1 " open splits to the right +let g:netrw_liststyle=3 " tree view +let g:netrw_list_hide=netrw_gitignore#Hide() +let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+' + +map :setlocal spell! spelllang=es_ar + +function! InsertStatuslineColor(mode) + if a:mode == 'i' + hi statusline guibg=#95b9de guifg=#171717 + elseif a:mode == 'r' + hi statusline guibg=Cyan guifg=#171717 + else + hi statusline guibg=Red guifg=#171717 + endif +endfunction + +au InsertEnter * call InsertStatuslineColor(v:insertmode) +au InsertLeave * hi statusline guibg=White guifg=#171717 + +hi statusline guibg=White guifg=#171717 + +" Formats the statusline +set statusline=\%n\ +set statusline+=%f\ +set statusline+=%H\ +set statusline+=%M\ +set statusline+=%R\ +set statusline+=%W\ +set statusline+=\ %= +set statusline+=%{&ff}\ %{''.(&fenc!=''?&fenc:enc).''}\ +set statusline+=%l:%c\ + +" What about the Q +nnoremap Q +map q + +" Auto remove all trailing whitespace on :w +autocmd BufWritePre * :%s/\s\+$//e + +" Autosave files when focus is lost +:au FocusLost * :wa + +" Automatic syntax highlighting for files +au BufRead,BufNewFile *.txt set filetype=markdown +au BufRead,BufNewFile *.conf set filetype=dosini +au BufRead,BufNewFile *.bash* set filetype=sh +au BufRead,BufNewFile todo* set filetype=todo + +"""BASIC TOOLS +"Navigating with guides +inoremap /<++>"_c4l +vnoremap /<++>"_c4l +map /<++>"_c4l +inoremap ;gui <++> +"For normal mode when in terminals (in X I have caps mapped to esc, this replaces it when I don't have X) +inoremap jw +inoremap wj +"Spell-check set to F7 +inoremap +"""END + +"""LATEX +autocmd FileType tex inoremap ;fr \begin{frame}\frametitle{}<++>\end{frame}<++>6kf}i +autocmd FileType tex inoremap ;fi \begin{fitch}\end{fitch}<++>3kA +autocmd FileType tex inoremap ;exe \begin{exe}\ex\end{exe}<++>3kA +autocmd FileType tex inoremap ;em \emph{}<++>T{i +autocmd FileType tex inoremap ;bf \textbf{}<++>T{i +autocmd FileType tex inoremap ;it \textit{}<++>T{i +autocmd FileType tex inoremap ;ct \citet{}<++>T{i +autocmd FileType tex inoremap ;p \citep{}<++>T{i +autocmd FileType tex inoremap ;glos {\gll<++>\\<++>\\\trans{``<++>''}}2k2bcw +autocmd FileType tex inoremap ;x \begin{xlist}\ex\end{xlist}kA +autocmd FileType tex inoremap ;ol \begin{enumerate}\end{enumerate}<++>3kA\item +autocmd FileType tex inoremap ;ul \begin{itemize}\end{itemize}<++>3kA\item +autocmd FileType tex inoremap ;ref \ref{}<++>T{i +autocmd FileType tex inoremap ;t \begin{tabular}<++>\end{tabular}<++>4kA{}i +autocmd FileType tex inoremap ;tab \begin{tableau}\inp{<++>}\const{<++>}<++><++>\end{tableau}<++>5kA{}i +autocmd FileType tex inoremap ;can \cand{}<++>T{i +autocmd FileType tex inoremap ;con \const{}<++>T{i +autocmd FileType tex inoremap ;v \vio{}<++>T{i +autocmd FileType tex inoremap ;a \href{}{<++>}<++>2T{i +autocmd FileType tex inoremap ;sc \textsc{}<++>T{i +autocmd FileType tex inoremap ;sec \section{}<++>2kf}i +autocmd FileType tex inoremap ;ssec \subsection{}<++>2kf}i +autocmd FileType tex inoremap ;sssec \subsubsection{}<++>2kf}i +autocmd FileType tex inoremap ;st F{i*f}i +autocmd FileType tex inoremap ;beg \begin{%DELRN%}<++>\end{%DELRN%}<++>4kfR:MultipleCursorsFind%DELRN%c +"autocmd FileType tex inoremap ;up \usepackage{}i +autocmd FileType tex inoremap ;up /usepackageo\usepackage{}i +autocmd FileType tex nnoremap ;up /usepackageo\usepackage{}i +autocmd FileType tex inoremap ;tt \texttt{}<++>T{i +autocmd FileType tex inoremap ;bt {\blindtext} +autocmd FileType tex inoremap ;nu $\varnothing$ +autocmd FileType tex inoremap ;col \begin{columns}[T]\begin{column}{.5\textwidth}\end{column}\begin{column}{.5\textwidth}<++>\end{column}\end{columns}5kA +"""END + +autocmd Filetype markdown inoremap ;b ****<++>F*hi +autocmd Filetype markdown inoremap ;s ~~~~<++>F~hi +autocmd Filetype markdown inoremap ;e **<++>F*i +autocmd Filetype markdown inoremap ;h ====<++>F=hi +autocmd Filetype markdown inoremap ;i ![](<++>)<++>F[a +autocmd Filetype markdown inoremap ;a [](<++>)<++>F[a +autocmd Filetype markdown inoremap ;1 #<++>kA +autocmd Filetype markdown inoremap ;2 ##<++>kA +autocmd Filetype markdown inoremap ;3 ###<++>kA +autocmd Filetype markdown inoremap ;l -------- diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index ade2597..21ab36f 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,154 +1,117 @@ -let g:python_host_prog = '/usr/bin/python2' -let g:python3_host_prog = '/usr/bin/python3' -let g:tagbar_ctags_bin = '/usr/bin/ctags' +" -*- mode: vimrc -*- +"vim: ft=vim -filetype plugin on -syntax on -set path+=** -let g:mapleader = ' ' -set timeoutlen=100 -set scrolloff=7 -set number -set background=dark -set tgc -set acd -set nosol -set ic -set scs -set cul -set hid -set lz -set sb -set spr -set title -set titleold="Terminal" -set titlestring=%F -set sc -set ru -set vb -set slm=mouse -set udf -set ts=4 -set sw=4 -set fcl=all -set si -set showmatch -set noswapfile -set nobackup -set nowb -set ttyfast -set wildmenu -set wildignore=.svn,CVS,.git,*.o,*.a,*.class,*.mo,*.la,*.so,*.obj,*.swp,*.jpg,*.jpeg,*.png,*.xpm,*.gif -set wildmode=longest:list,full -set formatoptions+=w +function! Layers() + " Configuration Layers declaration. + " Add layers with `Layer '+layername'` and add individual packages + " with `ExtraPlugin 'githubUser/Repo'`. -" Tweaks for browsing -let g:netrw_banner=0 " disable annoying banner -let g:netrw_browse_split=4 " open in prior window -let g:netrw_altv=1 " open splits to the right -let g:netrw_liststyle=3 " tree view -let g:netrw_list_hide=netrw_gitignore#Hide() -let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+' + Layer '+core/behavior' + Layer '+core/sensible' + Layer '+completion/deoplete' + "Layer '+completion/snippets' + Layer '+checkers/neomake' + Layer '+nav/buffers' + Layer '+nav/files' + Layer '+nav/fuzzy' + "Layer '+nav/quit' + "Layer '+nav/start-screen' + Layer '+nav/text' + "Layer '+nav/tmux' + Layer '+nav/windows' + "Layer '+specs/testing' + Layer '+tools/terminal' + Layer '+ui/airline' + "Layer '+ui/toggles' + " Language layers. + "Layer '+lang/elm' + "Layer '+lang/haskell' + "Layer '+lang/javascript' + "Layer '+lang/python' + "Layer '+lang/ruby' + "Layer '+lang/vim' -map :setlocal spell! spelllang=es_ar - -function! InsertStatuslineColor(mode) - if a:mode == 'i' - hi statusline guibg=#95b9de guifg=#171717 - elseif a:mode == 'r' - hi statusline guibg=Cyan guifg=#171717 - else - hi statusline guibg=Red guifg=#171717 - endif + " Additional plugins. + "ExtraPlugin 'lervag/vimtex' endfunction -au InsertEnter * call InsertStatuslineColor(v:insertmode) -au InsertLeave * hi statusline guibg=White guifg=#171717 +function! UserInit() + " This block is called at the very startup of Spaceneovim initialization + " before layers configuration. -hi statusline guibg=White guifg=#171717 + let g:python_host_prog = '/usr/bin/python2' + let g:python3_host_prog = '/usr/bin/python3' + let g:tagbar_ctags_bin = '/usr/bin/ctags' -" Formats the statusline -set statusline=\%n\ -set statusline+=%f\ -set statusline+=%H\ -set statusline+=%M\ -set statusline+=%R\ -set statusline+=%W\ -set statusline+=\ %= -set statusline+=%{&ff}\ %{''.(&fenc!=''?&fenc:enc).''}\ -set statusline+=%l:%c\ +endfunction -" What about the Q -nnoremap Q -map q +function! UserConfig() + " This block is called after Spaceneovim layers are configured. -" Auto remove all trailing whitespace on :w -autocmd BufWritePre * :%s/\s\+$//e + syntax on + set norelativenumber + set nostartofline + set nolist + set noexpandtab + set cursorline + set hidden + set lazyredraw + set title + set titleold="Terminal" + set titlestring=%F + set showcmd + set ruler + set visualbell + set slm=mouse + set tabstop=4 + set shiftwidth=4 + set fcl=all + set smartindent + set showmatch + set noswapfile + set ttyfast + set wildmenu + set wildignore=.svn,CVS,.git,*.o,*.a,*.class,*.mo,*.la,*.so,*.obj,*.swp,*.jpg,*.jpeg,*.png,*.xpm,*.gif + set wildmode=longest:list,full + set formatoptions+=w + + " What about the Q + nnoremap Q + map q -" Autosave files when focus is lost -:au FocusLost * :wa + " Auto remove all trailing whitespace on :w + autocmd BufWritePre * :%s/\s\+$//e -" Automatic syntax highlighting for files -au BufRead,BufNewFile *.txt set filetype=markdown -au BufRead,BufNewFile *.conf set filetype=dosini -au BufRead,BufNewFile *.bash* set filetype=sh -au BufRead,BufNewFile todo* set filetype=todo + " Autosave files when focus is lost + :au FocusLost * :wa -"""BASIC TOOLS -"Navigating with guides -inoremap /<++>"_c4l -vnoremap /<++>"_c4l -map /<++>"_c4l -inoremap ;gui <++> -"For normal mode when in terminals (in X I have caps mapped to esc, this replaces it when I don't have X) -inoremap jw -inoremap wj -"Spell-check set to F7 -inoremap -"""END + " Automatic syntax highlighting for files + au BufRead,BufNewFile *.txt set filetype=markdown + au BufRead,BufNewFile *.conf set filetype=dosini + au BufRead,BufNewFile *.bash* set filetype=sh + au BufRead,BufNewFile todo* set filetype=todo + + SetThemeWithBg 'dark', 'murmur' -"""LATEX -autocmd FileType tex inoremap ;fr \begin{frame}\frametitle{}<++>\end{frame}<++>6kf}i -autocmd FileType tex inoremap ;fi \begin{fitch}\end{fitch}<++>3kA -autocmd FileType tex inoremap ;exe \begin{exe}\ex\end{exe}<++>3kA -autocmd FileType tex inoremap ;em \emph{}<++>T{i -autocmd FileType tex inoremap ;bf \textbf{}<++>T{i -autocmd FileType tex inoremap ;it \textit{}<++>T{i -autocmd FileType tex inoremap ;ct \citet{}<++>T{i -autocmd FileType tex inoremap ;p \citep{}<++>T{i -autocmd FileType tex inoremap ;glos {\gll<++>\\<++>\\\trans{``<++>''}}2k2bcw -autocmd FileType tex inoremap ;x \begin{xlist}\ex\end{xlist}kA -autocmd FileType tex inoremap ;ol \begin{enumerate}\end{enumerate}<++>3kA\item -autocmd FileType tex inoremap ;ul \begin{itemize}\end{itemize}<++>3kA\item -autocmd FileType tex inoremap ;ref \ref{}<++>T{i -autocmd FileType tex inoremap ;t \begin{tabular}<++>\end{tabular}<++>4kA{}i -autocmd FileType tex inoremap ;tab \begin{tableau}\inp{<++>}\const{<++>}<++><++>\end{tableau}<++>5kA{}i -autocmd FileType tex inoremap ;can \cand{}<++>T{i -autocmd FileType tex inoremap ;con \const{}<++>T{i -autocmd FileType tex inoremap ;v \vio{}<++>T{i -autocmd FileType tex inoremap ;a \href{}{<++>}<++>2T{i -autocmd FileType tex inoremap ;sc \textsc{}<++>T{i -autocmd FileType tex inoremap ;sec \section{}<++>2kf}i -autocmd FileType tex inoremap ;ssec \subsection{}<++>2kf}i -autocmd FileType tex inoremap ;sssec \subsubsection{}<++>2kf}i -autocmd FileType tex inoremap ;st F{i*f}i -autocmd FileType tex inoremap ;beg \begin{%DELRN%}<++>\end{%DELRN%}<++>4kfR:MultipleCursorsFind%DELRN%c -"autocmd FileType tex inoremap ;up \usepackage{}i -autocmd FileType tex inoremap ;up /usepackageo\usepackage{}i -autocmd FileType tex nnoremap ;up /usepackageo\usepackage{}i -autocmd FileType tex inoremap ;tt \texttt{}<++>T{i -autocmd FileType tex inoremap ;bt {\blindtext} -autocmd FileType tex inoremap ;nu $\varnothing$ -autocmd FileType tex inoremap ;col \begin{columns}[T]\begin{column}{.5\textwidth}\end{column}\begin{column}{.5\textwidth}<++>\end{column}\end{columns}5kA -"""END + let g:airline#extensions#tabline#enabled = 1 -autocmd Filetype markdown inoremap ;b ****<++>F*hi -autocmd Filetype markdown inoremap ;s ~~~~<++>F~hi -autocmd Filetype markdown inoremap ;e **<++>F*i -autocmd Filetype markdown inoremap ;h ====<++>F=hi -autocmd Filetype markdown inoremap ;i ![](<++>)<++>F[a -autocmd Filetype markdown inoremap ;a [](<++>)<++>F[a -autocmd Filetype markdown inoremap ;1 #<++>kA -autocmd Filetype markdown inoremap ;2 ##<++>kA -autocmd Filetype markdown inoremap ;3 ###<++>kA -autocmd Filetype markdown inoremap ;l -------- + autocmd StdinReadPre * let s:std_in=1 + autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif + let NERDTreeNaturalSort = 1 + let NERDTreeShowHidden=1 + let NERDTreeWinPos = "right" + let NERDTreeRespectWildIgnore = 1 + let NERDTreeMinimalUI=1 + let NERDTreeCascadeSingleChildDir=1 + let NERDTreeCascadeOpenSingleChildDir=1 + + let g:polyglot_disabled = ['latex'] + +endfunction + +" Do NOT remove these calls! +call spaceneovim#init() +call Layers() +call UserInit() +call spaceneovim#bootstrap() +call UserConfig() diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 617b633..3cbf416 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -148,7 +148,7 @@ super + b # qutebrowser super + shift + b - qutebrowser + qutebrowser --backend webengine # volume super + v diff --git a/.tmux.conf b/.tmux.conf index b8c982f..b683c0a 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1,13 +1,12 @@ # Set the default TERM set -g default-terminal tmux-256color -#set -g default-terminal screen-256color - # Update the TERM variable of terminal emulator when creating a new session or attaching a existing session set -g update-environment 'DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY TERM' # Truecolor #set -ga terminal-overrides ",xterm-termite:Tc" +set -ga terminal-overrides ',xterm-256color:Tc' # Set Zsh as default Tmux shell set-option -g default-shell /bin/zsh @@ -57,12 +56,12 @@ unbind space bind X select-layout even-vertical # Mouse support -#setw -g mouse on +setw -g mouse on setw -g mode-keys vi # Copy/paste. Selecting any text with mouse automatically copies it to the clipboard -#bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xsel -i -p -b" +bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xsel -i -p -b" bind-key p run "xsel -o | tmux load-buffer - ; tmux paste-buffer" bind -n C-S-v run "xsel -o | tmux load-buffer - ; tmux paste-buffer" bind-key C-S-v run "xsel -o | tmux load-buffer - ; tmux paste-buffer" @@ -144,4 +143,4 @@ bind r source-file ~/.tmux.conf \; display-message ' reloaded ' # Better mouse support set -g @prevent-scroll-for-fullscreen-alternate-buffer 'on' set -g @scroll-speed-num-lines-per-scroll '3' -run-shell /usr/share/tmux/tmux-better-mouse-mode/scroll_copy_mode.tmux \ No newline at end of file +run-shell /usr/share/tmux/tmux-better-mouse-mode/scroll_copy_mode.tmux