Fixed some issues after 25.11 update (stargate)

homes/x86_64-linux/kylekrein/git.nix

@@ -1,9 +1,11 @@
 {...}: {
   programs.git = {
     enable = true;
-    userName = "Aleksandr Lebedev";
+    settings = {
-    userEmail = "alex.lebedev2003@icloud.com";
+      user = {
-    extraConfig = {
+        name = "Aleksandr Lebedev";
+        email = "alex.lebedev2003@icloud.com";
+      };
       credential.helper = "manager";
       credential."https://github.com".username = "KyleKrein";
       credential.credentialStore = "plaintext";

modules/nixos/hardware/hibernation/default.nix

@@ -31,10 +31,10 @@ in {
         ++ optional (cfg.swapFileOffset != null) "resume_offset=${builtins.toString cfg.swapFileOffset}";
       resumeDevice = mkDefault cfg.resumeDevice;
     };
-    services.logind = {
+    services.logind.settings.Login = {
-      lidSwitch = mkDefault "suspend-then-hibernate";
+      HandleLidSwitch = mkDefault "suspend-then-hibernate";
-      powerKey = mkDefault "suspend-then-hibernate";
+      HandlePowerKey = mkDefault "suspend-then-hibernate";
-      powerKeyLongPress = mkDefault "poweroff";
+      HandlePowerKeyLongPress = mkDefault "poweroff";
     };
     systemd.sleep.extraConfig = ''
       HibernateDelaySec=30m

modules/nixos/presets/default/default.nix

@@ -54,10 +54,10 @@ in {
       clean.extraArgs = "--keep-since 4d --keep 3";
       flake = "/etc/nixos-config";
     };
-    services.logind = {
+    services.logind.settings.Login = {
-      lidSwitch = mkDefault "suspend";
+      HandleLidSwitch = mkDefault "suspend";
-      powerKey = mkDefault "suspend";
+      HandlePowerKey = mkDefault "suspend";
-      powerKeyLongPress = mkDefault "poweroff";
+      HandlePowerKeyLongPress = mkDefault "poweroff";
     };
     environment.systemPackages = with pkgs; [
       nix-output-monitor

systems/x86_64-linux/dimondback/default.nix

@@ -24,7 +24,7 @@ in {
     then ./facter.json
     else null;
   imports = lib.snowfall.fs.get-non-default-nix-files ./. ++ [../stargate/services/adguardhome.nix];
-  services.adguardhome.settings.dns.bind_hosts = [ "192.168.178.119" ];	
+  services.adguardhome.settings.dns.bind_hosts = ["192.168.178.119"];
 
   environment.sessionVariables = {
     NIXOS_OZONE_WL = "1";

systems/x86_64-linux/stargate/default.nix

@@ -119,7 +119,7 @@ in {
     wget
   ];
 
-  services.adguardhome.settings.dns.bind_hosts = [ "192.168.178.129" ];
+  services.adguardhome.settings.dns.bind_hosts = ["192.168.178.129"];
 
   hardware.enableAllHardware = true;
   hardware.enableAllFirmware = true;

systems/x86_64-linux/stargate/services/adguardhome.nix

@@ -45,7 +45,7 @@ in {
         safe_search = {enabled = false;};
         rewrites =
           map (url: {
-	    enabled = true;
+            enabled = true;
             answer = localIp;
             domain = url;
           }) [

systems/x86_64-linux/stargate/services/ente.nix

@@ -3,18 +3,16 @@
   lib,
   config,
   ...
-}:
+}: let
-let
+  domain = "ente.kylekrein.com";
-domain = "ente.kylekrein.com";
+in {
-in
+  sops.secrets."services/minio" = {owner = "minio";};
-{
+  services.minio = {
-    sops.secrets."services/minio" = {owner = "minio";};
+    enable = true;
-    services.minio = {
+    # ente's config must match this region!
-        enable = true;
+    region = "us-east-1";
-    	# ente's config must match this region!
+    listenAddress = ":21939";
-    	region = "us-east-1";
+    consoleAddress = ":21940";
-	listenAddress = ":21939";
-	consoleAddress = ":21940";
     # Please use a file, agenix or sops-nix to securely store your root user password!
     # MINIO_ROOT_USER=your_root_user
     # MINIO_ROOT_PASSWORD=a_randomly_generated_long_password
@@ -24,7 +22,7 @@ in
   systemd.services.minio.environment.MINIO_SERVER_URL = "https://s3.kylekrein.com";
 
   services.nginx = {
-   virtualHosts."web.s3.kylekrein.com" = {
+    virtualHosts."web.s3.kylekrein.com" = {
       forceSSL = true;
       enableACME = true;
       locations."/".proxyPass = "http://localhost:21940";
@@ -46,50 +44,50 @@ in
   sops.secrets."services/ente/encryption" = {owner = "ente";};
   sops.secrets."services/ente/hash" = {owner = "ente";};
   sops.secrets."services/ente/jwt" = {owner = "ente";};
-    services.ente = {
+  services.ente = {
-        web = {
+    web = {
-	    enable = true;
+      enable = true;
-	    domains = {
+      domains = {
-	        photos = "photos.${domain}";
+        photos = "photos.${domain}";
-	        albums = "albums.${domain}";
+        albums = "albums.${domain}";
-	        cast = "cast.${domain}";
+        cast = "cast.${domain}";
-	        api = "api.${domain}";
+        api = "api.${domain}";
-		accounts = "accounts.${domain}";
+        accounts = "accounts.${domain}";
-	    };
+      };
-	};
-	api = {
-	    enable = true;
-	    domain = "api.${domain}";
-	    enableLocalDB = true;
-	    nginx.enable = true;
-	    settings = {
-	        apps.accounts = "https://accounts.${domain}";
-		apps.cast = "https://cast.${domain}";
-		public-albums = "https://albums.${domain}";
-		s3 = {
-          	    b2-eu-cen = {
-		        are_local_buckets = false;
-                    	use_path_style_urls = true;
-            	        endpoint = "https://s3.kylekrein.com";
-            		region = "us-east-1";
-            		bucket = "ente";
-            		key._secret = config.sops.secrets."services/ente/minio/user".path;
-            		secret._secret = config.sops.secrets."services/ente/minio/password".path;
-          	    };
-        	};
-        	key = {
-          	    # generate with: openssl rand -base64 32
-          	    encryption._secret = config.sops.secrets."services/ente/encryption".path;
-          	    # generate with: openssl rand -base64 64
-          	    hash._secret = config.sops.secrets."services/ente/hash".path;
-        	};
-        	# generate with: openssl rand -base64 32
-        	jwt.secret._secret = config.sops.secrets."services/ente/jwt".path;
-		internal = {
-		    admin = 1580559962386438;
-		    disable-registration = true;
-		};
-	    };
-	};
     };
-}
+    api = {
+      enable = true;
+      domain = "api.${domain}";
+      enableLocalDB = true;
+      nginx.enable = true;
+      settings = {
+        apps.accounts = "https://accounts.${domain}";
+        apps.cast = "https://cast.${domain}";
+        public-albums = "https://albums.${domain}";
+        s3 = {
+          b2-eu-cen = {
+            are_local_buckets = false;
+            use_path_style_urls = true;
+            endpoint = "https://s3.kylekrein.com";
+            region = "us-east-1";
+            bucket = "ente";
+            key._secret = config.sops.secrets."services/ente/minio/user".path;
+            secret._secret = config.sops.secrets."services/ente/minio/password".path;
+          };
+        };
+        key = {
+          # generate with: openssl rand -base64 32
+          encryption._secret = config.sops.secrets."services/ente/encryption".path;
+          # generate with: openssl rand -base64 64
+          hash._secret = config.sops.secrets."services/ente/hash".path;
+        };
+        # generate with: openssl rand -base64 32
+        jwt.secret._secret = config.sops.secrets."services/ente/jwt".path;
+        internal = {
+          admin = 1580559962386438;
+          disable-registration = true;
+        };
+      };
+    };
+  };
+}

systems/x86_64-linux/stargate/services/nginx.nix

@@ -41,7 +41,7 @@ in {
         enableACME = true;
         forceSSL = true;
       };
-      
+
       "ente.kylekrein.com" = {
         enableACME = true;
         forceSSL = true;

systems/x86_64-linux/stargate/services/postfix.nix

@@ -6,8 +6,8 @@
 }: {
   services.postfix = {
     enable = true;
-    config = {
+    settings.main = {
-      myhostname = "stargate.local";
+      myhostname = "notthebees.org";
       mydestination = "localhost, localhost.com";
 
       relay_domains = ["notthebees.org"];