diff --git a/hosts/Alaska/default.nix b/hosts/Alaska/default.nix
index 2f8ecbc..8e17f4e 100644
--- a/hosts/Alaska/default.nix
+++ b/hosts/Alaska/default.nix
@@ -16,6 +16,7 @@
     ./modules/nginx.nix
     ./modules/nextcloud.nix
     ./modules/nicks_nextcould_integrations.nix
+    ./modules/postgres.nix
     ./modules/protonvpn.nix
     ./modules/tailscale.nix
     ./modules/vaultwarden.nix
diff --git a/hosts/Alaska/modules/nextcloud.nix b/hosts/Alaska/modules/nextcloud.nix
index 87401a1..1d40c0f 100644
--- a/hosts/Alaska/modules/nextcloud.nix
+++ b/hosts/Alaska/modules/nextcloud.nix
@@ -1,97 +1,78 @@
 { config, lib, pkgs, ... }:
 
 {
-      services.nextcloud = {
-        enable = true;
-        package = pkgs.nextcloud29;
-        enableImagemagick = true;
-        nginx.recommendedHttpHeaders = true;
-        https = true;
-        hostName = "files.nickiel.net";
-        home = "/Aurora/nextcloud";
+  services.nextcloud = {
+    enable = true;
+    package = pkgs.nextcloud29;
+    enableImagemagick = true;
+    nginx.recommendedHttpHeaders = true;
+    https = true;
+    hostName = "files.nickiel.net";
+    home = "/Aurora/nextcloud";
 
-        autoUpdateApps.enable = true;
+    autoUpdateApps.enable = true;
 
-        phpOptions = {
-          "opcache.interned_strings_buffer" = "64";
-        };
+    phpOptions = {
+      "opcache.interned_strings_buffer" = "64";
+    };
 
-        settings = {
-          preview_max_x = 2048;
-          preview_max_y = 2048;
-          jpeg_quality = 50;
-          enable_previews = true;
-          enabledPreviewProviders = [
-            "OC\\Preview\\HEIC"
-            "OC\\Preview\\JPEG"
-            "OC\\Preview\\JPG"
-            "OC\\Preview\\PNG"
-            "OC\\Preview\\MP4"
-            "OC\\Preview\\MOVIE"
-          ];
+    settings = {
+      preview_max_x = 2048;
+      preview_max_y = 2048;
+      jpeg_quality = 50;
+      enable_previews = true;
+      enabledPreviewProviders = [
+        "OC\\Preview\\HEIC"
+        "OC\\Preview\\JPEG"
+        "OC\\Preview\\JPG"
+        "OC\\Preview\\PNG"
+        "OC\\Preview\\MP4"
+        "OC\\Preview\\MOVIE"
+      ];
 
-          log_type = "file";
-          maintenance_window_start = "10"; # 3 AM PDT
+      log_type = "file";
+      maintenance_window_start = "10"; # 3 AM PDT
 
-          default_phone_region = "US";
-          overwriteProtocol = "https";
-          extraTrustedDomains = [
-            "10.0.0.183"
-            "files.nickiel.net"
-          ];
-          trustedProxies = [
-            "files.nickiel.net"
-          ];
-        };
+      default_phone_region = "US";
+      overwriteProtocol = "https";
+      extraTrustedDomains = [
+        "10.0.0.183"
+        "files.nickiel.net"
+      ];
+      trustedProxies = [
+        "files.nickiel.net"
+      ];
+    };
 
-        database.createLocally = false;
-        config = {
-          dbtype = "pgsql";
-          dbuser = "nextcloud";
-          dbhost = "/run/postgresql";
-          dbname = "nextcloud";
-          #dbpassFile = "/Aurora/nextcloud/nextcloud-db-password";
+    database.createLocally = false;
+    config = {
+      dbtype = "pgsql";
+      dbuser = "nextcloud";
+      dbhost = "/run/postgresql";
+      dbname = "nextcloud";
+      #dbpassFile = "/Aurora/nextcloud/nextcloud-db-password";
 
-          # This doesn't seem to be working, see this documation:
-          # https://docs.nextcloud.com/server/latest/admin_manual/configuration_user/reset_admin_password.html
-          adminpassFile = "/Aurora/nextcloud/nextcloud-admin-password";
-          adminuser = "admin";
-        };
-      };
+      # This doesn't seem to be working, see this documation:
+      # https://docs.nextcloud.com/server/latest/admin_manual/configuration_user/reset_admin_password.html
+      adminpassFile = "/Aurora/nextcloud/nextcloud-admin-password";
+      adminuser = "admin";
+    };
+  };
 
-      services.postgresql = {
-        enable = true;
-        enableTCPIP = true;
-        ensureDatabases = [ "nextcloud" ];
-        ensureUsers = [
-          {
-              name = "nextcloud";
-              ensureDBOwnership = true;
-          }
-        ];
-        authentication = lib.mkForce ''
-          # TYPE  DATABASE        USER            ADDRESS                 METHOD
-          local   all             all                                     trust
-          host    all             all             127.0.0.1/32            trust
-          host    all             all             ::1/128                 trust
-          host    all             all        0.0.0.0/0     md5
-          ''; # address is the computer you are connecting from
-      };
+  # Make sure PostSQL is running before nextcloud
+  systemd.services."nextcloud-setup" = {
+      requires = ["postgresql.service"];
+      after = ["postgresql.service"];
+  };
 
-      # Make sure PostSQL is running before nextcloud
-      systemd.services."nextcloud-setup" = {
-          requires = ["postgresql.service"];
-          after = ["postgresql.service"];
-      };
-
-      systemd.services.nextcloud-preview = {
-        description = "Generate previews for all images that haven't been rendered";
-        path = with pkgs; [
-          config.services.nextcloud.occ
-        ];
-        script = ''
-          nextcloud-occ preview:pre-generate
-        '';
-        startAt = "01:00:00";
-      };
+  systemd.services.nextcloud-preview = {
+    description = "Generate previews for all images that haven't been rendered";
+    path = with pkgs; [
+      config.services.nextcloud.occ
+    ];
+    script = ''
+      nextcloud-occ preview:pre-generate
+    '';
+    startAt = "01:00:00";
+  };
 }
diff --git a/hosts/Alaska/modules/postgres.nix b/hosts/Alaska/modules/postgres.nix
new file mode 100644
index 0000000..fbe20ac
--- /dev/null
+++ b/hosts/Alaska/modules/postgres.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+{
+  services.postgresql = {
+    enable = true;
+    enableTCPIP = true;
+    ensureDatabases = [ "nextcloud" ];
+    ensureUsers = [
+      {
+          name = "nextcloud";
+          ensureDBOwnership = true;
+      }
+    ];
+    authentication = lib.mkForce ''
+      # TYPE  DATABASE        USER            ADDRESS                 METHOD
+      local   all             all                                     trust
+      host    all             all             127.0.0.1/32            trust
+      host    all             all             ::1/128                 trust
+      host    all             all        0.0.0.0/0     md5
+      ''; # address is the computer you are connecting from
+  };
+}