diff --git a/common.nix b/common.nix
index a4922af..f38861e 100644
--- a/common.nix
+++ b/common.nix
@@ -60,6 +60,7 @@ with builtins;
 
   nixpkgs.config.packageOverrides = pkgs: {
     sudo = pkgs.sudo.override { withInsults = true; };
+    blender-hip = pkgs.blender-hip.override { spaceNavSupport = true; };
   };
   security.sudo.extraConfig = "Defaults insults";
 
@@ -117,19 +118,21 @@ with builtins;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
-    alsa.support32Bit = true;
+    #alsa.support32Bit = true;
     pulse.enable = true;
+    jack.enable = true;
   };
 
   hardware.bluetooth.enable = true;
   hardware.keyboard.uhk.enable = true;
 
+  hardware.spacenavd.enable = true;
+
   environment.sessionVariables = rec {
     QT_QPA_PLATFORMTHEME = "qt5ct";
     TERMINAL = "kitty";
   };
-
-  users.users.jade = {
+users.users.jade = {
     isNormalUser = true;
     extraGroups = [ "wheel" "input" "uinput" "libvirtd" ];
     packages = with pkgs; [
@@ -157,12 +160,15 @@ with builtins;
     firebird-emu obs-studio kdenlive openal
     mullvad mullvad-vpn
     sl lolcat ifuse
+    fspy spacenav-cube-example spacenavd libspnav
     cava appimage-run
     #prismlauncher
     gitg gnome-builder
     gpick qdirstat file whois ffmpeg_5 scribus p7zip file nmap cmatrix tree socat libreoffice
   ];
 
+  programs.noisetorch.enable = true;
+
   environment.pathsToLink = [
     "/share/nix-direnv"
   ];
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 062f258..8eacbd2 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -70,6 +70,7 @@ in with lib; {
                 { command = "pkill pa-applet; pa-applet"; always = true; } 
                 { command = "pkill oneko; oneko -tofocus -tora -position +-1+5 -fg palevioletred3 -bg pink -name 'Rose the desktop kitty'"; always = true; }
                 { command = "mullvad-vpn --background"; always = true; }
+                { command = "pkill polybar; polybar"; always = true; }
               ];
             # }}}
             # Assigns {{{
@@ -247,7 +248,7 @@ in with lib; {
         services.polybar = {
           enable = true;
 
-          script = "pkill polybar; polybar &";
+          script = "";
           settings = {
             colors = {
               background = "#282828";
@@ -279,7 +280,7 @@ in with lib; {
               cursor-click = "pointer";
               cursor-scroll = "ns-resize";
               enable-ipc = true;
-              wm-restack = "i3wm";
+              wm-restack = "i3";
               override-redirect = false;
             };