diff --git a/README.md b/README.md
index 6cc5fd2..bf533e5 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # ROCKPro64-Server
 
-Jules' and Jimbo's flake for a ROCKPro64 server.
\ No newline at end of file
+A flake for Jules' ROCKPro64 server.
diff --git a/flake.lock b/flake.lock
index 2724239..936a597 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,27 +20,6 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1739757849,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "impermanence": {
       "locked": {
         "lastModified": 1737831083,
@@ -74,7 +53,6 @@
     "root": {
       "inputs": {
         "disko": "disko",
-        "home-manager": "home-manager",
         "impermanence": "impermanence",
         "nixpkgs": "nixpkgs",
         "unstable": "unstable"
diff --git a/flake.nix b/flake.nix
index 4f56ea5..237301a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,10 +7,6 @@
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = {
@@ -19,7 +15,6 @@
     unstable,
     impermanence,
     disko,
-    home-manager,
     ...
   }@inputs:
   {
diff --git a/system/accounts/users/custom/default.nix b/system/accounts/users/custom/default.nix
index ea5f7b8..486ed0e 100644
--- a/system/accounts/users/custom/default.nix
+++ b/system/accounts/users/custom/default.nix
@@ -1,9 +1,7 @@
-{ home-manager, ... }:
+{ ... }:
 {
   imports = [
     ./jules
     ./jimbo
-
-    home-manager.nixosModules.home-manager
   ];
 }
diff --git a/system/devices/disks/filesystems/default.nix b/system/devices/disks/filesystems/default.nix
index be9bebf..8ac3f5c 100644
--- a/system/devices/disks/filesystems/default.nix
+++ b/system/devices/disks/filesystems/default.nix
@@ -2,7 +2,6 @@
 {
   boot.supportedFilesystems = {
     btrfs = true;
-    ntfs = true;
     zfs = true;
   };
 
diff --git a/system/programs/default.nix b/system/programs/default.nix
index a1683bf..4c67d67 100644
--- a/system/programs/default.nix
+++ b/system/programs/default.nix
@@ -3,7 +3,6 @@
   imports = [
     ./doas
     ./git
-    ./home-manager
     ./shells
   ];
 }
diff --git a/system/programs/home-manager/default.nix b/system/programs/home-manager/default.nix
deleted file mode 100644
index ebd8e39..0000000
--- a/system/programs/home-manager/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ unstable, ... }:
-{
-  home-manager = {
-    useUserPackages = true;
-    backupFileExtension = "bak";
-    extraSpecialArgs = {
-      inherit
-        unstable
-        ;
-    };
-  };
-}
diff --git a/system/services/general/default.nix b/system/services/general/default.nix
index 4c8f377..2eac7f0 100644
--- a/system/services/general/default.nix
+++ b/system/services/general/default.nix
@@ -3,7 +3,6 @@
   imports = [
     ./apparmor
     ./earlyoom
-    ./libvirtd
     ./snowflake
     ./ssh
     ./userborn
diff --git a/system/services/general/libvirtd/default.nix b/system/services/general/libvirtd/default.nix
deleted file mode 100644
index a41cd73..0000000
--- a/system/services/general/libvirtd/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ pkgs, ... }:
-{
-  virtualisation.libvirtd = {
-    enable = false;
-    onBoot = "ignore";
-    onShutdown = "shutdown";
-    qemu = {
-      ovmf = {
-        enable = true;
-        packages = with pkgs; [ OVMFFull.fd ];
-      };
-      vhostUserPackages = with pkgs; [ virtiofsd ];
-      swtpm.enable = true;
-    };
-  };
-
-  # Needed to make NAT work
-  networking.firewall.trustedInterfaces = [
-    "virbr0"
-    "virbr1"
-  ];
-}
diff --git a/system/services/server/default.nix b/system/services/server/default.nix
index 4b92679..6ad7046 100644
--- a/system/services/server/default.nix
+++ b/system/services/server/default.nix
@@ -2,16 +2,16 @@
 {
   imports = [
     ./cfdyndns
-    ./fileserver
     ./forgejo
+    ./jellyfin
     ./mysql
+    ./nextcloud
+    ./nfs
     ./owncast
     ./transmission
     ./vaultwarden
     ./webserver
   ];
 
-  options.system = with lib; {
-    server.enable = mkEnableOption "Enable server apps and services";
-  };
+  options.system.server.enable = with lib; mkEnableOption "Enable server apps and services";
 }
diff --git a/system/services/server/fileserver/default.nix b/system/services/server/fileserver/default.nix
deleted file mode 100644
index 98de5ed..0000000
--- a/system/services/server/fileserver/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ lib, ... }: 
-{
-  options.system.fileserver.enable = lib.mkEnableOption "Enable file serving services";
-
-  imports = [
-    ./jellyfin
-    ./nextcloud
-    ./nfs
-  ];
-}
diff --git a/system/services/server/fileserver/jellyfin/default.nix b/system/services/server/jellyfin/default.nix
similarity index 100%
rename from system/services/server/fileserver/jellyfin/default.nix
rename to system/services/server/jellyfin/default.nix
diff --git a/system/services/server/fileserver/jellyfin/nginx/default.nix b/system/services/server/jellyfin/nginx/default.nix
similarity index 100%
rename from system/services/server/fileserver/jellyfin/nginx/default.nix
rename to system/services/server/jellyfin/nginx/default.nix
diff --git a/system/services/server/fileserver/nextcloud/default.nix b/system/services/server/nextcloud/default.nix
similarity index 93%
rename from system/services/server/fileserver/nextcloud/default.nix
rename to system/services/server/nextcloud/default.nix
index 1d07a54..6bdb1de 100644
--- a/system/services/server/fileserver/nextcloud/default.nix
+++ b/system/services/server/nextcloud/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [ ./nginx ];
 
-  config = lib.mkIf config.system.fileserver.enable {
+  config = lib.mkIf config.system.server.enable {
     services.nextcloud = {
       enable = true;
       package = pkgs.nextcloud30;
diff --git a/system/services/server/fileserver/nextcloud/nginx/default.nix b/system/services/server/nextcloud/nginx/default.nix
similarity index 100%
rename from system/services/server/fileserver/nextcloud/nginx/default.nix
rename to system/services/server/nextcloud/nginx/default.nix
diff --git a/system/services/server/fileserver/nfs/default.nix b/system/services/server/nfs/default.nix
similarity index 84%
rename from system/services/server/fileserver/nfs/default.nix
rename to system/services/server/nfs/default.nix
index d343495..98d99ff 100644
--- a/system/services/server/fileserver/nfs/default.nix
+++ b/system/services/server/nfs/default.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   services.nfs.server = {
-    enable = config.system.fileserver.enable;
+    enable = config.system.server.enable;
     exports = ''
       /export/KittyNFS/Files *(rw,sync,no_subtree_check)
       /export/KittyNFS/Media *(rw,sync,no_subtree_check)
diff --git a/system/services/server/webserver/default.nix b/system/services/server/webserver/default.nix
index 5e54d9d..5ccf66c 100644
--- a/system/services/server/webserver/default.nix
+++ b/system/services/server/webserver/default.nix
@@ -1,9 +1,9 @@
 { lib, ... }: 
 {
-  options.system.webserver.enable = lib.mkEnableOption "Enable nginx related services";
-
   imports = [
     ./acme
     ./nginx
   ];
+
+  options.system.webserver.enable = lib.mkEnableOption "Enable nginx related services";
 }