maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Bump private

Browse source
This commit is contained in:
Malte Brandy 2022-03-21 00:27:05 +01:00
parent c403c360c9
commit 5239bcb997
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
nixos/machines/hera/web.nix
View file

@ -18,11 +18,6 @@ in {
nginx = { nginx = {
enable = lib.mkForce pkgs.withSecrets; enable = lib.mkForce pkgs.withSecrets;
virtualHosts = { virtualHosts = {
"stream.maralorn.de" = {
forceSSL = true;
enableACME = true;
locations."/".proxyPass = "http://[${config.m-0.hosts.apollo-wg}]:8123";
};
"tasks.maralorn.de" = { "tasks.maralorn.de" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
@ -32,7 +27,6 @@ in {
}; };
}; };
"hera.m-0.eu" = { "hera.m-0.eu" = {
serverAliases = ["malte-und-clai.re"];
default = true; default = true;
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
@ -43,15 +37,17 @@ in {
forceSSL = true; forceSSL = true;
inherit locations; inherit locations;
}; };
"fdroid.maralorn.de" = { "fdroid.maralorn.de" =
forceSSL = true; {
enableACME = true; forceSSL = true;
locations = { enableACME = true;
"/" = { locations = {
root = "/var/www/fdroid/repo"; "/" = {
root = "/var/www/fdroid/repo";
};
}; };
}; }
}; // pkgs.privateValue {} "extra-sites";
}; };
}; };
}; };

10
nixos/roles/fonts.nix
View file

@ -19,14 +19,16 @@
fonts = builtins.attrValues { fonts = builtins.attrValues {
inherit inherit
(pkgs) (pkgs)
nerdfonts
# For all my terminal needs. # For all my terminal needs.
libertinus nerdfonts
# nice text font # nice text font
material-icons libertinus
# icons in my app # icons in my app
material-icons
# sans font, very good for displays
b612 b612
; # sans font, very good for displays google-fonts
;
}; };
}; };

2
private

@ -1 +1 @@
Subproject commit 46bcf2a4899054b73a911b91185f92bfbbcb8ae5 Subproject commit f069ac78040ccacb9dd6250f4ee4f57cb6b1bc22