nixpkgs-fmt

2 files changed, 88 insertions, 87 deletions

diff --git a/microvms/nextcloud/default.nix b/microvms/nextcloud/default.nix
index c6c07bd..84625c9 100644
--- a/microvms/nextcloud/default.nix
+++ b/microvms/nextcloud/default.nix
@@ -26,97 +26,98 @@
     recommendedOptimisation = true;
     virtualHosts."nc.oxapentane.com" = {
       extraConfig = ''
-          # HTTP response headers borrowed from Nextcloud .htaccess
-          add_header Referrer-Policy                      "no-referrer"   always;
-          #add_header X-Content-Type-Options               "nosniff"       always;
-          add_header X-Download-Options                   "noopen"        always;
-          #add_header X-Frame-Options                      "SAMEORIGIN"    always;
-          add_header X-Permitted-Cross-Domain-Policies    "none"          always;
-          add_header X-Robots-Tag                         "none"          always;
-          add_header X-XSS-Protection                     "1; mode=block" always;
+        # HTTP response headers borrowed from Nextcloud .htaccess
+        add_header Referrer-Policy                      "no-referrer"   always;
+        #add_header X-Content-Type-Options               "nosniff"       always;
+        add_header X-Download-Options                   "noopen"        always;
+        #add_header X-Frame-Options                      "SAMEORIGIN"    always;
+        add_header X-Permitted-Cross-Domain-Policies    "none"          always;
+        add_header X-Robots-Tag                         "none"          always;
+        add_header X-XSS-Protection                     "1; mode=block" always;
 
-          # Remove X-Powered-By, which is an information leak
-          fastcgi_hide_header X-Powered-By;
+        # Remove X-Powered-By, which is an information leak
+        fastcgi_hide_header X-Powered-By;
       '';
       listen = [{
-            # We are listening on wireguard interface only
-            addr = "10.34.45.100";
-            port = 8080;
-            ssl = false;
-          }];
-        };
-      };
+        # We are listening on wireguard interface only
+        addr = "10.34.45.100";
+        port = 8080;
+        ssl = false;
+      }];
+    };
+  };
 
-      services.nextcloud = {
-        enable = true;
-        hostName = "nc.oxapentane.com";
-        home = "/var/lib/nextcloud-oxa";
-        package = pkgs.nextcloud24;
-        maxUploadSize = "5000M";
-        caching.redis = true;
-        autoUpdateApps = {
-          enable = true;
-          startAt = "07:00:00";
-        };
-        config = {
-          overwriteProtocol = "https";
-          trustedProxies = [ "10.34.45.1" ];
+  services.nextcloud = {
+    enable = true;
+    hostName = "nc.oxapentane.com";
+    home = "/var/lib/nextcloud-oxa";
+    package = pkgs.nextcloud24;
+    maxUploadSize = "5000M";
+    caching.redis = true;
+    autoUpdateApps = {
+      enable = true;
+      startAt = "07:00:00";
+    };
+    config = {
+      overwriteProtocol = "https";
+      trustedProxies = [ "10.34.45.1" ];
 
-          dbtype = "pgsql";
-          dbuser = "nextcloud";
-          dbhost = "/run/postgresql";
-          dbname = "nextcloud";
-          adminuser = "admin";
-          adminpassFile = config.sops.secrets."nextcloud/adminpass".path;
-        };
-      };
+      dbtype = "pgsql";
+      dbuser = "nextcloud";
+      dbhost = "/run/postgresql";
+      dbname = "nextcloud";
+      adminuser = "admin";
+      adminpassFile = config.sops.secrets."nextcloud/adminpass".path;
+    };
+  };
 
-      systemd.services."nextcloud-setup" = {
-        requires = [ "postgresql.service" ];
-        after = [ "postgresql.service" ];
-      };
+  systemd.services."nextcloud-setup" = {
+    requires = [ "postgresql.service" ];
+    after = [ "postgresql.service" ];
+  };
 
 
 
 
-      microvm = {
-        hypervisor = "qemu";
-        mem = 4 * 1024;
+  microvm = {
+    hypervisor = "qemu";
+    mem = 4 * 1024;
 
-        shares = [{
-          source = "/nix/store";
-          mountPoint = "/nix/.ro-store";
-          tag = "store";
-          proto = "virtiofs";
-          socket = "store.socket";
-        }] ++ map (dir: {
-          source = "/var/lib/microvms/${config.networking.hostName}/${dir}";
-          mountPoint = "/${dir}";
-          tag = dir;
-          proto = "virtiofs";
-          socket = "${dir}.socket";
-        }) [ "etc" "var" "home" ];
+    shares = [{
+      source = "/nix/store";
+      mountPoint = "/nix/.ro-store";
+      tag = "store";
+      proto = "virtiofs";
+      socket = "store.socket";
+    }] ++ map
+      (dir: {
+        source = "/var/lib/microvms/${config.networking.hostName}/${dir}";
+        mountPoint = "/${dir}";
+        tag = dir;
+        proto = "virtiofs";
+        socket = "${dir}.socket";
+      }) [ "etc" "var" "home" ];
 
-        interfaces = [{
-          type = "tap";
-          id = "vm-nextcloud";
-          mac = "EA:40:E8:60:C5:36";
-        }];
-      };
+    interfaces = [{
+      type = "tap";
+      id = "vm-nextcloud";
+      mac = "EA:40:E8:60:C5:36";
+    }];
+  };
 
