Jimbo/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Undo a change from a while ago idk I'll find something better later

Browse source
This commit is contained in:
Jimbo 2025-01-20 15:59:09 -05:00
parent 2efcebbd9f
commit ac22bc1849
6 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hosts/kitty/default.nix
View file

@ -17,7 +17,6 @@
system = { system = {
desktop.enable = false; desktop.enable = false;
server.enable = true; server.enable = true;
webserver.enable = true;
fileserver.enable = true; fileserver.enable = true;
socialserver.enable = true; socialserver.enable = true;
wireless.enable = false; wireless.enable = false;

1
hosts/prophet/default.nix
View file

@ -19,7 +19,6 @@
system = { system = {
desktop.enable = false; desktop.enable = false;
mailserver.enable = true; mailserver.enable = true;
webserver.enable = true;
wireless.enable = false; wireless.enable = false;
wireguard.client.enable = true; wireguard.client.enable = true;
stateVersion = "24.05"; stateVersion = "24.05";

2
modules/system/services/server/webserver/acme/default.nix
View file

@ -1,6 +1,6 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
config = lib.mkIf config.system.webserver.enable { config = lib.mkIf config.services.nginx.enable {
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
defaults.email = "contact@${config.domains.p2}"; defaults.email = "contact@${config.domains.p2}";

22
modules/system/services/server/webserver/ddclient/default.nix
View file

@ -1,16 +1,14 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
config = lib.mkIf config.system.webserver.enable { services.ddclient = {
services.ddclient = { enable = config.system.server.enable;
enable = true; protocol = "cloudflare";
protocol = "cloudflare"; zone = "${config.domains.p2}";
zone = "${config.domains.p2}"; usev6 = "";
usev6 = ""; username = "token";
username = "token"; passwordFile = "${pkgs.writeText "cloudflareapikey" config.secrets.flareApiKey}";
passwordFile = "${pkgs.writeText "cloudflareapikey" config.secrets.flareApiKey}";
};
environment.persistence."/persist".directories = [
"/var/lib/private/ddclient"
];
}; };
environment.persistence."/persist".directories = lib.mkIf config.services.ddclient.enable [
"/var/lib/private/ddclient"
];
} }

5
modules/system/services/server/webserver/default.nix
View file

@ -1,10 +1,5 @@
{ lib, ... }: { lib, ... }:
{ {
options.system.webserver.enable = lib.mkOption {
type = lib.types.bool;
default = false;
};
imports = [ imports = [
./acme ./acme
./ddclient ./ddclient

2
modules/system/services/server/webserver/nginx/default.nix
View file

@ -5,7 +5,7 @@
./virtualhosts ./virtualhosts
]; ];
config = lib.mkIf config.system.webserver.enable { config = lib.mkIf (config.system.server.enable || config.system.mailserver.enable) {
services.nginx = { services.nginx = {
enable = true; enable = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;