Add user for singularity

linux/blitzar/network.nix

@@ -2,7 +2,6 @@
   networking = {
     domain = config.constants.domain;
     hostId = "30f8f777";
-    hostName = "blitzar";
     networkmanager = {
       enable = true;
       wifi.backend = "iwd";

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";

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

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

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