fix various bugs

modules/nixos/services/authentication/default.nix

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

modules/nixos/services/authentication/zitadel/default.nix

@@ -21,7 +21,8 @@ in
       zitadel = {
         enable = 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";
         settings = {
           Port = 9092;

modules/nixos/services/development/forgejo/default.nix

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

modules/nixos/services/media/default.nix

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

modules/nixos/services/media/nextcloud/default.nix

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

modules/nixos/services/media/nfs/default.nix

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

modules/nixos/system/security/sops/default.nix

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

modules/nixos/system/security/sudo/default.nix

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