havent updated these in a while

15 files changed, 246 insertions, 80 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3819313
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.swp
+*.swo
diff --git a/.gitmodules b/.gitmodules
index 25bde7d..142f66d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "dwm"]
 	path = dwm
-	url = git@github.com:brysonsteck/dwm
+  url = git@github.com:brysonsteck/dwm
+[submodule "gruvbox"]
+  path = vim/colors/gruvbox
+  url = git@github.com:morhetz/gruvbox
diff --git a/alacritty/.alacritty.yml b/alacritty/.alacritty.yml
index 52926c7..821528b 100644
--- a/alacritty/.alacritty.yml
+++ b/alacritty/.alacritty.yml
@@ -1,23 +1,23 @@
 font:
   normal:
-    family: JetBrains Mono
+    family: JetBrains Mono Nerd Font
     style: Regular
   bold:
-    family: JetBrains Mono
+    family: JetBrains Mono Nerd Font
     style: Bold
   italic:
-    family: JetBrains Mono
+    family: JetBrains Mono Nerd Font
     style: Italic
   bold_italic:
-    family: JetBrains Mono
+    family: JetBrains Mono Nerd Font
     style: Bold Italic
 
-  size: 12.5 
+  size: 11
 
 window:
     padding:
-        x: 10
-        y: 10
+        x: 7
+        y: 7
           #    opacity: 0.95
 
 #colors:
@@ -46,43 +46,43 @@ window:
 #    white: '#ffffff'
 
 # Colors (Ayu Dark)
-colors:
+#colors:
   # Default colors
-  primary:
-    background: '0x0A0E14'
-    foreground: '0xB3B1AD'
+  #  primary:
+  #  background: '0x0A0E14'
+  #  foreground: '0xB3B1AD'
 
   # Normal colors
-  normal:
-    black:   '0x01060E'
-    red:     '0xEA6C73'
-    green:   '0x91B362'
-    yellow:  '0xF9AF4F'
-    blue:    '0x53BDFA'
-    magenta: '0xFAE994'
-    cyan:    '0x90E1C6'
-    white:   '0xC7C7C7'
+  #normal:
+  #  black:   '0x01060E'
+  #  red:     '0xEA6C73'
+  #  green:   '0x91B362'
+  #  yellow:  '0xF9AF4F'
+  #  blue:    '0x53BDFA'
+  #  magenta: '0xFAE994'
+  #  cyan:    '0x90E1C6'
+  #  white:   '0xC7C7C7'
 
   # Bright colors
-  bright:
-    black:   '0x686868'
-    red:     '0xF07178'
-    green:   '0xC2D94C'
-    yellow:  '0xFFB454'
-    blue:    '0x59C2FF'
-    magenta: '0xFFEE99'
-    cyan:    '0x95E6CB'
-    white:   '0xFFFFFF'
+  #bright:
+  #  black:   '0x686868'
+  #  red:     '0xF07178'
+  #  green:   '0xC2D94C'
+  #  yellow:  '0xFFB454'
+  #  blue:    '0x59C2FF'
+  #  magenta: '0xFFEE99'
+  #  cyan:    '0x95E6CB'
+  #  white:   '0xFFFFFF'
 
 # Gruvbox dark
 colors:
     primary:
-#        background: '#282828'
+        background: '#282828'
 #        background: '#3c3836'
-        background: '#32302f'
+#        background: '#32302f'
 #        background: '#000000'
         foreground: '#fbf1c7'
-#    
+    
     normal:
         black:      '#282828'
         red:        '#cc241d'
@@ -103,6 +103,35 @@ colors:
         cyan:       '#8ec07c'
         white:      '#ebdbb2'
 
+# Colors (Gnome Terminal)
+#colors:
+  # Default colors
+  #  primary:
+  #  background: '#1e1e1e'
+  #  foreground: '#ffffff'
+
+  # Normal colors
+  #normal:
+  #  black:   '#171421'
+  #  red:     '#c01c28'
+  #  green:   '#26a269'
+  #  yellow:  '#a2734c'
+  #  blue:    '#12488b'
+  #  magenta: '#a347ba'
+  #  cyan:    '#2aa1b3'
+  #  white:   '#d0cfcc'
+
+  # Bright colors
+  #bright:
+  #  black:   '#5e5c64'
+  #  red:     '#f66151'
+  #  green:   '#33d17a'
+  #  yellow:  '#e9ad0c'
+  #  blue:    '#2a7bde'
+  #  magenta: '#c061cb'
+  #  cyan:    '#33c7de'
+  #  white:   '#ffffff'
+
 # Colors (Nord)
 #colors:
    # Default colors
