chris/sneeuwvlok
chris/sneeuwvlok
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix various bugs

Browse source
This commit is contained in:
Chris Kruining 2025-08-13 08:50:26 +02:00
parent f1ffa33976
commit 30f17f692c
No known key found for this signature in database
GPG key ID: EB894A3560CCCAD2
10 changed files with 40 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

0
modules/nixos/services/authentication/authelia.nix → modules/nixos/services/authentication/authelia/default.nix
View file

1
modules/nixos/services/authentication/default.nix
View file

@ -1 +0,0 @@
{ ... }: {}

0
modules/nixos/services/authentication/himmelblau.nix → modules/nixos/services/authentication/himmelblau/default.nix
View file

3
modules/nixos/services/authentication/zitadel.nix → modules/nixos/services/authentication/zitadel/default.nix
View file

@ -21,7 +21,8 @@ in
zitadel = { zitadel = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
masterKeyFile = config.sops.secrets."zitadel/masterKey".path; # masterKeyFile = config.sops.secrets."zitadel/masterKey".path;
masterKeyFile = "/var/lib/zitadel/master_key";
tlsMode = "external"; tlsMode = "external";
settings = { settings = {
Port = 9092; Port = 9092;

51
modules/nixos/services/development/forgejo/default.nix
View file

@ -3,7 +3,7 @@ let
inherit (lib) mkIf mkEnableOption; inherit (lib) mkIf mkEnableOption;
cfg = config.${namespace}.services.development.forgejo; cfg = config.${namespace}.services.development.forgejo;
svr = cfg.settings.server; domain = "git.kruining.eu";
in in
{ {
options.${namespace}.services.development.forgejo = { options.${namespace}.services.development.forgejo = {
@ -18,7 +18,8 @@ in
settings = { settings = {
server = { server = {
# DOMAIN = ""; DOMAIN = domain;
ROOT_URL = "https://${domain}/";
HTTP_PORT = 5002; HTTP_PORT = 5002;
}; };
@ -28,10 +29,10 @@ in
SHOW_REGISTRATION_BUTTON = false; SHOW_REGISTRATION_BUTTON = false;
}; };
actions = { # actions = {
ENABLED = true; # ENABLED = true;
DEFAULT_ACTIONS_URL = "forgejo"; # DEFAULT_ACTIONS_URL = "forgejo";
}; # };
session = { session = {
COOKIE_SECURE = true; COOKIE_SECURE = true;
@ -39,29 +40,29 @@ in
}; };
}; };
gitea-actions-runner = { # gitea-actions-runner = {
package = pkgs.forgejo-actions-runner; # package = pkgs.forgejo-actions-runner;
instances.default = { # instances.default = {
enable = true; # enable = true;
name = "monolith"; # name = "monolith";
url = "https://git.kruining.eu"; # url = "https://git.kruining.eu";
# Obtaining the path to the runner token file may differ # # Obtaining the path to the runner token file may differ
# tokenFile should be in format TOKEN=<secret>, since it's EnvironmentFile for systemd # # tokenFile should be in format TOKEN=<secret>, since it's EnvironmentFile for systemd
tokenFile = config.age.secrets.forgejo-runner-token.path; # tokenFile = config.age.secrets.forgejo-runner-token.path;
labels = [ # labels = [
"ubuntu-latest:docker://node:16-bullseye" # "ubuntu-latest:docker://node:16-bullseye"
"ubuntu-22.04:docker://node:16-bullseye" # "ubuntu-22.04:docker://node:16-bullseye"
"ubuntu-20.04:docker://node:16-bullseye" # "ubuntu-20.04:docker://node:16-bullseye"
"ubuntu-18.04:docker://node:16-buster" # "ubuntu-18.04:docker://node:16-buster"
"native:host" # "native:host"
]; # ];
}; # };
}; # };
caddy = { caddy = {
enable = true; enable = true;
virtualHosts = { virtualHosts = {
"git.kruining.eu".extraConfig = '' ${domain}.extraConfig = ''
import auth import auth
reverse_proxy http://127.0.0.1:5002 reverse_proxy http://127.0.0.1:5002

6
modules/nixos/services/media/default.nix
View file

@ -78,7 +78,11 @@ in
sonarr = serviceConf; sonarr = serviceConf;
bazarr = serviceConf; bazarr = serviceConf;
lidarr = serviceConf; lidarr = serviceConf;
flaresolverr = serviceConf;
flaresolverr = {
enable = true;
openFirewall = true;
};
jellyseerr = { jellyseerr = {
enable = true; enable = true;

4
modules/nixos/services/media/nextcloud/default.nix
View file

@ -6,7 +6,7 @@ let
cfg = config.${namespace}.services.media.nextcloud; cfg = config.${namespace}.services.media.nextcloud;
in in
{ {
options.modules.services.nextcloud = { options.${namespace}.services.media.nextcloud = {
enable = mkEnableOption "Nextcloud"; enable = mkEnableOption "Nextcloud";
user = mkOption { user = mkOption {
@ -40,7 +40,7 @@ in
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
webserver = "caddy"; # webserver = "caddy";
package = pkgs.nextcloud31; package = pkgs.nextcloud31;
hostName = "localhost"; hostName = "localhost";

4
modules/nixos/services/media/nfs/default.nix
View file

@ -2,10 +2,10 @@
let let
inherit (lib) mkIf mkEnableOption; inherit (lib) mkIf mkEnableOption;
cfg = config.${namespace}.media.nfs; cfg = config.${namespace}.services.media.nfs;
in in
{ {
options.${namespace}.media.nfs = { options.${namespace}.services.media.nfs = {
enable = mkEnableOption "Enable NFS"; enable = mkEnableOption "Enable NFS";
}; };

2
modules/nixos/system/security/sops/default.nix
View file

@ -13,7 +13,7 @@ in
environment.systemPackages = with pkgs; [ sops ]; environment.systemPackages = with pkgs; [ sops ];
sops = { sops = {
defaultSopsFile = ../../../../secrets/secrets.yaml; defaultSopsFile = ../../../../../_secrets/secrets.yaml;
defaultSopsFormat = "yaml"; defaultSopsFormat = "yaml";
age.keyFile = "/home/"; age.keyFile = "/home/";

5
modules/nixos/system/security/sudo/default.nix
View file

@ -14,9 +14,8 @@ in
sudo-rs = { sudo-rs = {
enable = true; enable = true;
extraConfig = '' execWheelOnly = true;
Defaults env_keep += "EDITOR PATH DISPLAY" extraConfig = ''Defaults env_keep += "EDITOR PATH DISPLAY"'';
'';
}; };
}; };
}; };