hmm

Signed-off-by: Jeff Carr <[email protected]>

3 files changed, 35 insertions, 65 deletions

diff --git a/bashrc/.bashrc b/bashrc/.bashrc
index 857f9de..82b6b0f 100644
--- a/bashrc/.bashrc
+++ b/bashrc/.bashrc
@@ -1,39 +1,3 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-
-# Note: PS1 and umask are already set in /etc/profile. You should not
-# need this unless you want different defaults for root.
-# PS1='${debian_chroot:+($debian_chroot)}\h:\w\$ '
-# umask 022
-
-# You may uncomment the following lines if you want `ls' to be colorized:
-# export LS_OPTIONS='--color=auto'
-# eval "`dircolors`"
-# alias ls='ls $LS_OPTIONS'
-# alias ll='ls $LS_OPTIONS -l'
-# alias l='ls $LS_OPTIONS -lA'
-#
-# Some more alias to avoid making mistakes:
-alias rm='rm -i'
-alias cp='cp -i'
-alias mv='mv -i'
-
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion
+if [ -f ~/.config/wit/bashrc/.wit ] && ! shopt -oq posix; then
+	. ~/.config/wit/bashrc/.wit
 fi
-
-# read in custom bash settings if you want
-#if [ -f ~/jcarr/bashrc/.jcarr ] && ! shopt -oq posix; then
-#	. ~/jcarr/bashrc/.jcarr
-#fi
-
-# read in custom bash settings if you want
-case "$LC_USER" in
-jcarr2)
-        . ~/jcarr/bashrc/.jcarr
-        ;;
-*)
-	if [ -f ~/$LC_USER/bashrc/.$LC_USER ] && ! shopt -oq posix; then
-	        . ~/$LC_USER/bashrc/.$LC_USER
-	fi
-        ;;
-esac
diff --git a/bashrc/.wit b/bashrc/.wit
new file mode 100644
index 0000000..275a7d2
--- /dev/null
+++ b/bashrc/.wit
@@ -0,0 +1,33 @@
+# set -x
+
+# Some more alias to avoid making mistakes:
+alias rm='rm -i'
+alias cp='cp -i'
+alias mv='mv -i'
+
+if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
+    . /etc/bash_completion
+fi
+
+export WIT_BASH=true
+export WIT_USER=$LC_USER
+if [ "x$WIT_USER" == "x" ]; then
+	export WIT_USER=$USER
+fi
+
+# read in custom bash settings if you want
+#if [ -f ~/jcarr/bashrc/.jcarr ] && ! shopt -oq posix; then
+#	. ~/jcarr/bashrc/.jcarr
+#fi
+
+# read in custom bash settings if you want
+case "$WIT_USER" in
+jcarr2)
+        . ~/jcarr/bashrc/.jcarr
+        ;;
+*)
+	if [ -f ~/$WIT_USER/bashrc/.$WIT_USER ] && ! shopt -oq posix; then
+	        . ~/$WIT_USER/bashrc/.$WIT_USER
+	fi
+        ;;
+esac
diff --git a/bashrc/vimrc b/bashrc/vimrc
deleted file mode 100644
index aea6acc..0000000
--- a/bashrc/vimrc
+++ /dev/null
@@ -1,27 +0,0 @@
-" also look at /etc/vim/vimrc
-runtime! debian.vim
-
-filetype plugin indent on
-
-" Plugins
-" Plugin 'fatih/vim-go'
-
-set mouse=r
-set encoding=utf-8
-set fileencoding=utf-8
-syntax on
-au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
-
-" display's line numbers
-" -set t_te=
-
-" to keep vim from clearing the screen on exit
-:set t_te=
-
-" stuff for vim-go
-" let g:go_def_mode='gopls'
-" let g:go_info_mode='gopls'
-
-" vim -u ~/.config/.vimrc
-" set viminfo+=n~/.vim/viminfo
-:set viminfo='50,<1000,s100,:0,n~/.cache/viminfo