more rearchitecting folders

This commit is contained in:
Noah Masur
2025-02-14 15:36:54 -05:00
parent c7f20e958b
commit 798bac75e8
37 changed files with 164 additions and 42 deletions

View File

@ -1,18 +0,0 @@
{
config,
pkgs,
lib,
...
}:
let
cfg = config.nmasur.presets.programs.;
in
{
options.nmasur.presets.programs..enable = lib.mkEnableOption "";
config = lib.mkIf cfg.enable {
};
}

View File

@ -35,7 +35,7 @@ in
# Normally I block all requests not coming from Cloudflare, so I have to also
# allow my local network.
config.nmasur.presets.services.caddy.cidrAllowlist = [ "192.168.0.0/16" ];
nmasur.presets.services.caddy.cidrAllowlist = [ "192.168.0.0/16" ];
services.bind = {

View File

@ -63,7 +63,7 @@ in
config = lib.mkIf cfg.enable {
# Forces Caddy to error if coming from a non-Cloudflare IP
config.nmasur.presets.services.caddy.cidrAllowlist = cloudflareIpRanges;
nmasur.presets.services.caddy.cidrAllowlist = cloudflareIpRanges;
# Tell Caddy to use Cloudflare DNS for ACME challenge validation
services.caddy.package = pkgs.caddy.withPlugins {

View File

@ -26,7 +26,7 @@ in
maxUploadSize = "50G";
config = {
adminpassFile = config.secrets.nextcloud.dest;
dbtype = "pgsql";
dbtype = "pgsql"; # Enables postgresql
};
settings = {
default_phone_region = "US";

View File

@ -6,12 +6,12 @@
}:
let
cfg = config.nmasur.presets.services.zfs;
cfg = config.nmasur.presets.zfs;
in
{
options.nmasur.presets.services.zfs.enable = lib.mkEnableOption "ZFS file system";
options.nmasur.presets.zfs.enable = lib.mkEnableOption "ZFS file system";
config = lib.mkIf cfg.enable {