i can clean these up sometime

6 files changed, 53 insertions, 31 deletions

diff --git a/alacritty/.alacritty.yml b/alacritty/.alacritty.yml
index c920a28..2eba706 100644
--- a/alacritty/.alacritty.yml
+++ b/alacritty/.alacritty.yml
@@ -18,31 +18,31 @@ window:
     padding:
         x: 10
         y: 10
-    opacity: 0.85
+    opacity: 0.9
 
 colors:
     primary:
-        background: '#121212'
+        background: '#282828'
     
     normal:
-        black:      '#1D1F21'
-        red:        '#DD0000'
-        green:      '#00CB07'
-        yellow:     '#F0E100'
-        blue:       '#0E60E5'
-        magenta:    '#980AE0'
-        cyan:       '#34D9FF'
-        white:      '#A8A8A8'
+        black:      '#282828'
+        red:        '#cc241d'
+        green:      '#98971a'
+        yellow:     '#d79921'
+        blue:       '#458588'
+        magenta:    '#b16286'
+        cyan:       '#689d6a'
+        white:      '#a89984'
 
     bright:
-        black:      '#434343'
-        red:        '#F77021'
-        green:      '#2EFF25'
-        yellow:     '#FDF259'
-        blue:       '#4F9BFF'
-        magenta:    '#EE3AD8'
-        cyan:       '#56FFFB'
-        white:      '#FFFFFF'
+        black:      '#928374'
+        red:        '#fb4934'
+        green:      '#b8bb26'
+        yellow:     '#fabd2f'
+        blue:       '#83a598'
+        magenta:    '#d3869b'
+        cyan:       '#8ec07c'
+        white:      '#ebdbb2'
 
 # Colors (Nord)
 #colors:
diff --git a/bash/.bashrc b/bash/.bashrc
index 57d68d1..6a536d5 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -39,6 +39,7 @@ alias todo='vim ~/TODO.md'
 alias iPhone='cd /home/bryson/Downloads/from-iPhone'
 
 alias gs='gs -dNOSAFER'
+alias django='python manage.py'
 
 alias smci='sudo make clean install'
 #discord_gpu() {
@@ -104,6 +105,13 @@ color2='\e[38;5;81m'
 color3='\e[38;5;77m'
 color4='\e[38;5;226m'
 
+function exit_code() {
+  local ERROR="$?"
+  if [[ ERROR -ne 0 ]]; then
+    echo -n ' \['"$RED"'\]'"$ERROR"''
+  fi
+}
+
 # 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`"
@@ -154,14 +162,15 @@ function get_random_ps1() {
 #export _PS1="\[$dgray\][ \[$GREEN\]\u\[$lgray\]@\[$LRED\]\h\[$dgray\] ] { \[$LCYAN\]\w\[$dgray\] } "
 # 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 _PS1="\[$lgray\][ \[\e[1m$color1\]\u\[$color2\]@\[$color3\]\h \[$color4\]\w \[\e[0m$lgray\]]"
+export _PS1="\[$lgray\][ \[$LBLUE\]\u\[$lcyan\]@\[$GREEN\]\h \[$LYELLOW\]\w \[$lgray\]]"
 export _PS2="\[$dgray\]"
 #export _PS1=" \u \`pwd\`"
 #export _PS2=""
-export PROMPT_COMMAND='export PS1="$TITLEBAR${_status}${_PS1}$(_git_prompt)\n${_PS2}\[$NC\]\$ "'
+export PROMPT_COMMAND='export PS1="$TITLEBAR${_status}${_PS1}$(exit_code)$(_git_prompt)\n${_PS2}\[$NC\]\$ "'
 
-. $HOME/.asdf/asdf.sh
-. $HOME/.asdf/completions/asdf.bash
+#. $HOME/.asdf/asdf.sh
+#. $HOME/.asdf/completions/asdf.bash
 
 # run startup script if tty
 if [[ $TERM == 'linux' && $(hostname) == 'dingo' ]]; then
@@ -174,7 +183,7 @@ if [[ $TERM == 'linux' && $(hostname) == 'dingo' ]]; then
   while read -rs -N 1 key; do
     case $key in
       d) startx ;;
-      n) nstartx ;;
+      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; ;;
       r) echo "Are you sure you want to reboot? (y/n)";
diff --git a/dwm b/dwm
-Subproject ab3f787725dc78cb9ae73c47d40e00be0a6b215
+Subproject 83ef57559adfeb584ff3fac36a2135283df0b44
diff --git a/vim/.vimrc b/vim/.vimrc
index 8e9dd3b..503c5d0 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,7 +1,9 @@
 set nocompatible
-colorscheme sitruuna
+let g:gruvbox_guisp_fallback = "bg"
+colorscheme gruvbox
+set bg:dark
 set mouse=a
-set tabstop=4 shiftwidth=4 expandtab
+set tabstop=2 softtabstop=2 shiftwidth=2 expandtab
 set linebreak
 set ttymouse=sgr
 set cursorline
@@ -10,10 +12,14 @@ set laststatus=2
 set wildmenu
 set scrolloff=5
 set incsearch
+set relativenumber
+set ttimeout ttimeoutlen=25
 
 " turn on spell checker for all markdown files
 autocmd FileType markdown setlocal spell
 
+execute pathogen#infect()
+
 " stolen from https://shapeshed.com/vim-statuslines/
 "function! GitBranch()
 "  return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'")
@@ -61,8 +67,15 @@ set statusline+=\ %l/%L:%c
 set statusline+=\ 
 
 
-hi StatusLine ctermbg=black
+"hi StatusLine ctermbg=black
 hi Normal ctermbg=NONE
 let g:lightline = {
-                \ 'colorscheme': 'sitruuna',
-                            \ }
+  \ 'colorscheme': 'gruvbox',
+  \ 'active': {
+  \   'left': [ [ 'mode', 'paste' ],
+  \             [ 'filename', 'readonly', 'modified' ] ],
+  \   'right':  [ [ 'lineinfo' ],
+  \               [ 'fileformat', 'fileencoding', 'filetype' ] ]
+  \ }, 
+  \ }
+set noshowmode
diff --git a/x/.xinitrc b/x/.xinitrc
index 007fdb0..9e54f9e 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -51,7 +51,7 @@ pacmd set-default-sink alsa_output.usb-0c76_USB_PnP_Audio_Device-00.analog-stere
 slstatus &
 
 # set up wallpapers
-wallpapers &
+wallpapers.sh &
 
 # start notifications daemon
 notification-daemon &
diff --git a/x/.xinitrc-not-docked b/x/.xinitrc-not-docked
index 9f20b82..8ad754c 100644
--- a/x/.xinitrc-not-docked
+++ b/x/.xinitrc-not-docked
@@ -44,14 +44,14 @@ picom -CG -I 0.1 -O 0.1 -o 0.0 --backend xrender --menu-opacity 1.0 &
 slstatus-not-docked &
 
 # reset backlight
-xbacklight -set 50 &
+xbacklight -set 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/yosemite-edit.jpg  &
+nitrogen --head=0 --set-zoom-fill ~/Pictures/Wallpapers/white-yosemite-edit.jpg  &
 
 # start notifications daemon
 notification-daemon &