saving to experiment with gruvbox

5 files changed, 61 insertions, 11 deletions

diff --git a/alacritty/.alacritty.yml b/alacritty/.alacritty.yml
index c233992..c920a28 100644
--- a/alacritty/.alacritty.yml
+++ b/alacritty/.alacritty.yml
@@ -26,10 +26,10 @@ colors:
     
     normal:
         black:      '#1D1F21'
-        red:        '#910002'
-        green:      '#00A406'
+        red:        '#DD0000'
+        green:      '#00CB07'
         yellow:     '#F0E100'
-        blue:       '#1152BD'
+        blue:       '#0E60E5'
         magenta:    '#980AE0'
         cyan:       '#34D9FF'
         white:      '#A8A8A8'
diff --git a/bash/.bashrc b/bash/.bashrc
index 01bd952..57d68d1 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,5 +1,7 @@
 # .bashrc
 
+export HISTSIZE=5000
+
 # Source global definitions
 if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
@@ -37,6 +39,8 @@ alias todo='vim ~/TODO.md'
 alias iPhone='cd /home/bryson/Downloads/from-iPhone'
 
 alias gs='gs -dNOSAFER'
+
+alias smci='sudo make clean install'
 #discord_gpu() {
 #        ~/bin/discord "$@"
 #}
@@ -47,7 +51,7 @@ alias discord='discord --ignore-gpu-blocklist --disable-features=UseOzonePlatfor
 
 #echo -en "\033]0;\u@\h - $(history | cut -c 8-)\a"
 
-TITLEBAR='\[\033]0;\u at \h in \w ($(history 1 | cut -c 8-))\]'
+TITLEBAR='\[\033]0;\u@\h:\w ($(history 1 | cut -c 8-))\]'
 
 #set-window-title() {
 #      echo -en "\033]0;\u@\h - $(history | cut -c 8-)\a"
