diff --git a/systems/aarch64-darwin/canis/home.nix b/homes/aarch64-darwin/marshall@canis/default.nix
similarity index 95%
rename from systems/aarch64-darwin/canis/home.nix
rename to homes/aarch64-darwin/marshall@canis/default.nix
index d812a30..e5a7f2e 100644
--- a/systems/aarch64-darwin/canis/home.nix
+++ b/homes/aarch64-darwin/marshall@canis/default.nix
@@ -10,6 +10,11 @@
     nix-colors.homeManagerModules.default
   ];
 
+  snowfallorg.user = {
+    enable = true;
+    name = "marshall";
+  };
+
   home = {
     packages = with pkgs;
       [
diff --git a/systems/aarch64-darwin/canis/wezterm.lua b/homes/aarch64-darwin/marshall@canis/wezterm.lua
similarity index 100%
rename from systems/aarch64-darwin/canis/wezterm.lua
rename to homes/aarch64-darwin/marshall@canis/wezterm.lua
diff --git a/systems/x86_64-linux/navis/home.nix b/homes/x86_64-linux/marshall@navis/default.nix
similarity index 92%
rename from systems/x86_64-linux/navis/home.nix
rename to homes/x86_64-linux/marshall@navis/default.nix
index 5779f87..2305973 100644
--- a/systems/x86_64-linux/navis/home.nix
+++ b/homes/x86_64-linux/marshall@navis/default.nix
@@ -4,8 +4,6 @@
   inputs,
   ...
 }: {
-  colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
-
   imports = with inputs; [
     catppuccin.homeManagerModules.catppuccin
     chaotic.homeManagerModules.default
@@ -17,6 +15,13 @@
     ./screenshot
   ];
 
+  snowfallorg.user = {
+    enable = true;
+    name = "marshall";
+  };
+
+  colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
+
   home = {
     packages = with pkgs;
       [
@@ -33,7 +38,6 @@
         libnotify
         lm_sensors
         loupe
-        mpv
         neovide
         playerctl
         prismlauncher
@@ -139,9 +143,15 @@
       extraConfig.credential.helper = "libsecret";
       signing.key = "0FF5B8826803F895";
     };
+
+    mpv = {
+      enable = true;
+      scripts = [pkgs.mpvScripts.uosc];
+      catppuccin.enable = true;
+    };
   };
 
   systemd.user.startServices = "sd-switch";
 
-  nix.package = lib.mkForce pkgs.nixSuper;
+  nix.package = lib.mkForce inputs.nix-super.packages.${pkgs.system}.default;
 }
diff --git a/systems/x86_64-linux/navis/hyprland/default.nix b/homes/x86_64-linux/marshall@navis/hyprland/default.nix
similarity index 100%
rename from systems/x86_64-linux/navis/hyprland/default.nix
rename to homes/x86_64-linux/marshall@navis/hyprland/default.nix
diff --git a/systems/x86_64-linux/navis/hyprland/rofi.nix b/homes/x86_64-linux/marshall@navis/hyprland/rofi.nix
similarity index 100%
rename from systems/x86_64-linux/navis/hyprland/rofi.nix
rename to homes/x86_64-linux/marshall@navis/hyprland/rofi.nix
diff --git a/systems/x86_64-linux/navis/hyprland/services.nix b/homes/x86_64-linux/marshall@navis/hyprland/services.nix
similarity index 100%
rename from systems/x86_64-linux/navis/hyprland/services.nix
rename to homes/x86_64-linux/marshall@navis/hyprland/services.nix
diff --git a/systems/x86_64-linux/navis/hyprland/wall.mp4 b/homes/x86_64-linux/marshall@navis/hyprland/wall.mp4
similarity index 100%
rename from systems/x86_64-linux/navis/hyprland/wall.mp4
rename to homes/x86_64-linux/marshall@navis/hyprland/wall.mp4
diff --git a/systems/x86_64-linux/navis/hyprland/waybar.nix b/homes/x86_64-linux/marshall@navis/hyprland/waybar.nix
similarity index 100%
rename from systems/x86_64-linux/navis/hyprland/waybar.nix
rename to homes/x86_64-linux/marshall@navis/hyprland/waybar.nix
diff --git a/systems/x86_64-linux/navis/screenshot/clipboard.svg b/homes/x86_64-linux/marshall@navis/screenshot/clipboard.svg
similarity index 100%
rename from systems/x86_64-linux/navis/screenshot/clipboard.svg
rename to homes/x86_64-linux/marshall@navis/screenshot/clipboard.svg
diff --git a/systems/x86_64-linux/navis/screenshot/default.nix b/homes/x86_64-linux/marshall@navis/screenshot/default.nix
similarity index 100%
rename from systems/x86_64-linux/navis/screenshot/default.nix
rename to homes/x86_64-linux/marshall@navis/screenshot/default.nix
diff --git a/systems/x86_64-linux/navis/screenshot/screenshot.rasi b/homes/x86_64-linux/marshall@navis/screenshot/screenshot.rasi
similarity index 100%
rename from systems/x86_64-linux/navis/screenshot/screenshot.rasi
rename to homes/x86_64-linux/marshall@navis/screenshot/screenshot.rasi
diff --git a/systems/x86_64-linux/navis/wezterm.lua b/homes/x86_64-linux/marshall@navis/wezterm.lua
similarity index 100%
rename from systems/x86_64-linux/navis/wezterm.lua
rename to homes/x86_64-linux/marshall@navis/wezterm.lua
diff --git a/systems/aarch64-darwin/canis/default.nix b/systems/aarch64-darwin/canis/default.nix
index 6e94744..2778ba1 100644
--- a/systems/aarch64-darwin/canis/default.nix
+++ b/systems/aarch64-darwin/canis/default.nix
@@ -109,16 +109,6 @@
     };
   };
 
-  snowfallorg.users.marshall = {
-    create = true;
-
-    home = {
-      enable = true;
-
-      config = import ./home.nix {inherit lib pkgs inputs;};
-    };
-  };
-
   users.users.marshall = {
     name = "marshall";
     home = "/Users/marshall";
diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix
index 9d9951e..4188bc8 100644
--- a/systems/x86_64-linux/navis/default.nix
+++ b/systems/x86_64-linux/navis/default.nix
@@ -455,14 +455,10 @@ with lib // pkgs // inputs; {
   snowfallorg.users.marshall = {
     create = true;
     admin = true;
-
-    home = {
-      enable = true;
-
-      config = import ./home.nix {inherit lib pkgs inputs;};
-    };
   };
 
+  home-manager.useGlobalPkgs = true;
+
   hardware = {
     bluetooth.enable = true;
     i2c.enable = true;