From a250b1763dad915722540b5d0b8d2080156e41b0 Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Mon, 22 Jun 2026 01:17:01 +0200 Subject: fix: dyndns evaluation errors and formatting --- home-modules/apps/nvim/default.nix | 14 +++++++------- modules/vpn.nix | 5 +++-- services/ddns.nix | 6 +++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/home-modules/apps/nvim/default.nix b/home-modules/apps/nvim/default.nix index fb1eb94..c7e04f7 100644 --- a/home-modules/apps/nvim/default.nix +++ b/home-modules/apps/nvim/default.nix @@ -33,13 +33,13 @@ in initLua = lib.mkMerge [ '' - -- Load in the real config, if exists - local ok, fn = pcall (require, "entry") - if ok then - fn({ nix = true, }) - else - vim.notify("lua/entry.lua not found, no config to load", vim.log.levels.DEBUG) - end'' + -- Load in the real config, if exists + local ok, fn = pcall (require, "entry") + if ok then + fn({ nix = true, }) + else + vim.notify("lua/entry.lua not found, no config to load", vim.log.levels.DEBUG) + end'' ]; }; diff --git a/modules/vpn.nix b/modules/vpn.nix index d88ddca..e0edecc 100644 --- a/modules/vpn.nix +++ b/modules/vpn.nix @@ -27,8 +27,9 @@ in pkgs.networkmanager-openconnect ]; environment.systemPackages = with pkgs; [ - openfortivpn openfortivpn-webview - ]; + openfortivpn + openfortivpn-webview + ]; }) (lib.mkIf desktop.enable ( lib.mkMerge [ diff --git a/services/ddns.nix b/services/ddns.nix index 08135e1..2a04a26 100644 --- a/services/ddns.nix +++ b/services/ddns.nix @@ -44,18 +44,18 @@ in ddns-updater-configs = builtins.concatLists ( builtins.attrValues ( lib.mapAttrs ( - _name: dcfg: + name: dcfg: ( lib.optional dcfg.doWildcard ({ provider = "desec"; - domain = "*.${cfg.domain}"; + domains = "*.${name}"; token = config.sops.placeholder.${cfg.tokenSopsName}; ip_version = "ipv4"; }) ++ [ { provider = "desec"; - domain = cfg.domain; + domain = name; token = config.sops.placeholder.${cfg.tokenSopsName}; ip_version = "ipv4"; } -- cgit v1.3.1