From 55ac27ff963f852adfbe210a36ac2a4c77be1e2a Mon Sep 17 00:00:00 2001
From: Tyler Perkins <tperki17@kent.edu>
Date: Fri, 6 Aug 2021 12:13:32 -0400
Subject: [PATCH] Update vim to nvim and update bashrc

---
 Makefile        | 24 ++++++++++++------------
 src/bash/bashrc |  3 +--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 34a41c8..b6c3985 100644
--- a/Makefile
+++ b/Makefile
@@ -5,17 +5,17 @@
 #
 
 SRC = ./src
-PROGRAMS = calcurse vim newsboat mpv bash compton 
+PROGRAMS = calcurse nvim newsboat mpv bash compton 
 
 .PHONY : install update clean
 
 install :
-	#vim
-	@which vim > /dev/null 2>&1
+	#nvim
+	@which nvim > /dev/null 2>&1
 	@if [ $$? -eq 0 ]; then \
-	    echo "vim found! Installing .vimrc ..."; \
-	    [ -f ~/.vimrc ] && mv ~/.vimrc ~/.vimrc.old; \
-	    cp $(SRC)/vim/vimrc ~/.vimrc; \
+	    echo "nvim found! Installing .vimrc ..."; \
+	    [ -f ~/.config/nvim/init.vim ] && mv ~/.config/nvim/init.vim ~/.config/nvim/init.vim.old; \
+	    cp $(SRC)/vim/vimrc ~/.config/nvim/init.vim; \
 	fi
 	#bash
 	@which bash > /dev/null 2>&1
@@ -59,10 +59,10 @@ install :
 
 update:
 	#vim
-	@which vim > /dev/null 2>&1
+	@which nvim > /dev/null 2>&1
 	@if [ $$? -eq 0 ]; then \
-	    echo "vim found! Updating vimrc files with existing versions..."; \
-	    [ -f ~/.vimrc ] && cp ~/.vimrc $(SRC)/vim/vimrc; \
+	    echo "nvim found! Updating vimrc files with existing versions..."; \
+	    [ -f ~/.config/nvim/init.vim ] && cp ~/.config/nvim/init.vim $(SRC)/vim/vimrc; \
 	fi
 	#bash
 	@which bash > /dev/null 2>&1
@@ -99,10 +99,10 @@ update:
 
 clean :
 	#vim
-	@which vim > /dev/null 2>&1
+	@which nvim > /dev/null 2>&1
 	@if [ $$? -eq 0 ]; then \
-	    echo "vim found! removing existing config files and reinstalling *.old"; \
-	    [ -f ~/.vimrc.old ] && mv ~/.vimrc.old ~/.vimrc; \
+	    echo "nvim found! removing existing config files and reinstalling *.old"; \
+	    [ -f ~/.config/nvim/init.vim.old ] && mv ~/.config/nvim/init.vim.old ~/.config/nvim/init.vim; \
 	fi
 	#bash
 	@which bash > /dev/null 2>&1
diff --git a/src/bash/bashrc b/src/bash/bashrc
index 8c08b1c..045c3d1 100644
--- a/src/bash/bashrc
+++ b/src/bash/bashrc
@@ -33,7 +33,6 @@ export STEAM_COMPAT_DATA_PATH=~/.proton/
 alias l="ls -al"
 alias lt="ls --human-readable --size -S --classify"
 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 untar="tar zxvf"
 alias sync="sudo emerge --sync && sudo layman -S"
@@ -69,7 +68,7 @@ fi
 echo -e "${_PROMPT_HEAD_}#########################"
 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_}#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_}#Time: ${_PROMPT_VAR_}$(date +"%T")"
 echo -e "${_PROMPT_HEAD_}#Batt: ${_PROMPT_VAR_}${_BATTERY_}%"