usr

Modulate your userpace into POSIX-compliant shell scripts!
git clone git://clone.theohenson.com/usr.git
Log | Files | Refs | README

commit 8d76fac5e65e38044ebe4595e5e71fc2a0ae57fb
parent 5482f37eefc94d44d13db0e23aefb54693fbd093
Author: Theo Henson <[email protected]>
Date:   Tue, 22 Dec 2020 14:27:05 -0500

Improve tmux, vim, fish integration

Diffstat:
Mhome/.config/fish/config.fish | 2+-
Mhome/.config/nvim/init.vim | 24+++++++++++++++++-------
Mhome/.config/tmux/tmux.conf | 15+++++++++++++--
3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/home/.config/fish/config.fish b/home/.config/fish/config.fish @@ -110,4 +110,4 @@ function sw end # tmux -[ "$TMUX" = "" ] && exec tmux +[ "$TMUX" = "" ] && [ "$TERM" != "linux" ] && exec tmux diff --git a/home/.config/nvim/init.vim b/home/.config/nvim/init.vim @@ -11,15 +11,20 @@ endif call plug#begin('~/.vim/plugged') -" Editing functionality -Plug 'tmsvg/pear-tree' -Plug 'tpope/vim-commentary' +" tpope is actually a god +Plug 'tpope/vim-vinegar' +Plug 'tpope/vim-fugitive' Plug 'tpope/vim-surround' +Plug 'tpope/vim-commentary' + +" Make the computer code for you +Plug 'tmsvg/pear-tree' Plug 'neoclide/coc.nvim', {'branch': 'release'} -Plug 'tpope/vim-fugitive' -" Appearance +" Git Plug 'airblade/vim-gitgutter' + +" Appearance Plug 'morhetz/gruvbox' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' @@ -78,12 +83,14 @@ noremap <A-t> :tabnew<CR> noremap <A-c> :tabclose<CR> " }}}2 -" Easier search/replace navigation {{{2 +" Easier in-file navigation {{{2 set nohlsearch set ignorecase nnoremap n nzz nnoremap N Nzz nnoremap S :%s//g<Left><Left> +nnoremap <C-o> <C-o>zz +nnoremap <C-i> <C-i>zz " }}}2 " Make tags command {{{2 @@ -119,7 +126,7 @@ set signcolumn=yes " }}}2 " Vim wiki {{{2 -let g:vimwiki_list = [{'path': '~/docs/vimwiki'}] +let g:vimwiki_list = [{'path': '~/docs/vimwiki', 'syntax': 'markdown', 'ext': '.md'}] " }}}2 " Status line {{{2 @@ -137,6 +144,9 @@ let g:airline_extensions = ['tabline', 'branch', 'hunks'] syntax on let g:gruvbox_italic = 1 colorscheme gruvbox +if (has("termguicolors")) + set termguicolors +endif " }}}2 " }}} diff --git a/home/.config/tmux/tmux.conf b/home/.config/tmux/tmux.conf @@ -1,7 +1,18 @@ +set -g base-index 1 +set -g pane-base-index 1 + set -g default-terminal "screen-256color" +set -g pane-border-style fg='#ebdbb2' +set -g pane-active-border-style fg='#83a598' set -g status-bg black set -g status-fg white -set -g status-keys vi +set -g status-interval 1 + set -g default-shell /usr/bin/fish +set -g set-titles on +set -g set-titles-string "#I:#W" + set -s escape-time 0 -set -g prefix C-e +set -g status-keys vi +unbind C-z +set -g prefix C-z