From ef5a54218fd0f375adbdb5deeaa2dc8ade3c1de3 Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Wed, 10 Jul 2024 09:37:14 +0200 Subject: [PATCH] drop authentik module --- .editorconfig | 2 +- nixos-configurations/adama.nix | 8 +++++++- nixos-modules/authentik.nix | 9 --------- nixos-modules/default.nix | 1 - nixos-modules/profiles/auth.nix | 13 +------------ 5 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 nixos-modules/authentik.nix diff --git a/.editorconfig b/.editorconfig index cab75cb..4e939b9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,6 +11,6 @@ charset = utf-8 trim_trailing_whitespace = false insert_final_newline = false -[*.{nix,yml,yaml,md}] +[*.{nix,yml,yaml,md,nix}] trim_trailing_whitespace = true insert_final_newline = true \ No newline at end of file diff --git a/nixos-configurations/adama.nix b/nixos-configurations/adama.nix index 852a5b0..31158fc 100644 --- a/nixos-configurations/adama.nix +++ b/nixos-configurations/adama.nix @@ -1,10 +1,16 @@ -{ ezModules, config, ... }: +{ inputs, ezModules, config, ... }: { + _module.args.mkAuthentikScope = inputs.authentik-nix.lib.mkAuthentikScope; + imports = [ + inputs.authentik-nix.nixosModules.default + ezModules.hardware-rpi5 ezModules.sshd ezModules.user-peteresselius + ezModules.profiles + ezModules.authentik-blueprints ]; nixpkgs.hostPlatform = "aarch64-linux"; diff --git a/nixos-modules/authentik.nix b/nixos-modules/authentik.nix deleted file mode 100644 index f77e955..0000000 --- a/nixos-modules/authentik.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ inputs, ... }: - -{ - _module.args.mkAuthentikScope = inputs.authentik-nix.lib.mkAuthentikScope; - - imports = [ - inputs.authentik-nix.nixosModules.default - ]; -} diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix index db06884..c4b0c80 100644 --- a/nixos-modules/default.nix +++ b/nixos-modules/default.nix @@ -3,7 +3,6 @@ { imports = [ ezModules.context - ezModules.profiles ezModules.agenix ]; diff --git a/nixos-modules/profiles/auth.nix b/nixos-modules/profiles/auth.nix index b9fc3ba..edb8fcd 100644 --- a/nixos-modules/profiles/auth.nix +++ b/nixos-modules/profiles/auth.nix @@ -1,24 +1,13 @@ -{ ezModules, config, lib, ... }: +{ config, lib, ... }: let cfg = config.profiles.auth; inherit (lib) types mkOption mkEnableOption mkIf; in { - # imports = [ - # ezModules.authentik - # ezModules.authentik-blueprints - # ]; - options = { profiles.auth = { enable = mkEnableOption "auth"; - # env-file = mkOption { - # type = types.str; - # }; - # vhost = mkOption { - # type = types.str; - # }; listen_http = mkOption { type = types.str; default = "0.0.0.0:9000";