refactor: move repeated nginx snippets into one file #26

Merged
chef merged 2 commits from chef/refactor into main 2024-06-05 09:40:43 +00:00 AGit
17 changed files with 23 additions and 40 deletions

View file

@ -1,4 +1,4 @@
_: { {
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager.gdm = { displayManager.gdm = {

View file

@ -1,4 +1,4 @@
_: { {
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;

View file

@ -1,4 +1,4 @@
_: { {
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {

View file

@ -1,4 +1,4 @@
_: { {
services.syncthing = { services.syncthing = {
enable = true; enable = true;
user = "buffet"; user = "buffet";

View file

@ -1,4 +1,4 @@
_: { {
services = { services = {
tlp = { tlp = {
enable = true; enable = true;

View file

@ -1,12 +1,5 @@
{website, ...}: { {website, ...}: {
services.nginx = { services.nginx = {
enable = true;
recommendedGzipSettings = true;
recommendedOptimisation = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
virtualHosts."404.buffet.sh" = { virtualHosts."404.buffet.sh" = {
default = true; default = true;
useACMEHost = "buffet.sh"; useACMEHost = "buffet.sh";

View file

@ -15,13 +15,6 @@ in {
}; };
nginx = { nginx = {
enable = true;
recommendedGzipSettings = true;
recommendedOptimisation = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
virtualHosts."bitwarden.buffet.sh" = { virtualHosts."bitwarden.buffet.sh" = {
useACMEHost = "buffet.sh"; useACMEHost = "buffet.sh";
forceSSL = true; forceSSL = true;

View file

@ -15,8 +15,9 @@
./borg.nix ./borg.nix
./disk-config.nix ./disk-config.nix
./forgejo.nix ./forgejo.nix
./murmur.nix
./msmtp.nix ./msmtp.nix
./murmur.nix
./nginx.nix
./upgrade.nix ./upgrade.nix
./website.nix ./website.nix

View file

@ -1,4 +1,4 @@
_: { {
disko.devices = { disko.devices = {
disk.main = { disk.main = {
device = "/dev/sda"; device = "/dev/sda";

View file

@ -73,13 +73,6 @@ in {
}; };
nginx = { nginx = {
enable = true;
recommendedGzipSettings = true;
recommendedOptimisation = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
virtualHosts."buffets.kitchen" = { virtualHosts."buffets.kitchen" = {
useACMEHost = "buffet.sh"; useACMEHost = "buffet.sh";
forceSSL = true; forceSSL = true;

View file

@ -1,4 +1,4 @@
_: { {
services.murmur = { services.murmur = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;

10
hosts/ami/nginx.nix Normal file
View file

@ -0,0 +1,10 @@
{
services.nginx = {
enable = true;
recommendedGzipSettings = true;
recommendedOptimisation = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
};
}

View file

@ -1,4 +1,4 @@
_: { {
system.autoUpgrade = { system.autoUpgrade = {
enable = true; enable = true;
flake = "https://buffets.kitchen/kitchen/rice/archive/main.tar.gz#ami"; flake = "https://buffets.kitchen/kitchen/rice/archive/main.tar.gz#ami";

View file

@ -2,13 +2,6 @@
networking.firewall.allowedTCPPorts = [80 443]; networking.firewall.allowedTCPPorts = [80 443];
services.nginx = { services.nginx = {
enable = true;
recommendedGzipSettings = true;
recommendedOptimisation = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
virtualHosts."buffet.sh" = { virtualHosts."buffet.sh" = {
useACMEHost = "buffet.sh"; useACMEHost = "buffet.sh";
forceSSL = true; forceSSL = true;

View file

@ -1,4 +1,4 @@
_: { {
home-manager.users.buffet = { home-manager.users.buffet = {
programs.fzf = { programs.fzf = {
enable = true; enable = true;

View file

@ -1,4 +1,4 @@
_: { {
home-manager.users.buffet = { home-manager.users.buffet = {
programs.git = { programs.git = {
enable = true; enable = true;

View file

@ -1,4 +1,4 @@
_: { {
home-manager.users.buffet = { home-manager.users.buffet = {
programs.gpg.enable = true; programs.gpg.enable = true;
}; };