havent pushed these in a while

5 files changed, 148 insertions, 26 deletions

diff --git a/alacritty/.alacritty.yml b/alacritty/.alacritty.yml
index e14eb3a..c233992 100644
--- a/alacritty/.alacritty.yml
+++ b/alacritty/.alacritty.yml
@@ -12,14 +12,13 @@ font:
     family: JetBrains Mono
     style: Bold Italic
 
-  size: 15
-
-background_opacity: 1
+  size: 12.5 
 
 window:
     padding:
         x: 10
         y: 10
+    opacity: 0.85
 
 colors:
     primary:
@@ -27,10 +26,10 @@ colors:
     
     normal:
         black:      '#1D1F21'
-        red:        '#C60D0B'
-        green:      '#1B8D20'
+        red:        '#910002'
+        green:      '#00A406'
         yellow:     '#F0E100'
-        blue:       '#1F7AFF'
+        blue:       '#1152BD'
         magenta:    '#980AE0'
         cyan:       '#34D9FF'
         white:      '#A8A8A8'
diff --git a/bash/.bashrc b/bash/.bashrc
index 4be0c89..01bd952 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -21,9 +21,22 @@ alias ls='ls --color=auto'
 alias la='ls -a'
 alias lsd='ls -lh'
 
+alias ..='cd ..'
+alias ...='cd ../..'
+alias ....='cd ../../..'
+
 alias record-audio='ffmpeg -f pulse -i default'
 alias python='python3'
 alias alsamixer='alsamixer -c 1'
+
+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 todo='vim ~/TODO.md'
+alias iPhone='cd /home/bryson/Downloads/from-iPhone'
+
+alias gs='gs -dNOSAFER'
 #discord_gpu() {
 #        ~/bin/discord "$@"
 #}
@@ -81,16 +94,22 @@ lgray='\e[0;37m'
 LGRAY='\e[1;37m'
 NC='\e[0m' # No Color
 