diff --git a/bash/.bash/00-global.bash b/bash/.bash/00-global.bash
index 38718fb..5ad99f7 100644
--- a/bash/.bash/00-global.bash
+++ b/bash/.bash/00-global.bash
@@ -5,7 +5,7 @@
 #
 
 # expand history size
-export HISTSIZE=5000
+export HISTSIZE=100000
 
 # source global definitions
 if [ -f /etc/bashrc ]; then
diff --git a/bash/.bash/01-aliases.bash b/bash/.bash/01-aliases.bash
index 68ace42..87ae24f 100644
--- a/bash/.bash/01-aliases.bash
+++ b/bash/.bash/01-aliases.bash
@@ -6,6 +6,12 @@
 
 shopt -s expand_aliases
 
+alias sudo="doas"
+
+# typos
+alias l='ls'
+alias sl='ls'
+
 # grep colors
 alias grep='grep --color=auto'
 alias fgrep='fgrep --color=auto'
@@ -26,14 +32,15 @@ alias ....='cd ../../..'
 alias back='cd -'
 
 # binary renames
-alias java='/usr/java/jdk-17.0.1/bin/java'
-alias java8='/usr/java/jre1.8.0_291/bin/java'
-alias java12='/usr/java/jdk-12.0.2/bin/java'
+alias java='/usr/local/java/jdk-18.0.1.1/bin/java'
+alias java11='/usr/bin/java'
 alias python='python3'
-#alias vim='nvim'
+alias g++='g++ --std=c++20'
+alias j='autojump'
+alias vim='vim -p'
 
 # quick important file edits
-alias todo='vim ~/TODO.md'
+alias todo='vim ~/.todo/TODO.org'
 
 # go to directory with files from iPhone
 alias iPhone='cd /home/bryson/Downloads/from-iPhone'
@@ -41,15 +48,26 @@ alias iPhone='cd /home/bryson/Downloads/from-iPhone'
 # common combinations
 alias gs='gs -dNOSAFER'
 alias django='python manage.py'
-alias smci='sudo make clean install'
-alias smi='sudo make install'
-alias mount='sudo mount'
-alias umount='sudo umount'
+alias smci='doas make clean install'
+alias smi='doas make install'
+#alias mount='sudo mount'
+#alias umount='sudo umount'
 
 # bash navigation
 alias add-alias='vim ~/.bash/01-aliases.bash; . ~/.bash_profile'
 
+# common portage files
+alias package.use='doas vim /etc/portage/package.use'
+alias make.conf='doas vim /etc/portage/make.conf'
+alias package.license='doas vim /etc/portage/package.license'
+
 # other garbage
-alias wifi='nmcli d wifi'
+alias fixwifi='sudo rc-service wpa_supplicant restart'
+#alias spt="spotifyd && spt"
+alias macos="cd /home/bryson/git/macOS-Simple-KVM && ./basic.sh"
+alias server="python3 /home/bryson/git/webserver/server.py"
+alias ssh-pixel="ssh -p 8022 uO_14O@${1}"
+alias emerge-update="sudo emerge --ask --verbose --update --deep --changed-use @world"
+#alias vim="nvim"
 #alias connect='nmcli d wifi connect'
 #alias listwifi='nmcli d wifi list'
diff --git a/bash/.bash/02-prompt.bash b/bash/.bash/02-prompt.bash
index 45c7821..62f835a 100644
--- a/bash/.bash/02-prompt.bash
+++ b/bash/.bash/02-prompt.bash
@@ -3,6 +3,7 @@
 # 02-prompt.bash
 # bryson's gnarly bash prompt config
 #
+shopt -s histappend
 
 # color definitions
 black='\e[0;30m'
@@ -47,7 +48,7 @@ color4='\e[38;5;226m'
 function exit_code() {
   local ERROR="$?"
   if [[ ERROR -ne 0 ]]; then
-    echo -n ' \['"$RED"'\]'"$ERROR"''
+    echo -n '\['"$RED"'\]'"$ERROR"' '
   fi
 }
 
