diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix
index d7e7319e..4387b8ed 100644
--- a/hosts/daedalus/default.nix
+++ b/hosts/daedalus/default.nix
@@ -125,10 +125,9 @@ with lib.my;
         ../../hm-modules/tmux
         ../../hm-modules/vscode
         ../../hm-modules/xonsh
-        ../../cli.nix
-        ../../files.nix
+        ../../hm-modules/cli.nix
+        ../../hm-modules/files.nix
       ];
-      ragon.nvim.maximal = false;
 
       home.file.".hammerspoon/init.lua".source =
         let
@@ -160,14 +159,8 @@ with lib.my;
       home.packages = with pkgs; [
         mosh
 
-        nodePackages.pyright
-        nodejs
-
-        cmake
-
         pandoc
         micromamba
-
       ];
 
     };
diff --git a/hosts/ds9/backup.nix b/hosts/ds9/backup.nix
index 054ca9fa..f714ba27 100644
--- a/hosts/ds9/backup.nix
+++ b/hosts/ds9/backup.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ config, pkgs, lib, ... }: {
   ragon.agenix.secrets."ds9OffsiteBackupSSH" = { };
   ragon.agenix.secrets."ds9SyncoidHealthCheckUrl" = { };
   ragon.agenix.secrets."gatebridgeHostKeys" = { };
diff --git a/hosts/ds9/default.nix b/hosts/ds9/default.nix
index 3f339af6..2b604390 100644
--- a/hosts/ds9/default.nix
+++ b/hosts/ds9/default.nix
@@ -184,15 +184,27 @@ in
     '';
   };
 
+  home-manager.users.ragon = { pkgs, lib, inputs, config, ...}: {
+      imports = [
+        ../../hm-modules/nvim
+        ../../hm-modules/tmux
+        ../../hm-modules/xonsh
+        ../../hm-modules/cli.nix
+        ../../hm-modules/files.nix
+      ];
+      ragon.xonsh.enable = true;
+
+      programs.home-manager.enable = true;
+      home.stateVersion = "23.11";
+  };
+
   ragon = {
     agenix.secrets."ionos" = { };
-    cli.enable = true;
     user.enable = true;
     persist.enable = true;
     persist.extraDirectories = [ "/var/lib/syncthing" config.services.plex.dataDir "/var/lib/minecraft" "/var/lib/bzzt" ];
 
     services = {
-      docker.enable = true;
       samba.enable = true;
       samba.shares = {
         TimeMachine = {
@@ -220,7 +232,6 @@ in
       tailscale.enable = true;
       tailscale.exitNode = true;
       tailscale.extraUpCommands = "--advertise-routes=10.0.0.0/16";
-      grafana.enable = true;
       libvirt.enable = true;
       paperless.enable = true;
     };
diff --git a/nixos-modules/user/default.nix b/nixos-modules/user/default.nix
index 085caf3d..e53d31ea 100644
--- a/nixos-modules/user/default.nix
+++ b/nixos-modules/user/default.nix
@@ -49,6 +49,8 @@ in
   config = lib.mkIf cfg.enable {
     # Let ~/bin/ be in $PATH
     environment.homeBinInPath = true;
+    ragon.persist.extraDirectories = [ "/home/${username}" ];
+    programs.zsh.enable = true;
 
     # Define my user account
     users.extraUsers.${username} = {