tyler/dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update vim to nvim and update bashrc

Browse Source
This commit is contained in:
Tyler Perkins 2021-08-06 12:13:32 -04:00
parent 964a09b465
commit 55ac27ff96
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -5,17 +5,17 @@
# #
SRC = ./src SRC = ./src
PROGRAMS = calcurse vim newsboat mpv bash compton PROGRAMS = calcurse nvim newsboat mpv bash compton
.PHONY : install update clean .PHONY : install update clean
install : install :
#vim #nvim
@which vim > /dev/null 2>&1 @which nvim > /dev/null 2>&1
@if [ $$? -eq 0 ]; then \ @if [ $$? -eq 0 ]; then \
echo "vim found! Installing .vimrc ..."; \ echo "nvim found! Installing .vimrc ..."; \
[ -f ~/.vimrc ] && mv ~/.vimrc ~/.vimrc.old; \ [ -f ~/.config/nvim/init.vim ] && mv ~/.config/nvim/init.vim ~/.config/nvim/init.vim.old; \
cp $(SRC)/vim/vimrc ~/.vimrc; \ cp $(SRC)/vim/vimrc ~/.config/nvim/init.vim; \
fi fi
#bash #bash
@which bash > /dev/null 2>&1 @which bash > /dev/null 2>&1
@ -59,10 +59,10 @@ install :
update: update:
#vim #vim
@which vim > /dev/null 2>&1 @which nvim > /dev/null 2>&1
@if [ $$? -eq 0 ]; then \ @if [ $$? -eq 0 ]; then \
echo "vim found! Updating vimrc files with existing versions..."; \ echo "nvim found! Updating vimrc files with existing versions..."; \
[ -f ~/.vimrc ] && cp ~/.vimrc $(SRC)/vim/vimrc; \ [ -f ~/.config/nvim/init.vim ] && cp ~/.config/nvim/init.vim $(SRC)/vim/vimrc; \
fi fi
#bash #bash
@which bash > /dev/null 2>&1 @which bash > /dev/null 2>&1
@ -99,10 +99,10 @@ update:
clean : clean :
#vim #vim
@which vim > /dev/null 2>&1 @which nvim > /dev/null 2>&1
@if [ $$? -eq 0 ]; then \ @if [ $$? -eq 0 ]; then \
echo "vim found! removing existing config files and reinstalling *.old"; \ echo "nvim found! removing existing config files and reinstalling *.old"; \
[ -f ~/.vimrc.old ] && mv ~/.vimrc.old ~/.vimrc; \ [ -f ~/.config/nvim/init.vim.old ] && mv ~/.config/nvim/init.vim.old ~/.config/nvim/init.vim; \
fi fi
#bash #bash
@which bash > /dev/null 2>&1 @which bash > /dev/null 2>&1

3
src/bash/bashrc
View File

@ -33,7 +33,6 @@ export STEAM_COMPAT_DATA_PATH=~/.proton/
alias l="ls -al" alias l="ls -al"
alias lt="ls --human-readable --size -S --classify" alias lt="ls --human-readable --size -S --classify"
alias ..="cd .." alias ..="cd .."
alias mon2cam="deno run --unstable -A -r -q https://raw.githubusercontent.com/ShayBox/Mon2Cam/master/src/mod.ts"
alias sha="shasum -a 256" alias sha="shasum -a 256"
alias untar="tar zxvf" alias untar="tar zxvf"
alias sync="sudo emerge --sync && sudo layman -S" alias sync="sudo emerge --sync && sudo layman -S"
@ -69,7 +68,7 @@ fi
echo -e "${_PROMPT_HEAD_}#########################" echo -e "${_PROMPT_HEAD_}#########################"
echo -e "${_PROMPT_HEAD_}#Welcome ${_PROMPT_VAR_}$(whoami)" echo -e "${_PROMPT_HEAD_}#Welcome ${_PROMPT_VAR_}$(whoami)"
echo -e "${_PROMPT_HEAD_}#EIp : ${_PROMPT_VAR_}$(ifconfig eno1 | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')" echo -e "${_PROMPT_HEAD_}#EIp : ${_PROMPT_VAR_}$(ifconfig eno1 | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')"
echo -e "${_PROMPT_HEAD_}#WIp : ${_PROMPT_VAR_}$(ifconfig wlo1 | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')" #echo -e "${_PROMPT_HEAD_}#WIp : ${_PROMPT_VAR_}$(ifconfig wlo1 | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')"
echo -e "${_PROMPT_HEAD_}#PIp : ${_PROMPT_VAR_}$(curl -s ipinfo.io/ip)" echo -e "${_PROMPT_HEAD_}#PIp : ${_PROMPT_VAR_}$(curl -s ipinfo.io/ip)"
echo -e "${_PROMPT_HEAD_}#Time: ${_PROMPT_VAR_}$(date +"%T")" echo -e "${_PROMPT_HEAD_}#Time: ${_PROMPT_VAR_}$(date +"%T")"
echo -e "${_PROMPT_HEAD_}#Batt: ${_PROMPT_VAR_}${_BATTERY_}%" echo -e "${_PROMPT_HEAD_}#Batt: ${_PROMPT_VAR_}${_BATTERY_}%"