diff --git a/common/auths.yaml b/common/auths.yaml
index 303a187..d215193 100644
--- a/common/auths.yaml
+++ b/common/auths.yaml
@@ -4,8 +4,8 @@ mail:
     macronova:
         password: ENC[AES256_GCM,data:wJMS3WqmAMQiOiyDUvmwH6Bes4L8GZC/2MxXP23M+RUrN7esqQsaMXLksY/33TuopuekVAvW9K+D2go5quaxdZhB/cVrhXqIjLVLV6Wa+WkYlbeQvJ5ix3R40X455opndrCQCQslatzcgGxmMS8qj5j0UcOfng==,iv:jfo7REVvIDI9MiWRsBi4MoTHfO6lHY5oQI9WyUecnnQ=,tag:hrSHzh4DK5Skav6A3fwD5A==,type:str]
 users:
-    root:
-        password: ENC[AES256_GCM,data:RhoImsE3Yjn5K6LYqedCew8vd2LXPvIMuY70nCGpQRyfpBfGL4yXMDXRtZtU3VPLlqvjkSGSzvgWta/pni83JdPxqYqRBPi0M/fEondL3Phpx4/xL9K4Fr7QZ3BDsWj07Wi/DKk+qvMFkAQhczJ3bePbCE723A==,iv:pWzCTJ4ahsBI8OYpL9Bd0k23ka0PCDZDP+yuxIfkbvk=,tag:fBy4ZQM30ny4Ab5fVbkMwg==,type:str]
+    macronova:
+        password: ENC[AES256_GCM,data:GSWsFhbxrUn1/tuURrl+D9wR80PZWzMU8sIjZpDyCyTrsCnbwcyqlsEx6MYSF/bRtAujR/kH2ppLM5O6QcIduETIMfjAMl8th9ZbQLUPiTpXRkfI01GKeUzYuvlATBGbnNHouJ2HJPamG+TJSBrbJJasoe5wUQ==,iv:RZQXTptp9MZejgrhWbeHSk0qgA4lSyo9yFdKZdJfvIk=,tag:38KJZbV19oT+3MH60d/grw==,type:str]
 xray:
     config.json: ENC[AES256_GCM,data:OfdVi938yFyZxV9aXRmLcO6Yr/fwocu2msSUHXIfTZUn4D2lrQhZMCtdkJoZxI/4hCxPGGns9FlJ10++iVJTPAp0UyEV2f2bsWfR/K9X1oD0j0jSdF4V7bwXUeAFtdCJKcuZ8zj/7UrrUucQ3Pwg2iYrzkzyJq38qWu47mIv8N2ata+mS+mle66Fh2YX74pZ6BuziUGuZ6QSVjz/s/YvCfyhPQD1t4zAEjHD2/jigZ4ZKhE7HbdDt3/W1S8m5+DhWSf+INVjcQt+DU4buEz1jNrQQxZXJTR4ZtRQJI6/oUN6deQLQtzBIIL7dGlbsTKp9IW6bho4mP/u162muq0vNskUafawWwaSpdyRnqTzqRHuzA1JfsSJVc6awf+3N35VjCBNmLXOTsdl4GNXt4IA4sRNyXS3dnToW1V9Jbr4zuECsdm2XnnODvkc/wwbL0JG9uav9soerd+FZ/9LZ8ETvN/8UcbjuQtrdSwLvu+bKb/mkJ9k03/cZL0OPeSYvJo1tBjN+bR/r2WG0iQSLsIkZoIv4PfhjveBRitFHUeZYQAbVbxK+LbV5pzfb8Nbf7tMJyXBSBf1d364Z85Aj5+AgTTW7LQqKKSs9YuHsQSARBlqPBdXnh25nTgPfUIt/Z+PDE8ryxOW8vITvo8RJ6b15Y1niwwFFcfbpdn13r+/9exFaV48huVllZz3C7HpC57GBrMyIN34G2ZA/VQ7UW8LxJLxhaBDLj0jHHI/BzTsBvwzvWKWFbnIu1yKX9Nn9I+Qa4RSxfSbiLjGUkRelL6+ktzCZmUxx+DiUOITpQ2F36XBGbclZHKhBIJRoSYNPGP6BKB/7s3l2pk5MZW8rmhe0Y1gK3aVZEfS2d6sIxD5xZ7gVV+U6hVaa+CAGf9mlHWbnMWnjuHeuKGAXgw0c0GjpQvL6c7G16sCFBDyeaiiJJPUDyHCiY83m/UeL2RjhYAbG4ydDflP1/BfZl4YV5xNFnbvMWehNV7JY5J8FbepdIwz6OJ6tibt7Qfny7/uYvA5+dKb53G/A0MzLG9IkiLpfTVdfVwD1iU288hqcADCY1yw+m46ivGvU/GJNHxUzmZ1rvxB9+cxox2BIJp75Fre39EMcu0at8br9K+NGE63e2epdXqUQ0Qi3PQL/4Dx9xI1SVtn62DwOuFuAgjYbVP3BA7PYePan6nMEBOhIR+pJJWxBhYGeKJIuqBECoX6ht0ldVzn8wyoa0eEs2sc5LpqqrxAJij4oRprjol/7MYU+ZESMP2Cap46qsSeqCX8v6d/wz73VEmyzbzgSsfGfoXhu9k9eM+Xt5ULhjYyK1Rt+HoVRapyBI+tsk+AUc14ItBvQZfmZ0QZZgTyLXyYzDbGg3t2ZBCC/vedPzeRSW/PgBTS/fiVBRzKTms62IWZ1ggyn9X8QXpyWbIix9BFThfm2c1stKcCXp1iKs0IdNj6Lrwvoimuzs6nS7+oWhTJrELuNz9ok6sFxg6GDAv+9v+7dYZnYm6SwlzTD/DIxlqT2ozW2cqwNwilBC7gyxFH7wUuHD1tz7t5mkkIi+r2rq4gIRS/UFcW37zV0deg3JpFxhEkitIw4+WWG8gcuollYw60xfCI5qu4kIZiTYV7oRQYJTnJDF44pDngq1frOuPIT+D5lh+R4TSYL9/4zt6Cdp+2FLddyyyW6mUSXIz6ribg+q6JV2Su8qozBWAlAr3lkesBCuobgBRXECPfIksg9SOVhZulAu1/mo0H/F7XJvTBgQurx1+nTgfJSoQtLlbgSCYr4aViJZOMOdL+yZk5tBwKNx+sF6mZwhe4pSlpIbqtPJeDDA0JC6/OabvSFFXhkYOUll7nA071oUvtdiXYoh2Vv7GJdJMHxxbSVjKv/dYbfXuDN+036bXnXbu2WPbxRTyRxLeLSCli+ngxbl5BOPS+2N/JItTcaRur7K98vuaHDzr1y6eA0GXJxm0PDqMd2F2MW12QDLTtEhq0+hn5HJcOBB4CNLn0mBXbMS8VHDoLokwMtZg3ukcBMnBfza9Q7BcBovypOtjrZ50zU40x4bA7YwPojHSXkAHrUNElBPSOjV5JvkAcX6CF6BG8PloJc+5aC3eGFQ/teymS9HbmPpCI7rXV5D7gsy9kdL1yVtQpOLsdcoERidyh21aEL2q5s26ri8/7e7TF4bpVE1bNiuus68kNZxqabuBfVOEzS0yKBnEHxqtJxZlPvakVQjdfQ0faLLjzXCvXsn3+pPQf0h8yXtLKmlIOlC+G2CoSGtXQ30ha7XuQqzWQBCu5Wv3fAHQyAgJIRzGn+OVz86r2/Gt4sRIECWKPylZi3Yh0XkNIA53T170hUTIi+aSSUgH7trKm0hp7VMJIBa74gyBuQnfez/lI/IDxkiZICmatYgjRL1QkHBvvxmT+4LYHy+nIuSu8OQX0HVRlRY3mkdarH8ypMvqqDkuCtOJPyQlW3qZxg1Us68X4lyviQISd0EeBf7/pRXXGpk6t50CYCvB0Hpz6e/CQZnTcyMvLzwpR1L/SqLL0vHY+bE7B72pL97o3o5GfiBvgKvIhgqqqwYQpt34mR580ZH2UkfgeCWI9uvpv/WaX8y0jHf2rifhLcTYShDLcv2j+/Kq5kGx+UjaRe2JFYKWOCX0S7JUO/FVDaL56F1u/WVSj7LSWQhtWK18OdZfyx8Epdce+bgcEx2zv5I8HByQznbib6bIrWOIWzp5y4wdoIlbmbUC2zax6j9v5Mxwpdy5VW2731fCsOX9SarqeK4GGzhYzqqxePJpif+AD4xcAY53XgOg38hQ8nUdJvSk7xVb0Sl4iWezHF6tt495/tlw6yyNQfs1TfMnYP4o0UhN8jTi8FnA1V1cMiKnOz4FWPl06X6cyZZDwO3ZmfSNjilusNdeuXUMJk67+h5xyik+r7Mkduz6fbno6YRTGFwkz,iv:a/F/UBjwV+rteo2Qle9XOVYW9ltdD/nfLh/1Pr5yiWU=,tag:tYd1w+b7DfZERGZQwRbHoA==,type:str]
 sops:
