Merge the server misc files

nixos/server.nix

@@ -27,16 +27,15 @@
     ./server/mailserver.nix
     ./server/mariadb.nix
     ./server/mastodon.nix
-    ./server/misc.nix
     ./server/nextcloud.nix
     ./server/nfs.nix
     ./server/nginx.nix
     ./server/owncast.nix
     ./server/pufferpanel.nix
-    ./server/server-misc.nix
     ./server/synapse.nix
     ./server/tandoor.nix
     ./server/vaultwarden.nix
+    ./server/misc.nix
   ];
 
   services.openssh.ports = [ 2222 ];

nixos/server/misc.nix

@@ -1,4 +1,9 @@
-{
+{pkgs, ...}: {
+  # Install programs system-wide
+  environment.systemPackages = with pkgs; [
+    mdadm
+  ];
+
   services = {
     snowflake-proxy.enable = true;
     logrotate.checkConfig = false;

nixos/server/server-misc.nix

@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  # Install programs system-wide
-  environment.systemPackages = with pkgs; [
-    mdadm
-  ];
-}