usr

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

commit e91388b2e2e2f1d947cdd0638a10aed56f466623
parent 890693bf87e0e8737964c67d264871db2c182d29
Author: Theo Henson <[email protected]>
Date:   Tue, 15 Dec 2020 09:49:23 -0500

Update nvim and fish, fix suk module

Diffstat:
Mhome/.config/fish/config.fish | 44++++++++++++++++++++++++++++++++++++++------
Mhome/.config/nvim/init.vim | 9+++++----
Mmodules/theo_suk_arch.mod.sh | 3+--
3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/home/.config/fish/config.fish b/home/.config/fish/config.fish @@ -2,24 +2,34 @@ abbr -ag g git abbr -ag v nvim abbr -ag r ranger +abbr -ag z zathura +abbr -ag n nnn -de +abbr -ag nb newsboat -r + abbr -ag cp cp -i abbr -ag mv mv -i -abbr -ag n nnn -de -abbr -ag z zathura + +abbr -ag a sudo apt abbr -ag p sudo pacman -abbr -ag nb newsboat -r abbr -ag sus sudo systemctl abbr -ag sdn sudo shutdown now +abbr -ag spn sudo poweroff now + abbr -ag gof gofmt -s -w -e -l . abbr -ag vw nvim -c VimwikiIndex abbr -ag mi 'make && sudo make install' + +abbr -ag ta tmux attach -t +abbr -ag tks tmux kill-session -t +abbr -ag tls tmux list-sessions + abbr -ag c fzfcmd # aliases -alias fzfcmd='set fzfcmd ( grep " cmd: " $XDG_DATA_HOME/fish/fish_history | sed "s/- cmd: //" | grep -v fzfcmd | tac | fzf -e --color=16 --no-sort ) && echo $fzfcmd && eval $fzfcmd' -alias lynx='lynx -accept_all_cookies -vikeys' alias vimwiki='nvim -c VimwikiIndex' +alias lynx='lynx -accept_all_cookies -vikeys' alias pcmn='pacman -Sl | cut -d" " -f2,3,4 | fzf -m --preview "pacman -Si {1}" --preview-window=right:66%:wrap | xargs -ro -n 1 sudo pacman -S' +alias fzfcmd='set fzfcmd ( grep " cmd: " $XDG_DATA_HOME/fish/fish_history | sed "s/- cmd: //" | grep -v fzfcmd | tac | fzf -e --color=16 --no-sort ) && echo $fzfcmd && eval $fzfcmd' # make delete work in st switch $TERM @@ -44,8 +54,27 @@ function fish_prompt echo -n (git_status_prompt) end +# vi mode indicator function fish_mode_prompt - # turns off vi mode indicator + # switch $fish_bind_mode + # case default + # set_color --bold red + # echo 'N' + # case insert + # set_color --bold green + # echo 'I' + # case replace_one + # set_color --bold green + # echo 'R' + # case visual + # set_color --bold brmagenta + # echo 'V' + # case '*' + # set_color --bold red + # echo '?' + # end + # set_color normal + # echo ' ' end # sudo !! @@ -62,3 +91,6 @@ function sw set TMPFILE (mktemp) mv -f $argv[1] $TMPFILE && mv $argv[2] $argv[1] && mv $TMPFILE $argv[2] end + +# tmux +[ $TERM != "screen" ] && [ $TERM != "screen-256color" ] && tmux diff --git a/home/.config/nvim/init.vim b/home/.config/nvim/init.vim @@ -14,6 +14,7 @@ Plug 'tmsvg/pear-tree' Plug 'tpope/vim-commentary' Plug 'tpope/vim-surround' Plug 'neoclide/coc.nvim', {'branch': 'release'} +Plug 'tpope/vim-fugitive' " Appearance Plug 'airblade/vim-gitgutter' Plug 'morhetz/gruvbox' @@ -42,10 +43,10 @@ noremap <C-h> <C-w>h noremap <C-j> <C-w>j noremap <C-k> <C-w>k noremap <C-l> <C-w>l -noremap <Space>h :vertical resize -5<CR> -noremap <Space>l :vertical resize +5<CR> -noremap <Space>k :resize -5<CR> -noremap <Space>j :resize +5<CR> +" noremap <Space>h :vertical resize -5<CR> +" noremap <Space>l :vertical resize +5<CR> +" noremap <Space>k :resize -5<CR> +" noremap <Space>j :resize +5<CR> noremap <C-c> <C-w>q " }}}2 Tabs {{{2 noremap <A-TAB> :tabnext<CR> diff --git a/modules/theo_suk_arch.mod.sh b/modules/theo_suk_arch.mod.sh @@ -2,8 +2,7 @@ theo_suk_arch_add() { printf "theo_suk_arch: installing packages\n" sudo pacman -S --needed --noconfirm --quiet libxinerama libxft libx11 freetype2 make gcc printf "theo_suk_arch: linking %s/src/suk\n" "$HOME" - mkdir -p "$HOME"/src/suk - ln -sf "$USR_DIR"/home/src/suk "$HOME"/src/suk + ln -sf "$USR_DIR"/home/src/suk/ "$HOME"/src/suk/ printf "theo_suk_arch: compiling software and linking binaries\n" mkdir -p "$HOME"/.local/bin