From 3d42dcc5682bd1905857911d12f661d252fa139e Mon Sep 17 00:00:00 2001
From: Daniel Liu <mr.picklepinosaur@gmail.com>
Date: Thu, 14 Jan 2021 14:31:32 -0500
Subject: [PATCH] vimrc update

---
 .bashrc                |  8 ++------
 .vimrc                 | 30 ++++++++++++++++++++++++------
 Scripts/ufetch-gentoo  | 16 ++++++++--------
 Scripts/ufetch-manjaro |  2 +-
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/.bashrc b/.bashrc
index 4e9ad64..9d41b80 100644
--- a/.bashrc
+++ b/.bashrc
@@ -14,7 +14,6 @@ PS1=' λ_ \W > '
 #set vi mode
 set -o vi
 
-
 # ibus
 export GTK_IM_MODULE=ibus
 export XMODIFIERS=@im=ibus
@@ -23,6 +22,7 @@ export QT_IM_MODULE=ibus
 
 # Enivormentals
 export PATH=$HOME/Scripts:$HOME/Scripts/dmenu:$HOME/Scripts/statusbar:$HOME/Scripts/acpi:$PATH
+export NINEIT_USERNAME=pinosaur
 
 export XDG_CONFIG_HOME=$HOME/.config
 export EDITOR="vim"
@@ -33,7 +33,7 @@ export WM="dwm"
 
 # aliaseseses
 alias ls='ls --color=auto'
-alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
+alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
 alias suckless-clean='make clean && rm -rf config.h && git reset --hard home/master'
 alias musicdl="youtube-dl -f bestaudio"
 alias mpv="mpv --no-input-default-bindings"
@@ -43,11 +43,7 @@ alias nmaplocal='nmap -sn 192.168.1.0/24'
 
 source fzfutil
 
-export NINEIT_USERNAME=pinosaur
-
-
 # startup stuff
-
 ufetch-arch
 
 export LF_ICONS="\
diff --git a/.vimrc b/.vimrc
index b105301..684ca1c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -5,6 +5,7 @@
 "   (_)_/ |_|_| |_| |_|_|  \___|
 "                            
 
+" basics
 syntax on
 set number
 set relativenumber
@@ -16,20 +17,32 @@ set shiftwidth=4
 set expandtab
 set formatoptions-=cro "disables auto comments
 
+" spell check
 setlocal spell
 set spelllang=en_us
 set spellcapcheck=
 
+" conceal
 set conceallevel=2
 
+" Bindings
+let mapleader = ' '
+
+" map <leader>e :Ex<cr>
+" map <leader>v :Vex<cr>
+map <leader>l :bn<cr>
+map <leader>h :bp<cr>
+map <leader>d :bd<cr>
+
 " colors
 hi Conceal ctermbg=Black
 hi SpellBad ctermfg=Red ctermbg=Black cterm=underline
 
-" Bindings
-nnoremap <C-[> <C-t>
-
-" Some macros
+" Netrw
+" let g:netrw_liststyle = 3
+" let g:netrw_banner = 0
+" let g:netrw_winsize = 25
+" let g:netrw_browse_split = 4
 
 " vim plug
 " this blob auto installs vim plug if it isnt already
@@ -46,10 +59,11 @@ Plug 'lervag/vimtex'
 Plug 'jiangmiao/auto-pairs'
 Plug 'PietroPate/vim-tex-conceal'
 Plug 'vim-airline/vim-airline'
+Plug 'tpope/vim-commentary'
+Plug 'ptzz/lf.vim'
 " Plug 'ctrlpvim/ctrlp.vim'
 " Plug 'neoclide/coc.nvim', {'branch': 'release'}
 " Plug 'habamax/vim-godot'
-Plug 'tpope/vim-commentary'
 
 call plug#end()
 
@@ -70,8 +84,12 @@ let g:vimtex_compiler_latexmk = {
 \}
 
 " VimAirline
-"let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tabline#buffer_min_count = 2
 let g:airline_powerline_fonts=1
 
 " Ctrlp
 let g:ctrlp_cmd='CtrlPTag'
+
+" Lf
+" let g:lf_replace_netrw = 1 " weird behavior rn
diff --git a/Scripts/ufetch-gentoo b/Scripts/ufetch-gentoo
index 5a36307..7b52ec6 100755
--- a/Scripts/ufetch-gentoo
+++ b/Scripts/ufetch-gentoo
@@ -75,13 +75,13 @@ c1="${reset}${magenta}"             # second color
 
 cat <<EOF
 
-                    ${nc}${USER}${ic}@${nc}${hostname}${reset}
-${c0}     .-----.        ${lc}OS:        ${ic}${os}${reset}
-${c0}   .\`    _  \`.      ${lc}KERNEL:    ${ic}${kernel}${reset}
-${c0}   \`.   (${c1}_)   ${c0}\`.    ${lc}HOST:      ${ic}${host}${reset}  
-${c0}     \`${c1}.        /    ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c1}    .\`       .\`     ${lc}PACKAGES:  ${ic}${packages}${reset}
-${c1}   /       .\`       ${lc}${uitype}:        ${ic}${ui}${reset}
-${c1}   \____.-\`         ${lc}TERM:      ${ic}${term}${reset}
+                   ${nc}${USER}${ic}@${nc}${hostname}${reset}
+${c0}     .-----.       ${lc}OS:        ${ic}${os}${reset}
+${c0}   .\`    _  \`.     ${lc}KERNEL:    ${ic}${kernel}${reset}
+${c0}   \`.   (${c1}_)   ${c0}\`.   ${lc}HOST:      ${ic}${host}${reset}  
+${c0}     \`${c1}.        /   ${lc}UPTIME:    ${ic}${uptime}${reset}
+${c1}    .\`       .\`    ${lc}PACKAGES:  ${ic}${packages}${reset}
+${c1}   /       .\`      ${lc}${uitype}:        ${ic}${ui}${reset}
+${c1}   \____.-\`        ${lc}TERM:      ${ic}${term}${reset}
 
 EOF
diff --git a/Scripts/ufetch-manjaro b/Scripts/ufetch-manjaro
index 002140a..5dbfc1b 100755
--- a/Scripts/ufetch-manjaro
+++ b/Scripts/ufetch-manjaro
@@ -6,7 +6,7 @@
 
 # user is already defined
 hostname="$(hostname)"
-os='Arch Linux'
+os='Manjaro Linux'
 host="$(cat /sys/devices/virtual/dmi/id/product_name) $(cat /sys/devices/virtual/dmi/id/product_family)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
-- 
2.20.1