Remilia: more updates

services: remove redundant nginx confs
and some very minor changes

flake.nix

@@ -17,125 +17,127 @@
     rust.url = github:oxalica/rust-overlay;
   };
 
-  outputs = inputs@{self, nixpkgs, stable, master, old, ... }:
-  inputs.utils.lib.eachDefaultSystem (system: 
-  let
-    mkPkgs = channel: system: import channel {
-      inherit system;
-      config.allowUnfree = true;
-    };
-    channels = final: prev: {
-      stable   = mkPkgs stable  prev.system;
-      unstable = mkPkgs nixpkgs prev.system;
-      master   = mkPkgs master  prev.system;
-      old      = mkPkgs old     prev.system;
-    };
-    overlays = [
-      (import ./overlays/overridesandshit.nix)
-      (import ./overlays/packages.nix)
-    ];
-  in
-  {
-    legacyPackages = import nixpkgs {
-      inherit system;
-      overlays = overlays ++ [ 
-        inputs.nur.overlay 
-        inputs.nvim.overlay
-        inputs.rust.overlay
-        inputs.emacs.overlay
-        channels
-        ( _: _: {
-          nbfc-linux=inputs.nbfc.defaultPackage.${system};
-          games = inputs.nix-gaming.packages.${system};
-        })
-      ];
-      config.allowUnfree = true;
-      config.allowBroken = true;
-    };
-  }) //
-  ( 
-  let 
-    personalModules = [
-      ./modules/nvidia-offload.nix
-      ./modules/sound.nix
-      ./modules/xorg.nix
-      ./modules/emacs
-    ];
-    commonModules = [
-      ./modules/nvim
-      ./modules/vault-agent.nix
-    ];
-    serverModules = [
-      ./modules/min-pkgs.nix
-      ./modules/min-stuff.nix
-    ];
-    builder = [ ./modules/builder.nix ];
-  in
-  {
-    hm-configs = {
-      natto = inputs.home-manager.lib.homeManagerConfiguration {
-        system = "x86_64-linux";
-        configuration = { lib, ... }: {
-          imports = [ 
-            ./home/natto.nix 
+  outputs = inputs@{ self, nixpkgs, stable, master, old, ... }:
+    inputs.utils.lib.eachDefaultSystem
+      (system:
+        let
+          mkPkgs = channel: system: import channel {
+            inherit system;
+            config.allowUnfree = true;
+          };
+          channels = final: prev: {
+            stable = mkPkgs stable prev.system;
+            unstable = mkPkgs nixpkgs prev.system;
+            master = mkPkgs master prev.system;
+            old = mkPkgs old prev.system;
+          };
+          overlays = [
+            (import ./overlays/overridesandshit.nix)
+            (import ./overlays/packages.nix)
           ];
-          nixpkgs = {
-            overlays = self.legacyPackages.x86_64-linux.overlays;
+        in
+        {
+          legacyPackages = import nixpkgs {
+            inherit system;
+            overlays = overlays ++ [
+              inputs.nur.overlay
+              inputs.nvim.overlay
+              inputs.rust.overlay
+              inputs.emacs.overlay
+              channels
+              (_: _: {
+                nbfc-linux = inputs.nbfc.defaultPackage.${system};
+                games = inputs.nix-gaming.packages.${system};
+              })
+            ];
             config.allowUnfree = true;
             config.allowBroken = true;
-            config.permittedInsecurePackages = [
-              "electron-9.4.4"
-            ];
+          };
+        }) //
+    (
+      let
+        personalModules = [
+          ./modules/nvidia-offload.nix
+          ./modules/sound.nix
+          ./modules/xorg.nix
+          ./modules/emacs
+        ];
+        commonModules = [
+          ./modules/nvim
+          ./modules/vault-agent.nix
+        ];
+        serverModules = [
+          ./modules/min-pkgs.nix
+          ./modules/min-stuff.nix
+        ];
+        builders = [ ./modules/x86builder.nix ];
+      in
+      {
+        hm-configs = {
+          natto = inputs.home-manager.lib.homeManagerConfiguration {
+            system = "x86_64-linux";
+            configuration = { lib, ... }: {
+              imports = [
+                ./home/natto.nix
+              ];
+              nixpkgs = {
+                overlays = self.legacyPackages.x86_64-linux.overlays;
+                config.allowUnfree = true;
+                config.allowBroken = true;
+                config.permittedInsecurePackages = [
+                  "electron-9.4.4"
+                ];
+              };
+            };
+            homeDirectory = "/home/natto";
+            username = "natto";
           };
         };
-        homeDirectory = "/home/natto";
-        username = "natto";
-      };
-    };
 
-    nixosConfigurations = {
-      #Home laptop
-      Satori = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./hosts/satori
-          inputs.agenix.nixosModules.age
-          {
-            nixpkgs.pkgs = self.legacyPackages.x86_64-linux; 
-          }
-        ]
-        ++ personalModules
-        ++ commonModules;
-      };
+        nixosConfigurations = {
+          #Home laptop
+          Satori = nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            modules = [
+              ./hosts/satori
+              inputs.agenix.nixosModules.age
+              {
+                nixpkgs.pkgs = self.legacyPackages.x86_64-linux;
+              }
+            ]
+            ++ personalModules
+            ++ commonModules;
+          };
 
-      #Home server (RPi4)
-      Marisa = nixpkgs.lib.nixosSystem {
-        system = "aarch64-linux";
-        modules = [
-          ./hosts/marisa
-          #inputs.mailserver.nixosModules.mailserver
-          {
-            nixpkgs.pkgs = self.legacyPackages.aarch64-linux; 
-          }
-        ]
-        ++ commonModules
-        ++ serverModules;
-      };
+          #Home server (RPi4)
+          Marisa = nixpkgs.lib.nixosSystem {
+            system = "aarch64-linux";
+            modules = [
+              ./hosts/marisa
+              #inputs.mailserver.nixosModules.mailserver
+              {
+                nixpkgs.pkgs = self.legacyPackages.aarch64-linux;
+              }
+            ]
+            ++ commonModules
+            ++ serverModules;
+          };
 
-      #Oracle Cloud VM
-      Remilia = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./hosts/remilia
-          inputs.mailserver.nixosModules.mailserver
-          {
-            nixpkgs.pkgs = self.legacyPackages.x86_64-linux; 
-          }
-        ]
-        ++ commonModules
-        ++ serverModules
-        ++ builder;
-      };
-    };
-  });
+          #Oracle Cloud VM
+          Remilia = nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            modules = [
+              ./hosts/remilia
+              inputs.mailserver.nixosModules.mailserver
+              {
+                nixpkgs.pkgs = self.legacyPackages.x86_64-linux;
+              }
+            ]
+            ++ commonModules
+            ++ serverModules
+            ++ builders;
+          };
+        };
+      }
+    );
 }