+# 256color prompt variables
+color1='\e[38;5;39m'
+color2='\e[38;5;81m'
+color3='\e[38;5;77m'
+color4='\e[38;5;226m'
+
 # Taken from http://www.opinionatedprogrammer.com/2011/01/colorful-bash-prompt-reflecting-git-status/
 function _git_prompt() {
   local git_status="`git status -unormal 2>&1`"
   if ! [[ "$git_status" =~ Not\ a\ git\ repo ]]; then
     if [[ "$git_status" =~ nothing\ to\ commit ]]; then
-      local ansi=$GREEN
+      local ansi=""
     elif [[ "$git_status" =~ nothing\ added\ to\ commit\ but\ untracked\ files\ present ]]; then
-      local ansi=$RED
+      local ansi="!"
     else
-      local ansi=$YELLOW
+      local ansi="*"
     fi
     if [[ "$git_status" =~ On\ branch\ ([^[:space:]]+) ]]; then
       branch=${BASH_REMATCH[1]}
@@ -101,7 +120,7 @@ function _git_prompt() {
       echo local`"
     fi
     if ! [[ "$branch" =~ local ]]; then
-      echo -n '\['"$ansi"'\](in git branch '"$branch"') '
+      echo -n '\['"$color1"'\]'"$ansi"''"$branch"' '
     fi
   fi
 }
@@ -114,5 +133,14 @@ function report_status() {
 }
 
 #export _PS1="\[$RED\]\u\[$NC\]@\[$YELLOW\]\h \[$yellow\]\w | \[$GREEN\]\V\s \[$BLUE\]\d \@ \[$NC\]"
-export _PS1="\[$LGREEN\]\u \[$dgray\]at \[$YELLOW\]\h \[$dgray\]in \[$LMAGENTA\]\w "
-export PROMPT_COMMAND='export PS1="$TITLEBAR${_status}${_PS1}$(_git_prompt)\[$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 "
+export _PS2="\[$dgray\]"
+#export _PS1=" \u \`pwd\`"
+#export _PS2=""
+export PROMPT_COMMAND='export PS1="$TITLEBAR${_status}${_PS1}$(_git_prompt)\n${_PS2}\[$NC\]\$ "'
+
+. $HOME/.asdf/asdf.sh
+. $HOME/.asdf/completions/asdf.bash
diff --git a/vim/.vimrc b/vim/.vimrc
index 3859b42..f60d75f 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -10,6 +10,9 @@ set laststatus=2
 set wildmenu
 set scrolloff=5
 
+" turn on spell checker for all markdown files
+autocmd FileType markdown setlocal spell
+
 " stolen from https://shapeshed.com/vim-statuslines/
 "function! GitBranch()
 "  return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'")
@@ -38,21 +41,27 @@ set statusline=
 "set statusline+=%#PmenuSel#
 "set statusline+=%{StatuslineGit()}
 "set statusline+=%#LineNr#
-set statusline+=\%F
+set statusline+=\ %F
+set statusline+=\ %y
 set statusline+=\ %m
 set statusline+=\ %r
 set statusline+=%=
 set statusline+=%#CursorColumn#
-set statusline+=\ %L\ lines 
-set statusline+=\ %y
+"set statusline+=\ %L\ lines 
+"set statusline+=\ %y
 "set statusline+=\
 set statusline+=\ %{&fileencoding?&fileencoding:&encoding}
 "set statusline+=" >"
-set statusline+=\[%{&fileformat}\]
+set statusline+=\ [%{&fileformat}\]
 "set statusline+=" >"
 set statusline+=\ %p%%
 "set statusline+=" >"
-set statusline+=\ %l:%c 
+set statusline+=\ %l/%L:%c
+set statusline+=\ 
 
 
 hi StatusLine ctermbg=black
+hi Normal ctermbg=NONE
+let g:lightline = {
+                \ 'colorscheme': 'sitruuna',
+                            \ }
diff --git a/x/.xinitrc b/x/.xinitrc
index 0ea051b..d1712ce 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,25 +1,62 @@
+#!/bin/sh
 # executed by startx
 # for use when dingo is DOCKED
 
-cd ~ &
+# load xinitrc.d stuff
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+  xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+  xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+  xrdb -merge "$userresources"
+fi
+
+if [ -f "$usermodmap" ]; then
+  xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+  for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+# open picom compositor
+picom -CG -I 0.1 -O 0.1 -o 0.0 --backend xrender --vsync --menu-opacity 1.0 & 
 
 # set up monitors
-fixscreen &
+#fixscreen
+sh ~/.screenlayout/screenlayout.sh &
 
 # set default audio device to be dock audio jack
-pacmd set-default-sink 1
+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 &
 
 # set up wallpapers
-#wallpapers &
+wallpapers &
 
 # start notifications daemon
 notification-daemon &
 
 # apply Xresources
-xrdb -merge ~/.Xresources 
+xrdb -merge ~/.Xresources
 
 # make cursor disappear after a couple of seconds
 unclutter --idle 4 -root &
@@ -27,5 +64,10 @@ unclutter --idle 4 -root &
 # enable numlock
 numlockx &
 
+# turn off wifi, force ethernet
+nmcli radio wifi off &
+
 # start dwm
-redshift -O3500; xset r rate 300 50; exec dwm
+xset r rate 300 50 &
+#exec /home/bryson/bin/startdwm
+exec dwm
diff --git a/x/.xinitrc-not-docked b/x/.xinitrc-not-docked
index ca365f4..f01940b 100644
--- a/x/.xinitrc-not-docked
+++ b/x/.xinitrc-not-docked
@@ -1,16 +1,54 @@
 # executed by startx-not-docked
 # for use when dingo is NOT docked
 
-cd ~
+# load xinitrc.d stuff
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+  xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+  xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+  xrdb -merge "$userresources"
+fi
+
+if [ -f "$usermodmap" ]; then
+  xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+  for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+# start picom compositor
+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 &
 
 # set default audio device to be laptop speakers
-pacmd set-default-sink 1
+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/'10-6-Server.jpg'  &
+nitrogen --head=0 --set-zoom-fill ~/Pictures/Wallpapers/yosemite-edit.jpg  &
 
 # start notifications daemon
 notification-daemon &
@@ -21,5 +59,11 @@ xrdb -merge ~/.Xresources
 # make cursor disappear after a couple of seconds
 unclutter --idle 4 -root &
 
+# turn tearfree on
+xrandr --output eDP --auto --set TearFree on &
+
+# make sure wifi is back on
+nmcli radio wifi on &
+
 # start dwm
 redshift -O3500; xset r rate 300 50; exec dwm