diff --git a/config/.config/devilspie2/devilspie2.lua b/config/.config/devilspie2/devilspie2.lua
index 199a9f1..f1d9a74 100644
--- a/config/.config/devilspie2/devilspie2.lua
+++ b/config/.config/devilspie2/devilspie2.lua
@@ -1,48 +1,50 @@
 --- Emacs: right half
-if (get_application_name() == "Emacs-gtk+x11") then
+win_class = get_class_instance_name()
+
+if win_class == "emacs" or win_class == "Emacs" then
   os.execute("sleep 0.4")
-  set_window_position(1720, 0, 0)
+  set_window_position(1720, 0)
   set_window_size(1720, 1391)
 end
 
 --- calibre: left half
 if (get_application_name() == "calibre") then
-  set_window_position(0, 0, 0)
+  set_window_position(0, 0)
   set_window_size(1720, 1391)
 end
 
 --- Proton Mail Bridge: left half
 if (get_application_name() == "Proton Mail Bridge") then
-  set_window_position(0, 0, 0)
+  set_window_position(0, 0)
   set_window_size(1720, 1391)
 end
 
 --- VLC media player: left half
 if (get_application_name() == "VLC media player") then
-  set_window_position(0, 0, 0)
+  set_window_position(0, 0)
   set_window_size(1720, 1391)
 end
 
 --- Wireshark: left half
 if (get_application_name() == "The Wireshark Network Analyzer") then
-  set_window_position(0, 0, 0)
+  set_window_position(0, 0)
   set_window_size(1720, 1391)
 end
 
 --- Discord: left half
 if (get_application_name() == "Discord") then
-  set_window_position(0, 0, 0)
+  set_window_position(0, 0)
   set_window_size(1720, 1391)
 end
 
 --- Podman Desktop: right half
 if (get_application_name() == "Podman Desktop") then
-  set_window_position(1720, 0, 0)
+  set_window_position(1720, 0)
   set_window_size(1720, 1391)
 end
 
 --- Lagrange: left half
 if (get_application_name() == "Lagrange") then
-  set_window_position(0, 0, 0)
+  set_window_position(0, 0)
   set_window_size(1720, 1391)
 end
diff --git a/just/.justfile b/just/.justfile
index 649d3dd..975bd1b 100644
--- a/just/.justfile
+++ b/just/.justfile
@@ -20,7 +20,6 @@ deploy-dotfiles:
     cp -rfv {{dotfiles_repo}}/doom/.doom.d {{homedir}}
     cp -fv {{dotfiles_repo}}/zsh/.zshrc {{homedir}}
     cp -rfv {{dotfiles_repo}}/zsh/.zshrc.d {{homedir}}
-    cp -fv {{dotfiles_repo}}/zsh/.zshenv {{homedir}}
     cp -rfv {{dotfiles_repo}}/config/.config/bat {{configdir}}
     cp -rfv {{dotfiles_repo}}/config/.config/devilspie2 {{configdir}}
     cp -rfv {{dotfiles_repo}}/config/.config/git {{configdir}}
@@ -33,7 +32,6 @@ save-dotfiles:
     cp -rfv {{homedir}}/.doom.d {{dotfiles_repo}}/doom/
     cp -fv {{homedir}}/.zshrc {{dotfiles_repo}}/zsh/
     cp -rfv {{homedir}}/.zshrc.d {{dotfiles_repo}}/zsh/
-    cp -fv {{homedir}}/.zshenv {{dotfiles_repo}}/zsh/
     cp -rfv {{configdir}}/bat {{dotfiles_repo}}/config/.config/
     cp -rfv {{configdir}}/devilspie2 {{dotfiles_repo}}/config/.config/
     cp -rfv {{configdir}}/git {{dotfiles_repo}}/config/.config/
@@ -46,7 +44,6 @@ clean-dotfiles:
     rm -rfv {{homedir}}/.doom.d
     rm -fv {{homedir}}/.zshrc
     rm -rfv {{homedir}}/.zshrc.d
-    rm -fv {{homedir}}/.zshenv
     rm -rfv {{configdir}}/bat
     rm -rfv {{configdir}}/devilspie2
     rm -rfv {{configdir}}/git
@@ -73,20 +70,29 @@ go-tools:
     go install golang.org/x/tools/cmd/guru@latest
 
 python-tools:
