From 88223c0172bd64477cda3e6220c9016c41c25635 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Sat, 10 Jan 2026 21:55:58 +0100 Subject: [PATCH] Fixed some issues after 25.11 update (stargate) --- homes/x86_64-linux/kylekrein/git.nix | 8 +- .../nixos/hardware/hibernation/default.nix | 8 +- modules/nixos/presets/default/default.nix | 8 +- systems/x86_64-linux/dimondback/default.nix | 2 +- systems/x86_64-linux/stargate/default.nix | 2 +- .../stargate/services/adguardhome.nix | 2 +- .../x86_64-linux/stargate/services/ente.nix | 116 +++++++++--------- .../x86_64-linux/stargate/services/nginx.nix | 2 +- .../stargate/services/postfix.nix | 4 +- 9 files changed, 76 insertions(+), 76 deletions(-) diff --git a/homes/x86_64-linux/kylekrein/git.nix b/homes/x86_64-linux/kylekrein/git.nix index 310529c..6d71c8c 100644 --- a/homes/x86_64-linux/kylekrein/git.nix +++ b/homes/x86_64-linux/kylekrein/git.nix @@ -1,9 +1,11 @@ {...}: { programs.git = { enable = true; - userName = "Aleksandr Lebedev"; - userEmail = "alex.lebedev2003@icloud.com"; - extraConfig = { + settings = { + user = { + name = "Aleksandr Lebedev"; + email = "alex.lebedev2003@icloud.com"; + }; credential.helper = "manager"; credential."https://github.com".username = "KyleKrein"; credential.credentialStore = "plaintext"; diff --git a/modules/nixos/hardware/hibernation/default.nix b/modules/nixos/hardware/hibernation/default.nix index e73afde..c6c96e4 100644 --- a/modules/nixos/hardware/hibernation/default.nix +++ b/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 = { - lidSwitch = mkDefault "suspend-then-hibernate"; - powerKey = mkDefault "suspend-then-hibernate"; - powerKeyLongPress = mkDefault "poweroff"; + services.logind.settings.Login = { + HandleLidSwitch = mkDefault "suspend-then-hibernate"; + HandlePowerKey = mkDefault "suspend-then-hibernate"; + HandlePowerKeyLongPress = mkDefault "poweroff"; }; systemd.sleep.extraConfig = '' HibernateDelaySec=30m diff --git a/modules/nixos/presets/default/default.nix b/modules/nixos/presets/default/default.nix index 04d0f07..b8d164f 100644 --- a/modules/nixos/presets/default/default.nix +++ b/modules/nixos/presets/default/default.nix @@ -54,10 +54,10 @@ in { clean.extraArgs = "--keep-since 4d --keep 3"; flake = "/etc/nixos-config"; }; - services.logind = { - lidSwitch = mkDefault "suspend"; - powerKey = mkDefault "suspend"; - powerKeyLongPress = mkDefault "poweroff"; + services.logind.settings.Login = { + HandleLidSwitch = mkDefault "suspend"; + HandlePowerKey = mkDefault "suspend"; + HandlePowerKeyLongPress = mkDefault "poweroff"; }; environment.systemPackages = with pkgs; [ nix-output-monitor diff --git a/systems/x86_64-linux/dimondback/default.nix b/systems/x86_64-linux/dimondback/default.nix index 132445b..437291b 100644 --- a/systems/x86_64-linux/dimondback/default.nix +++ b/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"; diff --git a/systems/x86_64-linux/stargate/default.nix b/systems/x86_64-linux/stargate/default.nix index 4448017..0def104 100644 --- a/systems/x86_64-linux/stargate/default.nix +++ b/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; diff --git a/systems/x86_64-linux/stargate/services/adguardhome.nix b/systems/x86_64-linux/stargate/services/adguardhome.nix index 738b4f2..452aa88 100644 --- a/systems/x86_64-linux/stargate/services/adguardhome.nix +++ b/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; }) [ diff --git a/systems/x86_64-linux/stargate/services/ente.nix b/systems/x86_64-linux/stargate/services/ente.nix index 5bbf22c..4728c4d 100644 --- a/systems/x86_64-linux/stargate/services/ente.nix +++ b/systems/x86_64-linux/stargate/services/ente.nix @@ -3,18 +3,16 @@ lib, config, ... -}: -let -domain = "ente.kylekrein.com"; -in -{ - sops.secrets."services/minio" = {owner = "minio";}; - services.minio = { - enable = true; - # ente's config must match this region! - region = "us-east-1"; - listenAddress = ":21939"; - consoleAddress = ":21940"; +}: let + domain = "ente.kylekrein.com"; +in { + sops.secrets."services/minio" = {owner = "minio";}; + services.minio = { + enable = true; + # ente's config must match this region! + region = "us-east-1"; + 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 = { - web = { - enable = true; - domains = { - photos = "photos.${domain}"; - albums = "albums.${domain}"; - cast = "cast.${domain}"; - api = "api.${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; - }; - }; - }; + services.ente = { + web = { + enable = true; + domains = { + photos = "photos.${domain}"; + albums = "albums.${domain}"; + cast = "cast.${domain}"; + api = "api.${domain}"; + accounts = "accounts.${domain}"; + }; }; -} \ No newline at end of file + 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; + }; + }; + }; + }; +} diff --git a/systems/x86_64-linux/stargate/services/nginx.nix b/systems/x86_64-linux/stargate/services/nginx.nix index 1927867..1b8d07c 100644 --- a/systems/x86_64-linux/stargate/services/nginx.nix +++ b/systems/x86_64-linux/stargate/services/nginx.nix @@ -41,7 +41,7 @@ in { enableACME = true; forceSSL = true; }; - + "ente.kylekrein.com" = { enableACME = true; forceSSL = true; diff --git a/systems/x86_64-linux/stargate/services/postfix.nix b/systems/x86_64-linux/stargate/services/postfix.nix index cb01a8d..5153508 100644 --- a/systems/x86_64-linux/stargate/services/postfix.nix +++ b/systems/x86_64-linux/stargate/services/postfix.nix @@ -6,8 +6,8 @@ }: { services.postfix = { enable = true; - config = { - myhostname = "stargate.local"; + settings.main = { + myhostname = "notthebees.org"; mydestination = "localhost, localhost.com"; relay_domains = ["notthebees.org"];