lib

modules/nixos/actual/options.nix

@@ -1,37 +1,25 @@
 { lib, namespace, ... }:
+let
+  inherit (lib.mjallen) mkOpt mkBoolOpt;
+in 
 with lib;
 {
   options.${namespace}.services.actual = {
     enable = mkEnableOption "actual service";
 
-    port = mkOption {
-      type = types.int;
-      default = 80;
-    };
+    port = mkOpt types.int 80 "Port for Actual to be hosted on";
 
-    localAddress = mkOption {
-      type = types.str;
-      default = "127.0.0.1";
-    };
+    localAddress = mkOpt types.str "127.0.0.1" "local address of the service";
 
-    dataDir = mkOption {
-      type = types.str;
-      default = "";
-    };
+    dataDir = mkOpt types.str "" "Path to the data dir";
 
     reverseProxy = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-      };
-      host = mkOption {
-        type = types.str;
-        default = "";
-      };
-      middlewares = mkOption {
-        type = with types; listOf str;
-        default = [ ];
-      };
+      enable = mkBoolOpt false "Enable reverse proxy support";
+
+      host = mkOpt types.str "" "Address of the proxy";
+
+      middlewares = with types; mkOpt (listOf str) [ ] "List of middlewares to use";
+
     };
   };
 }

modules/nixos/hardware/btrfs/default.nix

@@ -1,7 +1,7 @@
 { lib, ... }:
 {
   services.btrfs = {
-    autoScrub.enable = lib.mkDefault false;
+    autoScrub.enable = lib.mkDefault true;
     autoScrub.fileSystems = lib.mkDefault [
       "/nix"
       "/root"

modules/nixos/nix/default.nix

@@ -3,11 +3,14 @@
   nix = {
     settings = {
       substituters = [
+        "nas-cache:5ibTWOXJYlKBaoNtdDEPmvdLPtfnbwf9jvdnfwi5dUs="
+        "https://cache.mjallen.dev/nas-cache"
         "https://nixos-raspberrypi.cachix.org"
         "https://nix-community.cachix.org"
         "https://cache.nixos.org/"
       ];
       trusted-public-keys = [
+        
         "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];

modules/nixos/traefik/default.nix

@@ -12,10 +12,10 @@ let
   serverIp = "10.0.1.3";
 
   # Forward services
-  authUrl = "http://${serverIp}:9000/outpost.goauthentik.io";
+  authUrl = "http://${serverIp}:${namespace.services.authentik.port}/outpost.goauthentik.io";
 
   actualUrl = "http://${config.containers.actual.localAddress}:${toString config.containers.actual.config.services.actual.settings.port}";
-  authentikUrl = "http://${serverIp}:9000";
+  authentikUrl = "http://${serverIp}:${namespace.services.authentik.port}";
   cacheUrl = "http://${serverIp}:9012";
   cloudUrl = "http://${config.containers.nextcloud.localAddress}:80";
   giteaUrl = "http://${config.containers.gitea.localAddress}:${toString config.containers.gitea.config.services.gitea.settings.server.HTTP_PORT}";