diff --git a/flake.lock b/flake.lock index b8d753d..88fd42c 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762618334, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", + "lastModified": 1770165109, + "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", "owner": "ryantm", "repo": "agenix", - "rev": "fcdea223397448d35d9b31f798479227e80183f6", + "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", "type": "github" }, "original": { @@ -23,27 +23,42 @@ "type": "github" } }, + "authentik-go": { + "flake": false, + "locked": { + "lastModified": 1770333754, + "narHash": "sha256-Yyna75Nd6485tZP9IpdEa5QNomswe9hRfM+w3MuET9E=", + "owner": "goauthentik", + "repo": "client-go", + "rev": "280022b0a8de5c8f4b2965d1147a1c4fa846ba64", + "type": "github" + }, + "original": { + "owner": "goauthentik", + "repo": "client-go", + "type": "github" + } + }, "authentik-nix": { "inputs": { + "authentik-go": "authentik-go", "authentik-src": "authentik-src", "flake-compat": "flake-compat", "flake-parts": "flake-parts", "flake-utils": "flake-utils", "napalm": "napalm", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", "systems": "systems_2", "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1769348998, - "narHash": "sha256-nP4gw7bdwYGa+TQEvpMrYrp6/wsGklrC2cmIUjP4HNI=", + "lastModified": 1770931530, + "narHash": "sha256-g6FXanv0FlUc7eWFJ9C5g9ZbMtWA8dSNGwx0mia3uyA=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "eee255ff2ffd90477889740a56ee75cf7020886e", + "rev": "0487b4db05bddbd8d163f3fd85eef9c9413dca11", "type": "github" }, "original": { @@ -55,16 +70,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1769532389, - "narHash": "sha256-DO7wfgQBZ2uecbr+nptSHbz06ErT415SDucg7JFg7Y0=", + "lastModified": 1770911230, + "narHash": "sha256-alTyrMBbjZbw4jhEna8saabf93sqSrZCu+Z5xH3pZ7M=", "owner": "goauthentik", "repo": "authentik", - "rev": "aafb7cb7dc709eead634b5570b01d9e04f272d7a", + "rev": "19ad8d3ae3f266ec1096bc4461fdf6bcda1aa079", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version-2025.10", + "ref": "version/2025.12.4", "repo": "authentik", "type": "github" } @@ -262,11 +277,11 @@ ] }, "locked": { - "lastModified": 1769580047, - "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=", + "lastModified": 1770260404, + "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "owner": "nix-community", "repo": "home-manager", - "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826", + "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "type": "github" }, "original": { @@ -360,11 +375,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1770882871, + "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b", "type": "github" }, "original": { @@ -376,16 +391,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769598131, - "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -407,11 +422,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770841267, + "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "type": "github" }, "original": { @@ -421,6 +436,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1770770419, + "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -479,7 +510,7 @@ "home-manager": "home-manager_2", "lix-module": "lix-module", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } }, diff --git a/flake.nix b/flake.nix index e91ad89..f52872c 100644 --- a/flake.nix +++ b/flake.nix @@ -38,10 +38,6 @@ authentik-nix = { url = "github:nix-community/authentik-nix"; - - # Waiting for PR https://github.com/nix-community/authentik-nix/pull/86 - inputs.nixpkgs.follows = "nixpkgs"; - inputs.authentik-src.url = "github:goauthentik/authentik/version-2025.10"; }; }; diff --git a/modules/networking/caddy.nix b/modules/networking/caddy.nix index 127a9d3..891af0d 100644 --- a/modules/networking/caddy.nix +++ b/modules/networking/caddy.nix @@ -112,7 +112,7 @@ in enable = true; package = pkgs.caddy.withPlugins { - hash = "sha256-q/ges8rSHltoZMS3fMaCSHa4xhsMeXKbp+0mqD2QezU="; + hash = "sha256-nEjcy5FljOoWC5EdumxBA3R7Bgfo2XcTr7gCVfdPDxE="; plugins = [ "github.com/caddy-dns/cloudflare@v0.2.2-0.20250724223520-f589a18c0f5d" "github.com/mholt/caddy-dynamicdns@v0.0.0-20250430031602-b846b9e8fb83" diff --git a/modules/services/authentik.nix b/modules/services/authentik.nix index 883bf3d..c2e3899 100644 --- a/modules/services/authentik.nix +++ b/modules/services/authentik.nix @@ -93,28 +93,8 @@ in services.authentik = # Waiting for PR https://github.com/nix-community/authentik-nix/pull/86 - let - customAuthentikScope = authentik-nix.lib.mkAuthentikScope { - inherit pkgs; - }; - - # Override the scope to change gopkgs - overriddenScope = customAuthentikScope.overrideScope ( - final: prev: { - authentikComponents = prev.authentikComponents // { - gopkgs = prev.authentikComponents.gopkgs.override { - buildGo125Module = pkgs.buildGo125Module; - }; - }; - } - ); - in { enable = true; - - # Waiting for PR https://github.com/nix-community/authentik-nix/pull/86 - inherit (overriddenScope) authentikComponents; - environmentFile = cfg.envFile; settings = { email = cfg.email;