hosts/remilia/services.nix

@@ -16,86 +16,62 @@
       package = (pkgs.nginx.overrideAttrs (oa: {
         configureFlags = oa.configureFlags ++ [ "--with-mail" "--with-mail_ssl_module" ];
       }));
-      virtualHosts = {
-        "weirdnatto.in" = {
-          addSSL = true;
-          enableACME = true;
-          locations."/".proxyPass = "http://10.55.0.2:80";
-          serverAliases = [ "www.weirdnatto.in" ];
-        };
-        "git.weirdnatto.in" = {
-          addSSL = true;
-          enableACME = true;
-          locations."/" = {
-            proxyPass = "http://10.55.0.2:5000";
-            extraConfig = ''
-              client_max_body_size 64M;
-              proxy_set_header Host $host;
-            '';
+      virtualHosts =
+        let
+          genericHttpRProxy = { addr, ssl ? true, conf ? "" }: {
+            addSSL = true;
+            enableACME = ssl;
+            locations."/" = {
+              proxyPass = toString addr;
+              extraConfig = ''
+                proxy_set_header Host $host;
+              '' + conf;
+            };
+          };
+        in
+        builtins.listToAttrs [
+          {
+            name = "vault.weirdnatto.in";
+            value = genericHttpRProxy { addr = "https://10.55.0.2:8800"; };
+          }
+          {
+            name = "consul.weirdnatto.in";
+            value = genericHttpRProxy { addr = "https://10.55.0.2:8500"; };
+          }
+          {
+            name = "ci.weirdnatto.in";
+            value = genericHttpRProxy { addr = "https://10.55.0.2:6666"; };
+          }
+          {
+            name = "radio.weirdnatto.in";
+            value = genericHttpRProxy { addr = "https://10.55.0.3:8000"; };
+          }
+          {
+            name = "git.weirdnatto.in";
+            value = genericHttpRProxy {
+              addr = "https://10.55.0.3:5000";
+              conf = "client_max_body_size 64M;";
+            };
+          }
+          {
+            name = "nomad.weirdnatto.in";
+            value = genericHttpRProxy {
+              addr = "https://10.55.0.3:4646";
+              conf = ''
+                proxy_buffering off;
+                proxy_read_timeout 310s;
+              '';
+            };
+          }
+        ] //
+        {
+          "weirdnatto.in" = {
+            addSSL = true;
+            enableACME = true;
+            locations."/".proxyPass = "http://10.55.0.2:80";
+            serverAliases = [ "www.weirdnatto.in" ];
           };
         };
-        "vault.weirdnatto.in" = {
-          addSSL = true;
-          enableACME = true;
-          locations."/" = {
-            proxyPass = "https://10.55.0.2:8800";
-            extraConfig = ''
-              proxy_set_header Host $host;
-            '';
-          };
-        };
-        "consul.weirdnatto.in" = {
-          addSSL = true;
-          enableACME = true;
-          locations."/" = {
-            proxyPass = "http://10.55.0.2:8500";
-            extraConfig = ''
-              proxy_set_header Host $host;
-            '';
-          };
-        };
-        "nomad.weirdnatto.in" = {
-          addSSL = true;
-          enableACME = true;
-          locations."/" = {
-            proxyPass = "http://10.55.0.2:4646";
-            extraConfig = ''
-              proxy_set_header Host $host;
-              proxy_buffering off;
-              proxy_read_timeout 310s;
-            '';
-          };
-        };
-        "radio.weirdnatto.in" = {
-          addSSL = true;
-          enableACME = true;
-          locations."/" = {
-            proxyPass = "http://10.55.0.3:8000";
-            extraConfig = ''
-              proxy_set_header Host $host;
-            '';
-          };
-        };
-        "ci.weirdnatto.in" = {
-          addSSL = true;
-          enableACME = true;
-          locations."/" = {
-            proxyPass = "http://10.55.0.2:6666";
-            extraConfig = ''
-              proxy_set_header Host $host;
-            '';
-          };
-        };
-      };
-      /*streamConfig = ''
-        upstream gitea {
-        server 10.55.0.2:222;
-        }
-        server {
-        listen 22001;
-        proxy_pass gitea;
-        }
-        '';*/
     };
     vault-agent = {
       enable = true;
@@ -154,3 +130,4 @@
   };
   security.pki.certificateFiles = [ ../../cert.pem ];
 }
+

modules/min-pkgs.nix

@@ -4,7 +4,7 @@
     git
     htop
     vim
-    wireguard
+    wireguard-tools
     vault
     tree-sitter
     rnix-lsp
@@ -31,12 +31,11 @@
       };
     };
   };
-
   nix = {
     package = pkgs.nixUnstable;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
-    trustedUsers = [ "root" ];
+    settings.trusted-users = [ "root" ];
   };
 }