-      networking = {
-        hostName = "nextcloud";
-        };
+  networking = {
+    hostName = "nextcloud";
+  };
 
-        services.openssh = {
-          enable = true;
-          permitRootLogin = "prohibit-password";
-          };
+  services.openssh = {
+    enable = true;
+    permitRootLogin = "prohibit-password";
+  };
 
-          networking.firewall.allowedTCPPorts = [ 22 ];
-          users.users.root.openssh.authorizedKeys.keys = [
-            "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDP6xE2ey0C8XXfvniiiHiqXsCC277jKI9RXEA+s2LQLUI5zl7v350i3Oa8H3NCcPj39lfMreqE6ncxcOhqYyzahPrrMkOqgbPAoRvq8H3ophLK+56O3xdHoKwLBwRD1yoGACjqG4UTiTrmnN2ateENgYcnTEY1e4vDw1qMj1drUXCsZ/6mkBBmHJiFfCaR4yCMt1r4gGi/dAC7ifnBP3oSyV/lJEwPxYYkGlbOBIvX/7Ar98pJS6xYPB3jHs9gwyNNON63d0fNYrwBojXPPCnGGaRZNOkBTzex3zZYp12ThINQ2xl8tRp9D8qpZ7vrLjhTD6AXkOBRzmDj+NsCeEaeTuWajqUM93iKncYUI+JxR1t7q8gA2pBMFzLesMXnx7R+5Kw7QDtSJM7a4GMIfsocPwf64BH6rzxEz68rXFE3P+J77PPM9CuaYw90JXHo3z220zYw2nMQ/1qjATVZw/hiVrLmQMVfmFJIufnGjTBs2sy3IoNyzvYm/oDeNNg1cdSV9gyyRKZhK08fxjXN5GSf9vZkfZa9tHtqaZ99HI40GQBHUVx1K2/NQJY8TVTSA+v16SFnJK8BIbmp/WFCuvDcMkgLIbqiYtDASe7P2mKIib86uOENT+P820egeLiTQ06kFw/gfUa8t69d5qEcjiQZ+lxCeYIs/E9KrEXHvRUWew== cardno:16 811 348"
-          ];
+  networking.firewall.allowedTCPPorts = [ 22 ];
+  users.users.root.openssh.authorizedKeys.keys = [
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDP6xE2ey0C8XXfvniiiHiqXsCC277jKI9RXEA+s2LQLUI5zl7v350i3Oa8H3NCcPj39lfMreqE6ncxcOhqYyzahPrrMkOqgbPAoRvq8H3ophLK+56O3xdHoKwLBwRD1yoGACjqG4UTiTrmnN2ateENgYcnTEY1e4vDw1qMj1drUXCsZ/6mkBBmHJiFfCaR4yCMt1r4gGi/dAC7ifnBP3oSyV/lJEwPxYYkGlbOBIvX/7Ar98pJS6xYPB3jHs9gwyNNON63d0fNYrwBojXPPCnGGaRZNOkBTzex3zZYp12ThINQ2xl8tRp9D8qpZ7vrLjhTD6AXkOBRzmDj+NsCeEaeTuWajqUM93iKncYUI+JxR1t7q8gA2pBMFzLesMXnx7R+5Kw7QDtSJM7a4GMIfsocPwf64BH6rzxEz68rXFE3P+J77PPM9CuaYw90JXHo3z220zYw2nMQ/1qjATVZw/hiVrLmQMVfmFJIufnGjTBs2sy3IoNyzvYm/oDeNNg1cdSV9gyyRKZhK08fxjXN5GSf9vZkfZa9tHtqaZ99HI40GQBHUVx1K2/NQJY8TVTSA+v16SFnJK8BIbmp/WFCuvDcMkgLIbqiYtDASe7P2mKIib86uOENT+P820egeLiTQ06kFw/gfUa8t69d5qEcjiQZ+lxCeYIs/E9KrEXHvRUWew== cardno:16 811 348"
+  ];
 
-          system.stateVersion = "22.05";
-        }
+  system.stateVersion = "22.05";
+}
diff --git a/microvms/nextcloud/oxaproxy.nix b/microvms/nextcloud/oxaproxy.nix
index 42290ac..c980cce 100644
--- a/microvms/nextcloud/oxaproxy.nix
+++ b/microvms/nextcloud/oxaproxy.nix
@@ -12,9 +12,9 @@
       wireguardConfig = {
         PrivateKeyFile = config.sops.secrets."wg/oxaproxy-seckey".path;
         #own pubkey: KCYoGx7TGei4X79EZo2NONCcmQjPzBUN1Ds6I9lQbz0=
-        };
-        wireguardPeers = [
-          {
+      };
+      wireguardPeers = [
+        {
           # cirrus
           wireguardPeerConfig = {
             PublicKey = "0KMtL2fQOrrCH6c2a2l4FKiM73G86sUuyaNj4FarzVM=";
@@ -40,16 +40,16 @@
       routes = [
         {
           routeConfig = {
-            Gateway="10.99.99.1";
-            Destination="0.0.0.0/0";
-            Metric=1024;
+            Gateway = "10.99.99.1";
+            Destination = "0.0.0.0/0";
+            Metric = 1024;
           };
         }
         {
           routeConfig = {
-            Gateway="10.99.99.1";
-            Destination="10.99.99.0/24";
-            Metric=1024;
+            Gateway = "10.99.99.1";
+            Destination = "10.99.99.0/24";
+            Metric = 1024;
           };
         }
       ];