diff --git a/home/natto/eww/default.nix b/home/natto/eww/default.nix
index ab9de14..6f776ca 100644
--- a/home/natto/eww/default.nix
+++ b/home/natto/eww/default.nix
@@ -16,7 +16,7 @@
   systemd.user.services.eww = {
     Unit = {
       Description = "EWW Daemon";
-      PartOf = ["graphical-session.target"];
+      PartOf = [ "graphical-session.target" ];
     };
     Service =
       let
diff --git a/hosts/marisa/default.nix b/hosts/marisa/default.nix
index 7bb8017..85cf495 100644
--- a/hosts/marisa/default.nix
+++ b/hosts/marisa/default.nix
@@ -1,12 +1,11 @@
 { config, ... }:
 {
-  imports =
-    [
-      ./networking.nix
-      ./hardware.nix
-      ./boot.nix
-      ./services.nix
-    ];
+  imports = [
+    ./networking.nix
+    ./hardware.nix
+    ./boot.nix
+    ./services.nix
+  ];
 
   time.timeZone = "Asia/Kolkata";
   system.stateVersion = "21.05";
diff --git a/hosts/modules/minimal.nix b/hosts/modules/minimal.nix
index 493dac6..513642b 100644
--- a/hosts/modules/minimal.nix
+++ b/hosts/modules/minimal.nix
@@ -38,6 +38,7 @@
     package = pkgs.nixUnstable;
     extraOptions = ''
       experimental-features = nix-command flakes
+      builders-use-substitutes = true
     '';
     settings.trusted-users = [ "root" ];
     buildMachines = [{
@@ -48,8 +49,5 @@
       supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
     }];
     distributedBuilds = true;
-    extraOptions = ''
-      builders-use-substitutes = true
-    '';
   };
 }
diff --git a/hosts/remilia/default.nix b/hosts/remilia/default.nix
index 9438afe..93cf3c8 100644
--- a/hosts/remilia/default.nix
+++ b/hosts/remilia/default.nix
@@ -1,14 +1,21 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
-  imports =
-    [
-      ./networking.nix
-      ./hardware.nix
-      ./boot.nix
-      ./services.nix
-      ./mailserver.nix
-    ];
+  imports = [
+    ./networking.nix
+    ./hardware.nix
+    ./boot.nix
+    ./services.nix
+    ./mailserver.nix
+  ];
 
   time.timeZone = "Asia/Kolkata";
+
+  users.users.bat = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    home = "/home/bat";
+    extraGroups = [ "wheel" ];
+  };
+
   system.stateVersion = "21.11";
 }
diff --git a/hosts/remilia/mailserver.nix b/hosts/remilia/mailserver.nix
index b7b67d9..e6f5d2b 100644
--- a/hosts/remilia/mailserver.nix
+++ b/hosts/remilia/mailserver.nix
@@ -16,6 +16,9 @@
         "masti@${domain}" = {
           hashedPasswordFile = "/var/secrets/masti@${domain}.key";
         };
+        "chamar@${domain}" = {
+          hashedPasswordFile = "/var/secrets/chamar@${domain}.key";
+        };
       };
       enablePop3 = false;
       enablePop3Ssl = false;
diff --git a/hosts/remilia/services.nix b/hosts/remilia/services.nix
index eed6db7..afbfb5c 100644
--- a/hosts/remilia/services.nix
+++ b/hosts/remilia/services.nix
@@ -56,7 +56,7 @@ in
           "f.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8888"; };
           "radio.${domain}" = genericHttpRProxy { addr = "http://${satori}:8001"; };
           "git.${domain}" = genericHttpRProxy {
-            addr = "http://${marisa}:5001";
+            addr = "http://${marisa}:5000";
             conf = "client_max_body_size 64M;";
           };
           "nomad.${domain}" = genericHttpRProxy {