diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix
index 88578e8..2a76a48 100755
--- a/modules/home/programs/default.nix
+++ b/modules/home/programs/default.nix
@@ -8,13 +8,8 @@
   config,
   home-manager,
   ...
-}: let
-  desktop = host == "onagesson";
-  desktop_modules =
-    if desktop
-    then [(import ./gaming)]
-    else [];
-in {
+}:
+{
   imports =
     [(import ./btop.nix)]
     ++ [(import ./yazi.nix)]
@@ -28,5 +23,5 @@ in {
     ++ [(import ./password-store.nix)]
     ++ [(import ./autojump.nix)]
     ++ [(import ./firefox.nix)]
-    ++ desktop_modules;
+    ++ [(import ./nixvim)];
 }
diff --git a/modules/home/programs/firefox.nix b/modules/home/programs/firefox.nix
index 661a927..457b564 100755
--- a/modules/home/programs/firefox.nix
+++ b/modules/home/programs/firefox.nix
@@ -83,6 +83,17 @@
             url = "https://www.nerdfonts.com/cheat-sheet";
           }
         ];
+        extensions = with config.nur.repos.rycee.firefox-addons; [
+          darkreader
+          adnauseam
+          cookie-autodelete
+          disconnect
+          firefox-color
+          vimium
+          firenvim
+          privacy-badger
+          new-tab-override
+        ];
         extraConfig = ''
            "browser.startup.homepage" = "${self}/glasshouse-desktop/home/firefox/homepage.html";
            "browser.active_color" = "#EE0000";
diff --git a/modules/sys/software/nixvim/autocmd.nix b/modules/home/programs/nixvim/autocmd.nix
similarity index 100%
rename from modules/sys/software/nixvim/autocmd.nix
rename to modules/home/programs/nixvim/autocmd.nix
diff --git a/modules/sys/software/nixvim/default.nix b/modules/home/programs/nixvim/default.nix
similarity index 100%
rename from modules/sys/software/nixvim/default.nix
rename to modules/home/programs/nixvim/default.nix
diff --git a/modules/sys/software/nixvim/keymaps.nix b/modules/home/programs/nixvim/keymaps.nix
similarity index 100%
rename from modules/sys/software/nixvim/keymaps.nix
rename to modules/home/programs/nixvim/keymaps.nix
diff --git a/modules/sys/software/nixvim/options.nix b/modules/home/programs/nixvim/options.nix
similarity index 100%
rename from modules/sys/software/nixvim/options.nix
rename to modules/home/programs/nixvim/options.nix
diff --git a/modules/sys/software/nixvim/plugins/alpha.nix b/modules/home/programs/nixvim/plugins/alpha.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/alpha.nix
rename to modules/home/programs/nixvim/plugins/alpha.nix
diff --git a/modules/sys/software/nixvim/plugins/barbar.nix b/modules/home/programs/nixvim/plugins/barbar.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/barbar.nix
rename to modules/home/programs/nixvim/plugins/barbar.nix
diff --git a/modules/sys/software/nixvim/plugins/cmp.nix b/modules/home/programs/nixvim/plugins/cmp.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/cmp.nix
rename to modules/home/programs/nixvim/plugins/cmp.nix
diff --git a/modules/sys/software/nixvim/plugins/coq.nix b/modules/home/programs/nixvim/plugins/coq.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/coq.nix
rename to modules/home/programs/nixvim/plugins/coq.nix
diff --git a/modules/sys/software/nixvim/plugins/default.nix b/modules/home/programs/nixvim/plugins/default.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/default.nix
rename to modules/home/programs/nixvim/plugins/default.nix
diff --git a/modules/sys/software/nixvim/plugins/extra_plugins.nix b/modules/home/programs/nixvim/plugins/extra_plugins.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/extra_plugins.nix
rename to modules/home/programs/nixvim/plugins/extra_plugins.nix
diff --git a/modules/sys/software/nixvim/plugins/haskell.nix b/modules/home/programs/nixvim/plugins/haskell.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/haskell.nix
rename to modules/home/programs/nixvim/plugins/haskell.nix
diff --git a/modules/sys/software/nixvim/plugins/lsp.nix b/modules/home/programs/nixvim/plugins/lsp.nix
similarity index 97%
rename from modules/sys/software/nixvim/plugins/lsp.nix
rename to modules/home/programs/nixvim/plugins/lsp.nix
index 9c67d55..0587e64 100755
--- a/modules/sys/software/nixvim/plugins/lsp.nix
+++ b/modules/home/programs/nixvim/plugins/lsp.nix
@@ -38,9 +38,6 @@
                 })
               '';
             };
