marisa: add user bat

Signed-off-by: natto1784 <singh.amneesh1784@gmail.com>

hosts/marisa/default.nix

@@ -1,7 +1,6 @@
 { config, ... }:
 {
-  imports =
+  imports = [
-    [
     ./networking.nix
     ./hardware.nix
     ./boot.nix

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
-    '';
   };
 }

hosts/remilia/default.nix

@@ -1,7 +1,6 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
-  imports =
+  imports = [
-    [
     ./networking.nix
     ./hardware.nix
     ./boot.nix
@@ -10,5 +9,13 @@
   ];
 
   time.timeZone = "Asia/Kolkata";
+
+  users.users.bat = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    home = "/home/bat";
+    extraGroups = [ "wheel" ];
+  };
+
   system.stateVersion = "21.11";
 }

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;

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 {