From 1803bb62701c3c9bd6a95672066fc960ef16f2e3 Mon Sep 17 00:00:00 2001
From: agryphus <agryphus@gmail.com>
Date: Mon, 14 Aug 2023 17:20:55 -0400
Subject: [PATCH] Recent config stuff

---
 .config/X11/xinitrc |  8 +++++---
 .config/zsh/.zshenv | 13 ++++++++++---
 .config/zsh/.zshrc  | 14 +++++++++-----
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
index 2d333b0..32358bd 100644
--- a/.config/X11/xinitrc
+++ b/.config/X11/xinitrc
@@ -1,7 +1,9 @@
-feh --no-fehbg --bg-fill ~/.config/wallpaper
+xrandr --setprovideroutputsource modesetting NVIDIA-0
+xrandr --auto
+feh --bg-scale --no-fehbg ~/.config/wallpaper.jpg
 xset r rate 300 50
-killall picom
 picom -b
 sxhkd &
-dwm
+exec dwm
+dwmblocks
 
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index c62d4c7..9f8d0b0 100644
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -2,6 +2,10 @@
 
 source /opt/miniconda3/etc/profile.d/conda.sh
 
+export BROWSER='firefox'
+export EDITOR='nvim'
+export TERMINAL='st'
+
 # Spring cleaning
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
@@ -11,17 +15,20 @@ export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/config"
 export EMACS_INIT_FILE="$XDG_CONFIG_HOME/emacs"
 export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc"
 export GIT_CONFIG="$XDG_CONFIG_HOME/git/config"
+export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
+export XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc"
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export NPM_CONFIG_PREFIX="$XDG_CACHE_HOME/npm"
 export TEXMFVAR=$XDG_CACHE_HOME/texlive/texmf-var
-export VIMINFO="$XDG_STATE_HOME/vim/viminfo"
 export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
+export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority"
+
+# Defines a vimrc
+export VIMINIT='let $MYVIMRC = !has("nvim") ? "$XDG_CONFIG_HOME/vim/vimrc" : "$XDG_CONFIG_HOME/nvim/init.lua" | so $MYVIMRC'
 
-export BROWSER='thorium-browser'
-export EDITOR='nvim'
 
 export SUDO_PROMPT="
                   ⢀⡔⣻⠁ ⢀⣀⣀⡀        
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 9419ada..abe42bc 100755
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,16 +1,20 @@
+# The rice repo
+alias config='git --git-dir $HOME/repos/archrice/ --work-tree=$HOME'
+
+# Useful defaults
 alias ll='ls -l'
 alias la='ls -A'
 alias l='ls -CF'
 alias python='python3'
+alias wget='wget --hsts-file="$XDG_CACHE_HOME/wget-hsts"'
+
+# Some wsl stuff
 alias clip=/mnt/c/Windows/System32/clip.exe
-alias startx="export DISPLAY=$(cat /etc/resolv.conf | grep nameserver | awk '{print $2}'):0.0 && \
+alias vcxsrv='/mnt/c/Program\ Files/VcXsrv/vcxsrv.exe :0 -clipboard -wgl -keyhook'
+alias wsl_startx="export DISPLAY=$(cat /etc/resolv.conf | grep nameserver | awk '{print $2}'):0.0 && \
         export LD_LIBRARY_PATH=/usr/lib/wsl/lib && \
         export LIBGL_ALWAYS_SOFTWARE=1 && \
         . ~/.config/X11/xinitrc"
-alias vcxsrv='/mnt/c/Program\ Files/VcXsrv/vcxsrv.exe :0 -clipboard -wgl -keyhook'
-alias wget='wget --hsts-file="$XDG_CACHE_HOME/wget-hsts"'
-
-alias config='git --git-dir $HOME/repos/archrice/ --work-tree=$HOME'
 
 # Print out all colors
 alias colors='for i in {0..255}; do print -Pn "%K{$i}  %k%F{$i}${(l:3::0:)i}%f " ${${(M)$((i%6)):#3}:+$"\n"}; done'