-            completion = {
-              keyword_length = 3;
-            };
             window = {
               completion.border = "rounded";
             };
diff --git a/modules/sys/software/nixvim/plugins/lualine.nix b/modules/home/programs/nixvim/plugins/lualine.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/lualine.nix
rename to modules/home/programs/nixvim/plugins/lualine.nix
diff --git a/modules/sys/software/nixvim/plugins/nvim-tree.nix b/modules/home/programs/nixvim/plugins/nvim-tree.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/nvim-tree.nix
rename to modules/home/programs/nixvim/plugins/nvim-tree.nix
diff --git a/modules/sys/software/nixvim/plugins/plugins.nix b/modules/home/programs/nixvim/plugins/plugins.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/plugins.nix
rename to modules/home/programs/nixvim/plugins/plugins.nix
diff --git a/modules/sys/software/nixvim/plugins/telescope.nix b/modules/home/programs/nixvim/plugins/telescope.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/telescope.nix
rename to modules/home/programs/nixvim/plugins/telescope.nix
diff --git a/modules/sys/software/nixvim/plugins/vim-matchup.nix b/modules/home/programs/nixvim/plugins/vim-matchup.nix
similarity index 100%
rename from modules/sys/software/nixvim/plugins/vim-matchup.nix
rename to modules/home/programs/nixvim/plugins/vim-matchup.nix
diff --git a/modules/home/scripts/nix/rebuild.nix b/modules/home/scripts/nix/rebuild.nix
index 2f6af0d..9426056 100755
--- a/modules/home/scripts/nix/rebuild.nix
+++ b/modules/home/scripts/nix/rebuild.nix
@@ -6,15 +6,14 @@
 pkgs.writeShellApplication {
   name = "rebuild";
   text = ''
-    [ $# -eq 0 ] && echo "Usage: rebuild -h for home config, rebuild -s for sys config"
+    hooray() { scheck && runbg aplay ${self}/assets/sound/update.wav; }
+    damn() { scheck && runbg aplay ${self}/assets/sound/error.wav; }
+    [ $# -eq 0 ] && echo -e "\033[1;4;38;2;243;139;168mUsage\033[0m: rebuild -h for home config, rebuild -s for sys config" && damn && exit 1
     scheck && runbg aplay ${self}/assets/sound/nixswitch-start.wav
-    set -e
-    hooray() { scheck && runbg aplay ${self}/assets/sound/update.wav }
-    damn() { scheck && runbg aplay ${self}/assets/sound/error.wav }
     case $1 in
       "-h" ) if nh home switch -c ${host}Home "$FLAKEPATH"; then hooray; else damn; fi;;
       "-s" ) if nh os switch -H ${host} "$FLAKEPATH"; then hooray; else damn; fi;;
-      * ) echo "Usage: rebuild -h for home config, rebuild -s for sys config";;
+      * ) echo -e "\033[1;4;38;2;243;139;168mUsage\033[0m: rebuild -h for home config, rebuild -s for sys config";;
     esac
   '';
 }
diff --git a/modules/sys/software/default.nix b/modules/sys/software/default.nix
index 661b171..d6c276a 100755
--- a/modules/sys/software/default.nix
+++ b/modules/sys/software/default.nix
@@ -11,7 +11,6 @@
     [(import ./packages.nix)]
     ++ [(import ./programs.nix)]
     ++ [(import ./services.nix)]
-    ++ [(import ./nixvim)]
     ++ [(import ./virtualization.nix)]
     ++ [(import ./gaming)];
 }