diff --git a/nvim/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua
index 2d16352..012f971 100644
--- a/nvim/lua/plugins/mason.lua
+++ b/nvim/lua/plugins/mason.lua
@@ -61,12 +61,16 @@ return {
         -- vim.lsp.set_log_level("debug")
 
         vim.lsp.config('gdscript', {
+            capabilities = capabilities,
+            on_attach = on_attach,
             flags = {
                 debounce_text_changes = 100,
             }
         })
 
         vim.lsp.config('lua_ls', {
+            capabilities = capabilities,
+            on_attach = on_attach,
             settings = {
                 Lua = {
                     diagnostics = {
@@ -79,6 +83,8 @@ return {
         })
 
         vim.lsp.config('pylsp', {
+            capabilities = capabilities,
+            on_attach = on_attach,
             settings = {
                 pylsp = {
                     plugins = {
@@ -101,6 +107,8 @@ return {
         })
 
         vim.lsp.config("rust_analyzer", {
+            capabilities = capabilities,
+            on_attach = on_attach,
             settings = {
                 ['rust_analyzer'] = {
                     check = {
diff --git a/zshrc b/zshrc
index 4cd3967..8a0245b 100644
--- a/zshrc
+++ b/zshrc
@@ -104,6 +104,13 @@ for file in $include_files; do
     source $file
 done
 
+# Custom rsync move function that also removes empty directories that have their contents removed
+# NOTE: This will delete *any* empty directories in the CWD
+rmv() {
+    rsync -avzhP --remove-source-files --ignore-existing "${@:1:$#-1}" "${@:$#}" && \
+        find ./* -depth -type d -empty -exec rmdir "{}" \;
+}
+
 # NVM required config
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm