From f7e1128a71c862ab3b5eb6bc0ad5996c1df44fa6 Mon Sep 17 00:00:00 2001 From: InigoGutierrez Date: Thu, 22 Jun 2023 17:40:44 +0200 Subject: jue 22 jun 2023 17:40:44 CEST --- stow/sxiv/repos/sxiv/config.h | 4 ++-- stow/vim/.vim/autoload/plug.vim | 2 +- stow/vim/.vim/autoload/plug.vim.old | 28 +++++++++++++++++++--------- stow/vim/.vim/ftplugin/sh/sh.vim | 4 ++-- stow/vim/.vim/ftplugin/tex/tex.vim | 9 ++++----- stow/vim/.vim/rc/maps.vim | 2 +- stow/vim/.vimrc | 1 + 7 files changed, 30 insertions(+), 20 deletions(-) diff --git a/stow/sxiv/repos/sxiv/config.h b/stow/sxiv/repos/sxiv/config.h index 10049ea..f8e6233 100644 --- a/stow/sxiv/repos/sxiv/config.h +++ b/stow/sxiv/repos/sxiv/config.h @@ -55,10 +55,10 @@ static const bool ALPHA_LAYER = false; #ifdef _THUMBS_CONFIG /* thumbnail sizes in pixels (width == height): */ -static const int thumb_sizes[] = { 32, 64, 96, 128, 160, 200, 260, 400, 450 }; +static const int thumb_sizes[] = { 32, 64, 96, 128, 160, 200, 260, 340, 400, 450 }; /* thumbnail size at startup, index into thumb_sizes[]: */ -static const int THUMB_SIZE = 3; +static const int THUMB_SIZE = 7; #endif #ifdef _MAPPINGS_CONFIG diff --git a/stow/vim/.vim/autoload/plug.vim b/stow/vim/.vim/autoload/plug.vim index 652caa8..9c3011f 100644 --- a/stow/vim/.vim/autoload/plug.vim +++ b/stow/vim/.vim/autoload/plug.vim @@ -22,7 +22,7 @@ " Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' " " " On-demand loading -" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } +" Plug 'preservim/nerdtree', { 'on': 'NERDTreeToggle' } " Plug 'tpope/vim-fireplace', { 'for': 'clojure' } " " " Using a non-default branch diff --git a/stow/vim/.vim/autoload/plug.vim.old b/stow/vim/.vim/autoload/plug.vim.old index ad95041..652caa8 100644 --- a/stow/vim/.vim/autoload/plug.vim.old +++ b/stow/vim/.vim/autoload/plug.vim.old @@ -242,6 +242,8 @@ function! plug#begin(...) let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) elseif exists('g:plug_home') let home = s:path(g:plug_home) + elseif has('nvim') + let home = stdpath('data') . '/plugged' elseif !empty(&rtp) let home = s:path(split(&rtp, ',')[0]) . '/plugged' else @@ -350,7 +352,7 @@ function! plug#end() endif let lod = { 'ft': {}, 'map': {}, 'cmd': {} } - if exists('g:did_load_filetypes') + if get(g:, 'did_load_filetypes', 0) filetype off endif for name in g:plugs_order @@ -2619,26 +2621,34 @@ function! s:preview_commit() let sha = matchstr(getline('.'), '^ \X*\zs[0-9a-f]\{7,9}') if empty(sha) - return + let name = matchstr(getline('.'), '^- \zs[^:]*\ze:$') + if empty(name) + return + endif + let title = 'HEAD@{1}..' + let command = 'git diff --no-color HEAD@{1}' + else + let title = sha + let command = 'git show --no-color --pretty=medium '.sha + let name = s:find_name(line('.')) endif - let name = s:find_name(line('.')) if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) return endif if exists('g:plug_pwindow') && !s:is_preview_window_open() execute g:plug_pwindow - execute 'e' sha + execute 'e' title else - execute 'pedit' sha + execute 'pedit' title wincmd P endif - setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable + setlocal previewwindow filetype=git buftype=nofile bufhidden=wipe nobuflisted modifiable let batchfile = '' try let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha + let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && '.command if s:is_win let [batchfile, cmd] = s:batchfile(cmd) endif @@ -2764,9 +2774,9 @@ function! s:snapshot(force, ...) abort 1 let anchor = line('$') - 3 let names = sort(keys(filter(copy(g:plugs), - \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)'))) + \'has_key(v:val, "uri") && isdirectory(v:val.dir)'))) for name in reverse(names) - let sha = s:git_revision(g:plugs[name].dir) + let sha = has_key(g:plugs[name], 'commit') ? g:plugs[name].commit : s:git_revision(g:plugs[name].dir) if !empty(sha) call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) redraw diff --git a/stow/vim/.vim/ftplugin/sh/sh.vim b/stow/vim/.vim/ftplugin/sh/sh.vim index f716617..11ecb48 100644 --- a/stow/vim/.vim/ftplugin/sh/sh.vim +++ b/stow/vim/.vim/ftplugin/sh/sh.vim @@ -12,8 +12,8 @@ let mapleader = " " nnoremap C :sp ~/.vim/ftplugin/sh/sh.vim nnoremap +x :!chmod 744 % -nnoremap x :w:!./% -nnoremap X :w:!./% +nnoremap x :w:!./% +nnoremap X :w:!./% let mapleader = "," diff --git a/stow/vim/.vim/ftplugin/tex/tex.vim b/stow/vim/.vim/ftplugin/tex/tex.vim index 0893e40..3558c39 100644 --- a/stow/vim/.vim/ftplugin/tex/tex.vim +++ b/stow/vim/.vim/ftplugin/tex/tex.vim @@ -21,8 +21,7 @@ nnoremap gd :lua vim.lsp.buf.definition() nnoremap c :w:!toPDF.sh % nnoremap o :w:!toPDF.sh -o % nnoremap O :w:!toPDF.sh -o % -nnoremap m :w:!make -nnoremap M :w:!make +nnoremap m :w:Make nnoremap temp :-1r ~/.vim/ftplugin/tex/snips/template.txt/<+++>cf> @@ -43,8 +42,8 @@ inoremap li \textit{}<++>F}i inoremap lemph \emph{}<++>F}i inoremap llabel \label{}<++>F}i inoremap lref ~\ref{}<++>F}i -inoremap lenumerate \begin{enumerate}o\end{enumerate}kkI\itemI<++>k<$a -inoremap litemize \begin{itemize}o\end{itemize}kkI\itemI<++>k<$a -inoremap litem \item<++>k$a +inoremap lenumerate \begin{enumerate}o\end{enumerate}kkI\itemI<++>kA +inoremap litemize \begin{itemize}o\end{itemize}kkI\itemI<++>kA +inoremap litem \item<++>kA inoremap limage \begin{figure}[h]\begin{center}\includegraphics[width=\textwidth]{}\caption{<++>}\end{center}\end{figure}<++>4k$i inoremap ltable \begin{table}[h]\makebox[\linewidth]{\begin{tabular}{ccxxx}\toprule<++>&<++>\\\midrule<++>&<++>\\\bottomrule\end{tabular}}\end{table}<++>?xxxcw diff --git a/stow/vim/.vim/rc/maps.vim b/stow/vim/.vim/rc/maps.vim index 2163f0d..3d3b80a 100644 --- a/stow/vim/.vim/rc/maps.vim +++ b/stow/vim/.vim/rc/maps.vim @@ -3,7 +3,7 @@ nnoremap Y y$ nnoremap x :w:! ./% inoremap w :w -inoremap /<++>cf> +inoremap /<++>"_cf> " Showing tabs and trailing spaces nnoremap l :set list! diff --git a/stow/vim/.vimrc b/stow/vim/.vimrc index 9ef44be..1320512 100644 --- a/stow/vim/.vimrc +++ b/stow/vim/.vimrc @@ -19,6 +19,7 @@ Plug 'dylanaraps/wal.vim' Plug 'arcticicestudio/nord-vim' Plug 'tpope/vim-surround' Plug 'tpope/vim-repeat' +Plug 'tpope/vim-dispatch' "Plug 'psliwka/vim-smoothie' Plug 'neovim/nvim-lspconfig' source ~/.vim/rc/goyo.vim -- cgit v1.2.1