@@ -32,8 +32,8 @@ sops:
             ZW9EMlgrMnFHaHdQSWgvM25ocmNoVEkKo7H1Y+kZrtmk58Oe6d51wJQLF5T7OZtX
             0LgNOjevRPfxG4FpNk9yhLyrelpHkiSmBFTGHqbnouFE54L1eot/UQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-08-18T20:53:15Z"
-    mac: ENC[AES256_GCM,data:o7gv08Xcb9SeJ8tpONnFNnXiAFoehlGZenfJzaxnUQ9VgzKJgRCzWHoI4BgqL2I0zXmnQ3Cs3FTGQxS5XbVDzr/FhK4gv4ikBdllg8aJbQJ5GdtZh/qqrLiNjea3jmfEAHuLWe43+ZGySOKZtCFgNARO8jgVg4HIPsrb7pSU/38=,iv:Me2r64RnA2Hn+RpqI9X8eLfFC9jGTyo2sEaA9pkyz0U=,tag:XlRP5GvsfVrlAXH8CF+lnw==,type:str]
+    lastmodified: "2023-11-10T04:23:27Z"
+    mac: ENC[AES256_GCM,data:NlqS7FULlV2hDaliQUAgO5MS55CmtB/jL5r7SeVAZQ5+CpwdnyEZxV5xfMPFJ52gez1219c8NHPtlgXIpzxax/krx5Zjpfm1yK1XvKjn/BCKVJm0Uedoapaour3nlJFtjYq0xY4+XJKkDzB9Gn0GgZmrNMyyXR55FeEo+CkUWCg=,iv:28Jh0J4gsB7zNFam0ofarP19Aln3LAHhxzXFGnnXpm8=,tag:nF2O0trXvrdx0LE7yUe/FQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.7.3
+    version: 3.8.1
diff --git a/flake.nix b/flake.nix
index e7ad4b4..2829c20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,7 @@
           (archPath + "/${instance}")
           # Setup Nix
           ({ pkgs, ... }: {
+            networking.hostName = instance;
             nix = {
               gc = {
                 automatic = true;
@@ -40,7 +41,7 @@
             };
           })
         ];
-        specialArgs = { inherit inputs; };
+        specialArgs = { inherit inputs; inherit instance; };
       };
     in
     {
diff --git a/linux/blitzar/network.nix b/linux/blitzar/network.nix
index 2538798..6a72b28 100644
--- a/linux/blitzar/network.nix
+++ b/linux/blitzar/network.nix
@@ -2,7 +2,6 @@
   networking = {
     domain = config.constants.domain;
     hostId = "30f8f777";
-    hostName = "blitzar";
     networkmanager = {
       enable = true;
       wifi.backend = "iwd";
diff --git a/linux/nebula/network.nix b/linux/nebula/network.nix
index 73be887..0ebf5c3 100644
--- a/linux/nebula/network.nix
+++ b/linux/nebula/network.nix
@@ -1,11 +1,10 @@
 { config, ... }:
 
-let hn = "nebula"; in {
+let hn = config.networking.hostName; in {
   networking = {
     domain = config.constants.domain;
     firewall.allowedTCPPorts = [ 80 443 ];
     hostId = "e6449321";
-    hostName = hn;
     networkmanager = {
       enable = true;
       wifi.backend = "iwd";
diff --git a/linux/singularity/configuration.nix b/linux/singularity/configuration.nix
index d012a72..a050853 100644
--- a/linux/singularity/configuration.nix
+++ b/linux/singularity/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
 
@@ -9,30 +9,7 @@
 
   constants.sopsFile = ../../common/auths.yaml;
 
-  environment.systemPackages = with pkgs; [
-    bat
-    bottom
-    helix
-  ];
-
-  programs = {
-    fish.enable = true;
-    git.enable = true;
-    starship.enable = true;
-  };
-
-  sops.secrets."users/root/password".neededForUsers = true;
-
   system.stateVersion = "23.11";
 
-  users = {
-    mutableUsers = false;
-    users.root = {
-      openssh.authorizedKeys.keys = config.constants.publicKeys;
-      hashedPasswordFile = config.sops.secrets."users/root/password".path;
-      shell = pkgs.fish;
-    };
-  };
-
   zramSwap.enable = true;
 }
diff --git a/linux/singularity/default.nix b/linux/singularity/default.nix
index 3d5af56..5a92eac 100644
--- a/linux/singularity/default.nix
+++ b/linux/singularity/default.nix
@@ -1,9 +1,6 @@
 { inputs, ... }: {
-  imports = with inputs; [
-    mailserver.nixosModule
-    nh.nixosModules.default
-    sops-nix.nixosModules.sops
-  ] ++ [
+  imports = [
+    inputs.mailserver.nixosModule
     ./caddy.nix
     ./configuration.nix
     ./hardware-configuration.nix
@@ -11,7 +8,6 @@
     ./network.nix
     ./vaultwarden.nix
     ./xray.nix
-    ../../common/constants.nix
-    ../../common/secrets.nix
+    ../../common
   ];
 }
diff --git a/linux/singularity/network.nix b/linux/singularity/network.nix
index 8f53d4e..acd6017 100644
--- a/linux/singularity/network.nix
+++ b/linux/singularity/network.nix
@@ -1,10 +1,9 @@
 { config, ... }:
 
-let hn = "singularity"; in {
+let hn = config.networking.hostName; in {
   networking = {
     domain = config.constants.domain;
     firewall.allowedTCPPorts = [ 80 443 50051 ];
-    hostName = hn;
     hostId = "2cadb253";
   };