Compare commits
No commits in common. "5fbbfd7dc6a5498093437d2ecc6cf4bf501055be" and "457589ab2ea3731d328474764debed535f36cf93" have entirely different histories.
5fbbfd7dc6
...
457589ab2e
@ -1,18 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
cfg = config.my.neovim;
|
|
||||||
in {
|
|
||||||
options.my.neovim = {
|
|
||||||
enable = lib.mkEnableOption "neovim";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
environment.systemPackages = with pkgs; [nvim-custom];
|
|
||||||
|
|
||||||
environment.variables."EDITOR" = "nvim";
|
|
||||||
};
|
|
||||||
}
|
|
@ -51,13 +51,6 @@
|
|||||||
|
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
|
|
||||||
my.server = {
|
|
||||||
domain = "thomasfmly.org";
|
|
||||||
firewallInterface = "enp1s0";
|
|
||||||
};
|
|
||||||
|
|
||||||
my.neovim.enable = true;
|
|
||||||
my.services.keycloak.enable = true;
|
|
||||||
my.services.mealie.enable = true;
|
my.services.mealie.enable = true;
|
||||||
my.services.nextcloud.enable = true;
|
my.services.nextcloud.enable = true;
|
||||||
|
|
||||||
|
@ -31,13 +31,12 @@ in {
|
|||||||
|
|
||||||
# OIDC
|
# OIDC
|
||||||
OIDC_AUTH_ENABLED = true;
|
OIDC_AUTH_ENABLED = true;
|
||||||
OIDC_CONFIGURATION_URL = "https://auth.thomasfmly.org/realms/gringotts/.well-known/openid-configuration";
|
OIDC_CONFIGURATION_URL = "https://authentik.thomasfmly.org/application/o/mealie/.well-known/openid-configuration";
|
||||||
OIDC_CLIENT_ID = "mealie";
|
OIDC_CLIENT_ID = "FLFfJCP0nWsxGfHpAf26XfoqMaIoUuaVdODJLW28";
|
||||||
OIDC_CLIENT_SECRET = "cBh876vWKoMgJSWLVJkVv6kPvUoNkvxD";
|
OIDC_CLIENT_SECRET = "YSEfBhGQUmzAKnrAEi9413NM4m8juF8u7e8zOLzfCA1JXZdRsgj8WWXTKLqEeGhCiQsVvD1iX52sFcWqOWo2r7tpolpUUVymj8O4kfMWampO1Nn65K2aPFtuXu3soUwB";
|
||||||
OIDC_GROUPS_CLAIM = "roles";
|
OIDC_ADMIN_GROUP = "Administrators";
|
||||||
OIDC_ADMIN_GROUP = "admin";
|
|
||||||
OIDC_AUTO_REDIRECT = true;
|
OIDC_AUTO_REDIRECT = true;
|
||||||
OIDC_PROVIDER_NAME = "Keycloak";
|
OIDC_PROVIDER_NAME = "Authentik";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,53 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.my.services.keycloak;
|
|
||||||
inherit (config.my.server) domain firewallInterface;
|
|
||||||
keycloakDomain = "auth.${domain}";
|
|
||||||
keycloakUrl = "https://${keycloakDomain}";
|
|
||||||
in {
|
|
||||||
options.my.services.keycloak = {
|
|
||||||
enable = mkEnableOption "Keycloak";
|
|
||||||
proxy = mkEnableOption "Keycloak reverse proxy entry";
|
|
||||||
port = mkOption {
|
|
||||||
type = types.port;
|
|
||||||
default = 7654;
|
|
||||||
example = 8080;
|
|
||||||
description = "HTTP port for the Keycloak service.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkMerge [
|
|
||||||
(mkIf cfg.enable {
|
|
||||||
age.secrets.keycloakDb.file = ../../secrets/keycloak-db.age;
|
|
||||||
services.keycloak = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.keycloak;
|
|
||||||
settings = {
|
|
||||||
hostname = keycloakUrl;
|
|
||||||
hostname-admin = keycloakUrl;
|
|
||||||
hostname-strict = false;
|
|
||||||
hostname-strict-https = false;
|
|
||||||
proxy-headers = "xforwarded";
|
|
||||||
http-enabled = true;
|
|
||||||
http-port = cfg.port;
|
|
||||||
};
|
|
||||||
database.passwordFile = config.age.secrets.keycloakDb.path;
|
|
||||||
themes = with pkgs; {
|
|
||||||
keywind = keycloak-theme-keywind;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.firewall.interfaces."${firewallInterface}".allowedTCPPorts = [cfg.port];
|
|
||||||
})
|
|
||||||
(mkIf cfg.proxy {
|
|
||||||
services.caddy.virtualHosts."${keycloakDomain}".extraConfig = ''
|
|
||||||
reverse_proxy http://${proxyIP}:${toString cfg.port}
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
];
|
|
||||||
}
|
|
@ -17,7 +17,7 @@
|
|||||||
userName = "Michael Thomas";
|
userName = "Michael Thomas";
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
credential.helper = lib.mkDefault "store";
|
credential.helper = lib.mkDefault "store";
|
||||||
pull.rebase = "true";
|
pull.rebase = "false";
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user