-    pipx install --include-deps ansible
-    pipx install black
-    pipx install pyflakes
-    pipx install isort
-    pipx install pipenv
-    pipx install nose
-    pipx install pytest
+    pipx install --include-deps ansible --force
+    pipx install black --force
+    pipx install bpython --force
+    pipx install pyflakes --force
+    pipx install isort --force
+    pipx install pipenv --force
+    pipx install nose --force
+    pipx install pytest --force
+    pipx install uv --force
+    pipx install get-def --force
+    pipx install print-links --force
+    pipx install print-wp-sources --force
+    pipx inject bpython requests
+    pipx inject bpython rich
+    pipx inject bpython ollama
+    pipx inject bpython qbittorrent-api
 
 webdev-tools:
     sudo npm install -g @catppuccin/inkcat
     sudo npm install -g prettier
     sudo npm install -g js-beautify
     sudo npm install -g stylelint
-    sudo dnf install -y tidy
+    sudo dnf install -y tidy || sudo apt install -y tidy
 
 rustup:
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
@@ -102,3 +108,22 @@ devilspie2:
     cd dsalt-devilspie2*
     make
     sudo make install
+    rm -rf "$filename" dsalt-devilspie2*
+
+tailscale:
+    curl -fsSL https://tailscale.com/install.sh | sh
+    sudo tailscale up
+
+neovim:
+    sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
+        https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+
+    mkdir -p "${HOME}/.config/nvim"
+    wget https://files.hyperreal.coffee/init.vim -O "${HOME}/.config/nvim/init.vim"
+
+neovim-root:
+    sudo sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
+        https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+
+    sudo mkdir -p /root/.config/nvim
+    sudo wget https://files.hyperreal.coffee/init.vim -O /root/.config/nvim/init.vim
diff --git a/zsh/.zshenv b/zsh/.zshenv
deleted file mode 100644
index 2626033..0000000
--- a/zsh/.zshenv
+++ /dev/null
@@ -1,2 +0,0 @@
-eval "$(starship init zsh)"
-source <(fzf --zsh)
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 8666097..a0128e0 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -45,7 +45,6 @@ zplug load
 # -----------------------------------------------------------------------------
 # ENVIRONMENT VARS
 # -----------------------------------------------------------------------------
-export PATH="${HOME}/.config/emacs/bin:${PATH}"
 export PAGER="less -FRX"
 export MANWIDTH="88"
 export MANROFFOPT="-c"
@@ -89,6 +88,12 @@ export LANG="en_US.UTF-8"
 # Manpages
 export MANPATH="${MANPATH:-/usr/share/man:/usr/local/share/man}"
 
+# Set PATH
+export PATH="/bin:/sbin:/usr/local/bin"
+
+# Add doom emacs util to path
+export PATH="${HOME}/.config/emacs/bin:${PATH}"
+
 # Add ~/.local/bin to PATH
 export PATH="${HOME}/.local/bin:${PATH}"
 
@@ -98,6 +103,18 @@ export PATH="${HOME}/bin:${PATH}"
 # Add ~/go/bin to PATH
 export PATH="${HOME}/go/bin:${PATH}"
 
+# Add ~/.cargo/bin to PATH
+export PATH="${HOME}/.cargo/bin:${PATH}"
+
+# Linuxbrew
+eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+
+# starship.rs
+eval "$(starship init zsh)"
+
+# fzf
+source <(fzf --zsh)
+
 # Automatically remove duplicates from these arrays
 typeset -gU path cdpath manpath fpath
 
diff --git a/zsh/.zshrc.d/aliases.zsh b/zsh/.zshrc.d/aliases.zsh
index 3709a11..8089417 100644
--- a/zsh/.zshrc.d/aliases.zsh
+++ b/zsh/.zshrc.d/aliases.zsh
@@ -15,6 +15,7 @@ if [ -e "/etc/debian_version" ]; then
     alias agar="sudo apt autoremove"
 fi
 
+# Aliases for DNF
 if [ -e "/etc/redhat-release" ]; then
     alias dnfc='sudo dnf clean all'
     alias dnfgi='sudo dnf groupinstall'
@@ -55,6 +56,15 @@ alias del='/bin/rm -i'
 # Display zsh functions with bat
 alias zfun='functions | bat -l zsh'
 
+# Use bat
+if [ -f "$(command -v batcat)" ]; then
+    alias cat='batcat -p'
+fi
+
+if [ -f "$(command -v bat)" ]; then
+    alias cat='bat -p'
+fi
+
 # Assorted global aliases
 alias -g H='| head'
 alias -g T='| tail'