diff --git a/features/docker.nix b/features/docker.nix
index 9a297a4..2e519bc 100644
--- a/features/docker.nix
+++ b/features/docker.nix
@@ -1,4 +1,15 @@
 { _, ... }:
 {
-  virtualisation.docker.enable = true;
+  virtualisation.docker = {
+    enable = true;
+
+    rootless = {
+      enable = true;
+      setSocketVariable = true;
+
+      daemon.settings = {
+        data-root = "$XDG_DATA_HOME/docker";
+      };
+    };
+  };
 }
diff --git a/features/sudo.nix b/features/sudo.nix
new file mode 100644
index 0000000..9639f11
--- /dev/null
+++ b/features/sudo.nix
@@ -0,0 +1,7 @@
+{ _, ... }:
+{
+  security.sudo = {
+    enable = true;
+    wheelNeedsPassword = true;
+  };
+}
diff --git a/hosts/nero/configuration.nix b/hosts/nero/configuration.nix
index db9f87c..029b669 100644
--- a/hosts/nero/configuration.nix
+++ b/hosts/nero/configuration.nix
@@ -46,10 +46,6 @@
           appId = "com.vysp3r.ProtonPlus";
           origin = "flathub";
         }
-        {
-          appId = "io.mpv.Mpv";
-          origin = "flathub";
-        }
         {
           appId = "org.ghidra_sre.Ghidra";
           origin = "flathub";
diff --git a/hosts/nero/hardware.nix b/hosts/nero/hardware.nix
index a2d842c..6042daa 100644
--- a/hosts/nero/hardware.nix
+++ b/hosts/nero/hardware.nix
@@ -54,7 +54,7 @@
     };
 
     "/mnt/fileshare" = {
-      device = "frank@192.168.1.181:/mnt/shares";
+      device = "frank@vergil.cfl.rr.com:/mnt/shares";
       fsType = "sshfs";
       options = [
         "uid=1000"
diff --git a/hosts/shared/nixos-pc.nix b/hosts/shared/nixos-pc.nix
index 081d746..564e265 100644
--- a/hosts/shared/nixos-pc.nix
+++ b/hosts/shared/nixos-pc.nix
@@ -13,6 +13,7 @@
     ../../features/avahi.nix
     ../../features/systemd-boot.nix
     ../../features/i18n.nix
+    ../../features/sudo.nix
     ./nix-package-manager.nix
   ];
 
@@ -172,7 +173,6 @@
       "wheel"
       "input"
       "video"
-      "docker"
       "uinput"
     ];
   };
diff --git a/hosts/shared/nixos-server.nix b/hosts/shared/nixos-server.nix
index 9dc4d83..f7f16a1 100644
--- a/hosts/shared/nixos-server.nix
+++ b/hosts/shared/nixos-server.nix
@@ -11,6 +11,7 @@
     ../../features/avahi.nix
     ../../features/systemd-boot.nix
     ../../features/i18n.nix
+    ../../features/sudo.nix
     ./nix-package-manager.nix
   ];
 
@@ -72,7 +73,6 @@
     extraGroups = [
       "wheel"
       "libvirtd"
-      "docker"
     ];
   };
 
diff --git a/hosts/vergil/configuration.nix b/hosts/vergil/configuration.nix
index 672f54e..f96161c 100644
--- a/hosts/vergil/configuration.nix
+++ b/hosts/vergil/configuration.nix
@@ -31,11 +31,13 @@
     };
   };
 
-  users.users."remotebuild" = {
-    isSystemUser = true;
-    group = "remotebuild";
-    useDefaultShell = true;
-    openssh.authorizedKeys.keyFiles = [ ./remotebuild.pub ];
+  users.users = {
+    "remotebuild" = {
+      isSystemUser = true;
+      group = "remotebuild";
+      useDefaultShell = true;
+      openssh.authorizedKeys.keyFiles = [ ./remotebuild.pub ];
+    };
   };
 
   users.groups.remotebuild = { };
@@ -86,7 +88,7 @@
     jellyfin = {
       enable = true;
       openFirewall = true;
-      user = "frank";
+      user = "jellyfin";
     };
   };