@@ -74,7 +75,7 @@ function _git_prompt() {
       echo local`"
     fi
     if ! [[ "$branch" =~ local ]]; then
-      echo -n '\['"$color"'\] { git: '"$ansi"''"$branch"' } '
+      echo -n '\['"$color"'\] ('"$ansi"''"$branch"') '
     fi
   fi
 }
@@ -99,12 +100,20 @@ function _git_prompt() {
 
 # [ bryson@hostname path ]
 # $
-export _PS1="\[\e[$lgray\][ \[$LBLUE\]\u\[$lcyan\]@\[$GREEN\]\h \[$LYELLOW\]\W \[$lgray\]]"
-export _PS2="\[$dgray\]"
+#export _PS1="\[\e[$lgray\][ \[$LBLUE\]\u\[$lcyan\]@\[$GREEN\]\h \[$LYELLOW\]\W \[$lgray\]]"
+#export _PS2="\[$dgray\]"
+
+#export _PS1="\[\e[$lgray\]\[$LBLUE\]\u\[$lcyan\]@\[$GREEN\]\h \[$LYELLOW\]\W\[$lgray\]"
+
+# [ hostname ] Thu Mar 25, 10:00:00 AM, /dev/pts/0
+# { /current/path } 8 files, 64 KB (master)
+# $
+export _PS1="\[$lgray\][ \[$LBLUE\]\h\[$lgray\] ] \[$LCYAN\]\d, \[$GREEN\]\T"
+export _PS2="\[$lgray\]{ \[$LYELLOW\]\w\[$lgray\] }"
 
 # define x titlebar
 TITLEBAR='\[\033]0;\u@\h:\w ($(history 1 | cut -c 8-))\]'
 
 # apply prompt and functions
-export PROMPT_COMMAND='export PS1="$TITLEBAR${_status}${_PS1}$(exit_code)$(_git_prompt)\n${_PS2}\[$NC\]\$ "'
+export PROMPT_COMMAND='export PS1="$TITLEBAR$(exit_code)${_PS1}\n${_PS2}$(_git_prompt)\n\[$NC\]\$ ";history -a'
 
diff --git a/bash/.bash/03-boot.bash b/bash/.bash/03-boot.bash
index fd68025..6ea2c9d 100644
--- a/bash/.bash/03-boot.bash
+++ b/bash/.bash/03-boot.bash
@@ -2,31 +2,49 @@
 #
 # 03-boot.bash
 # startup scripts for systems
-#
+
+bat_check() {
+  TEST=$(acpi | grep "Dis")
+
+  if [[ $? -eq 0 ]]; then 
+    echo "***********************************************************"
+    echo "                         WARNING"
+    echo "***********************************************************"
+    echo "Power supply is not plugged in."
+    echo "Make sure it is plugged in to avoid a random shutdown."
+    read -rs -N 1 -p "Press [Enter] to continue, any other key to return..." input;
+    if grep -q "$input" <<< ""; then
+      echo ""
+    else
+      return 1
+    fi
+  fi
+}
 
 # run startup script if tty
 # for dingo
 if [[ $TERM == 'linux' && $(hostname) == 'dingo' ]]; then
     cat ~/bin/house.txt
     printf "\n${CYAN}Welcome back Bryson :)\n\n"
-    printf "${LGREEN}What should dingo do?\n${blue}"
+    printf "${LGREEN}What should dingo do?\n${magenta}"
     echo -e '\td: start docked\n\tn: start not docked\n\tq: shutdown\n\tr: reboot\n\tl: logout\n\tb: bash\n\n'
 
   while read -rs -N 1 key; do
     printf "${NC}"
     case $key in
-      d) startx ;;
+      d) bat_check && startx ;;
       n) nstartx.sh ;;
       q) echo "Are you sure you want to shutdown? (y/n)";
-      read -rs -N 1 key2; case $key2 in y) shutdown now ;; esac; ;;
+      read -rs -N 1 key2; case $key2 in y) doas shutdown -Ph now ;; esac; ;;
       r) echo "Are you sure you want to reboot? (y/n)";
-      read -rs -N 1 key3; case $key3 in y) reboot ;; esac; ;;
+      read -rs -N 1 key3; case $key3 in y) doas reboot ;; esac; ;;
       l) logout ;;
       b) break ;;
       [h?]) echo "$USAGE";;
     esac
     clear
-    printf "\n${red}Please try again...${NC}\n\n${LGREEN}What should dingo do now?\n${blue}"
+    cat ~/bin/house.txt
+    printf "\n${LGREEN}What should dingo do now?\n${magenta}"
     echo -e '\td: start docked\n\tn: start not docked\n\tq: shutdown\n\tr: reboot\n\tl: logout\n\tb: bash\n\n'
   done
 fi
diff --git a/bash/.bash_profile b/bash/.bash_profile
index 031ab84..e553530 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,12 +1,16 @@
 # .bash_profile
 
+PATH=$PATH:$HOME/.local/bin:$HOME/bin:$HOME/.cargo/bin
+
 # Get the aliases and functions
 if [ -f ~/.bashrc ]; then
 	. ~/.bashrc
 fi
 
 # User specific environment and startup programs
-
-PATH=$PATH:$HOME/.local/bin:$HOME/bin
+. /usr/share/autojump/autojump.bash
 
 export PATH
+complete -cf doas
+export PATH=$PATH:/home/bryson/.spicetify
+#source "/home/bryson/git/emsdk/emsdk_env.sh"
diff --git a/bash/.bashrc b/bash/.bashrc
index 1a40fb5..c267237 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -4,10 +4,11 @@ if [[ -d ~/.bash/ ]]; then
 fi
 
 # install asdf
-. $HOME/.asdf/asdf.sh
-. $HOME/.asdf/completions/asdf.bash
+#. $HOME/.asdf/asdf.sh
+#. $HOME/.asdf/completions/asdf.bash
 
 # devkitpro
 DEVKITPRO=/opt/devkitpro
 DEVKITARM=/opt/devkitpro/devkitARM
 DEVKITPPC=/opt/devkitpro/devkitPPC
+export PATH=$PATH:/home/bryson/.spicetify
diff --git a/update.sh b/update.sh
new file mode 100755
index 0000000..e34263a
--- /dev/null
+++ b/update.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+cp ~/.alacritty.yml ./alacritty/.alacritty.yml
+cp -r ~/.bash ./bash
+cp ~/.bash_profile ./bash
+cp ~/.bashrc ./bash
+cp ~/.tmux.conf ./tmux
+cp ~/.vimrc ./vim
+cp ~/.vim/coc-settings.json ./vim
+cp ~/.xinitrc* ./x
+cp ~/.Xresources ./x
+
diff --git a/vim/.vimrc b/vim/.vimrc
index 3130da0..ee8f046 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,6 +1,12 @@
+filetype plugin on
+syntax enable
+let g:vimtex_compiler_method = 'arara'
+let maplocalleader = "\\"
+
 set nocompatible
 let g:gruvbox_contrast_dark = 'soft'
 let g:gruvbox_termcolors = '16'
+let g:python_recommended_style = 0
 colorscheme gruvbox
 set ttymouse=sgr
 set number
@@ -15,17 +21,30 @@ set wildmenu
 set scrolloff=5
 set incsearch
 set ttimeout ttimeoutlen=25
-set clipboard=unnamedplus
+"set clipboard=unnamedplus
+set showtabline=2
+set undodir=~/.vim/undo-dir
+set undofile
 
 " turn on spell checker for all markdown files
 autocmd FileType markdown setlocal spell
-
-execute pathogen#infect()
+hi clear SpellBad                                                
+hi SpellBad cterm=underline                                      
+hi clear SpellRare                                               
+hi SpellRare cterm=underline                                     
+hi clear SpellCap                                                
+hi SpellCap cterm=underline                                      
+hi clear SpellLocal
+hi SpellLocal cterm=underline
 
 call plug#begin()
 
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'jaxbot/semantic-highlight.vim'
+Plug 'itchyny/lightline.vim'
+Plug 'jceb/vim-orgmode'
+Plug 'tpope/vim-speeddating'
+Plug 'lervag/vimtex'
 
 call plug#end()
 
@@ -40,7 +59,7 @@ function! s:check_back_space() abort
   return !col || getline('.')[col - 1]  =~# '\s'
 endfunction
 
-let s:semanticGUIColors = [ "#cc241d", "#98971a", "#d79921", "#458588", "#b16286", "#689d6a", "#928374", "#fb4934", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c", "#ebdbb2" ]
+"let s:semanticGUIColors = [ "#cc241d", "#98971a", "#d79921", "#458588", "#b16286", "#689d6a", "#928374", "#fb4934", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c", "#ebdbb2" ]
 
 
 " stolen from https://shapeshed.com/vim-statuslines/
diff --git a/vim/coc-settings.json b/vim/coc-settings.json
new file mode 100644
index 0000000..0c93cc3
--- /dev/null
+++ b/vim/coc-settings.json
@@ -0,0 +1,30 @@
+{
+ "semanticTokens.filetypes": ["*"],
+  "suggest.completionItemKindLabels": {
+    "text": "t",
+    "method": "m",
+    "function": ""
+  },
+  "java.home": "/usr/java/jdk-17.0.1",
+	"java.configuration.runtimes": [
+    {
+      "name": "JavaSE-12",
+      "path": "/usr/java/jdk-12.0.2",
+      "default": true
+    },
+
+    {
+      "name": "JavaSE-16",
+      "path": "/usr/java/jdk-17.0.1"
+    }
+  ],
+  "java.referencesCodeLens.enabled": true,
+  "java.implementationsCodeLens.enabled": true,
+  "java.completion.enabled": true,
+  "perl": {
+    "enable": true,
+    "debugAdapterPort": "13604",
+    "logLevel": 1
+  },
+	"java.jdt.ls.vmargs": "-noverify -Xmx6G -XX:+UseG1GC -XX:+UseStringDeduplication"
+}
diff --git a/x/.Xresources b/x/.Xresources
index 9c5a55a..64bad43 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,2 +1,2 @@
-Xcursor.theme: capitaine-cursors-light
-Xcursor.size: 55
+Xcursor.theme: macOSBigSur-White
+Xcursor.size: 40
diff --git a/x/.xinitrc b/x/.xinitrc
index 7bb4044..5cbe639 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -38,15 +38,21 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
 fi
 
 # open picom compositor
-picom --config ~/.config/picom.conf & 
+#picom --config ~/.config/picom.conf & 
 
-exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
+#spotifyd &
 
+#exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
+
+xset r rate 300 50 &
+xset r rate 300 50 &
+xset r rate 300 50 &
 # set up monitors
 #fixscreen
 sh ~/.screenlayout/screenlayout.sh &
 
 # set default audio device to be dock audio jack
+pulseaudio -k &
 pacmd set-default-sink alsa_output.usb-0c76_USB_PnP_Audio_Device-00.analog-stereo &
 
 # add weather, date and time to xsetroot
@@ -54,7 +60,8 @@ pacmd set-default-sink alsa_output.usb-0c76_USB_PnP_Audio_Device-00.analog-stere
 slstatus &
 
 # set up wallpapers
-wallpapers.sh &
+#wallpapers.sh &
+feh --bg-fill ~/Pictures/Wallpapers/leaves-3.jpg &
 
 # start notifications daemon
 notification-daemon &
@@ -63,16 +70,20 @@ notification-daemon &
 xrdb -merge ~/.Xresources
 
 # make cursor disappear after a couple of seconds
-unclutter --idle 4 -root &
+unclutter -idle 4 -root &
 
 # enable numlock
 numlockx &
 
 # turn off wifi, force ethernet
-nmcli radio wifi off &
+#nmcli radio wifi off &
+
+# start keepassxc for passwords
+keepassxc &
 
 # start dwm
-#xset r rate 300 50; exec dwm
-xset r rate 300 50 &
+redshift &
+xset r rate 300 50
 exec /home/bryson/bin/startdwm.sh
+#exec dwm
 
diff --git a/x/.xinitrc-not-docked b/x/.xinitrc-not-docked
index 605225e..db2edc5 100644
--- a/x/.xinitrc-not-docked
+++ b/x/.xinitrc-not-docked
@@ -37,23 +37,25 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
 fi
 
 # start picom compositor
-picom --config ~/.config/picom.conf & 
+#picom --config ~/.config/picom.conf & 
 
-exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
+#spotifyd &
+
+#exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 
 # add network, battery, date and time to xsetroot
 #sh ~/bin/xsetloop-not-docked.sh &
 slstatus-not-docked &
 
 # reset backlight
-xbacklight -set 25 &
+light -S 25 &
 
 # 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
-nitrogen --head=0 --set-zoom-fill ~/Pictures/Wallpapers/solid-gruvbox.png &
+feh --bg-fill ~/Pictures/Wallpapers/gruvbox_spacesuit.jpg &
 
 # start notifications daemon
 notification-daemon &
@@ -62,15 +64,23 @@ notification-daemon &
 xrdb -merge ~/.Xresources
 
 # make cursor disappear after a couple of seconds
-unclutter --idle 4 -root &
+unclutter -idle 3 -jitter 5 -root &
 
 # turn tearfree on
 xrandr --output eDP --auto --set TearFree on &
 
 # make sure wifi is back on
-nmcli radio wifi on &
+#nmcli radio wifi on &
+
+# run battery checker
+~/bin/battery.pl &
+
+# start keepassxc for passwords
+keepassxc &
 
 # start dwm
-#redshift -O3500; xset r rate 300 50; exec dwm
-xset r rate 300 50; exec /home/bryson/bin/startdwm.sh
+redshift &
+xset r rate 300 50
+exec /home/bryson/bin/startdwm.sh
+#exec dwm