@@ -106,10 +110,13 @@ function _git_prompt() {
   if ! [[ "$git_status" =~ Not\ a\ git\ repo ]]; then
     if [[ "$git_status" =~ nothing\ to\ commit ]]; then
       local ansi=""
+      local color="$lgreen"
     elif [[ "$git_status" =~ nothing\ added\ to\ commit\ but\ untracked\ files\ present ]]; then
       local ansi="!"
+      local color="$lred"
     else
       local ansi="*"
+      local color="$lyellow"
     fi
     if [[ "$git_status" =~ On\ branch\ ([^[:space:]]+) ]]; then
       branch=${BASH_REMATCH[1]}
@@ -120,7 +127,7 @@ function _git_prompt() {
       echo local`"
     fi
     if ! [[ "$branch" =~ local ]]; then
-      echo -n '\['"$color1"'\]'"$ansi"''"$branch"' '
+      echo -n '\['"$color"'\] { git: '"$ansi"''"$branch"' } '
     fi
   fi
 }
@@ -132,11 +139,22 @@ function report_status() {
   fi
 }
 
+function random_color() {
+    echo -n $(($RANDOM % 256 + 1))
+}
+
+function get_random_ps1() {
+    echo -n "\[\e[1m\e[38;5;$(random_color)m\]\u\[\e[38;5;$(random_color)m\]@\[\e[38;5;$(random_color)m\]\h \[\e[38;5;$(random_color)m\]\w \[\e[38;5;$(random_color)m\]\@ \[\e[38;5;$(random_color)m\]\s "
+}
+
+# Unicode looparound thing
 #export _PS1="\[$RED\]\u\[$NC\]@\[$YELLOW\]\h \[$yellow\]\w | \[$GREEN\]\V\s \[$BLUE\]\d \@ \[$NC\]"
 #export _PS1="\[$dgray\]╭─[ \[$LGREEN\]\u\[$lgray\]@\[$YELLOW\]\h\[$dgray\] ] {\[$LBLUE\] \w\[$dgray\] } "
 #export _PS2="\[$dgray\]╰ "
 #export _PS1="\[$dgray\][ \[$GREEN\]\u\[$lgray\]@\[$LRED\]\h\[$dgray\] ] { \[$LCYAN\]\w\[$dgray\] } "
-export _PS1="\[\e[1m$color1\]\u\[$color2\]@\[$color3\]\h \[$color4\]\w \[$color3\]\@ \[$color2\]\s "
+# xterm color thing
+#export _PS1="\[\e[1m$color1\]\u\[$color2\]@\[$color3\]\h \[$color4\]\w \[$color3\]\@ \[$color2\]\s "
+export _PS1="\[$lgray\][ \[\e[1m$color1\]\u\[$color2\]@\[$color3\]\h \[$color4\]\w \[\e[0m$lgray\]]"
 export _PS2="\[$dgray\]"
 #export _PS1=" \u \`pwd\`"
 #export _PS2=""
@@ -144,3 +162,30 @@ export PROMPT_COMMAND='export PS1="$TITLEBAR${_status}${_PS1}$(_git_prompt)\n${_
 
 . $HOME/.asdf/asdf.sh
 . $HOME/.asdf/completions/asdf.bash
+
+# run startup script if tty
+if [[ $TERM == 'linux' && $(hostname) == 'dingo' ]]; then
+    cat ~/bin/house.txt
+    printf "\n${CYAN}Welcome back Bryson :)\n\n"
+    USAGE="${blue}\td:start-docked\n\tn:start-not-docked\n\tq:shutdown\n\tr:reboot\n\tb:bash\n\n${NC}"
+    printf "${LGREEN}What should dingo do?\n"
+    printf "%b" $USAGE
+
+  while read -rs -N 1 key; do
+    case $key in
+      d) startx ;;
+      n) nstartx ;;
+      q) echo "Are you sure you want to shutdown? (y/n)";
+      read -rs -N 1 key2; case $key2 in y) shutdown now ;; esac; ;;
+      r) echo "Are you sure you want to reboot? (y/n)";
+      read -rs -N 1 key3; case $key3 in y) reboot ;; esac; ;;
+      b) break ;;
+      [h?]) echo "$USAGE";;
+    esac
+    printf "${LGREEN}What should dingo do now?\n"
+    printf "%b" $USAGE
+  done
+fi
+
+
+source /usr/share/nvm/init-nvm.sh
diff --git a/vim/.vimrc b/vim/.vimrc
index f60d75f..8e9dd3b 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -9,6 +9,7 @@ set backspace=indent,eol,start
 set laststatus=2
 set wildmenu
 set scrolloff=5
+set incsearch
 
 " turn on spell checker for all markdown files
 autocmd FileType markdown setlocal spell
diff --git a/x/.xinitrc b/x/.xinitrc
index d1712ce..007fdb0 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -47,7 +47,8 @@ sh ~/.screenlayout/screenlayout.sh &
 pacmd set-default-sink alsa_output.usb-0c76_USB_PnP_Audio_Device-00.analog-stereo &
 
 # add weather, date and time to xsetroot
-sh ~/bin/xsetloop-docked.sh &
+#sh ~/bin/xsetloop-docked.sh &
+slstatus &
 
 # set up wallpapers
 wallpapers &
@@ -68,6 +69,6 @@ numlockx &
 nmcli radio wifi off &
 
 # start dwm
-xset r rate 300 50 &
+xset r rate 300 50; exec dwm
 #exec /home/bryson/bin/startdwm
-exec dwm
+
diff --git a/x/.xinitrc-not-docked b/x/.xinitrc-not-docked
index f01940b..9f20b82 100644
--- a/x/.xinitrc-not-docked
+++ b/x/.xinitrc-not-docked
@@ -40,11 +40,14 @@ picom -CG -I 0.1 -O 0.1 -o 0.0 --backend xrender --menu-opacity 1.0 &
 
 
 # add network, battery, date and time to xsetroot
-sh ~/bin/xsetloop-not-docked.sh &
+#sh ~/bin/xsetloop-not-docked.sh &
+slstatus-not-docked &
+
+# reset backlight
+xbacklight -set 50 &
 
 # set default audio device to be laptop speakers
 pacmd set-default-sink alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink &
-
 pacmd set-sink-volume alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink 0 &
 
 # set up wallpaper