From 4149882ce85b3003e44dfb0bc0e73415601e39be Mon Sep 17 00:00:00 2001
From: Joshua Potter <jrpotter2112@gmail.com>
Date: Tue, 12 Dec 2023 08:18:35 -0700
Subject: [PATCH] Point to correct configuration file.

---
 digital-ocean/configuration.nix | 14 ++++++++++----
 hive/phobos/default.nix         |  6 +++---
 hive/titan/default.nix          |  4 ++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/digital-ocean/configuration.nix b/digital-ocean/configuration.nix
index 1535035..cc388d8 100644
--- a/digital-ocean/configuration.nix
+++ b/digital-ocean/configuration.nix
@@ -36,10 +36,12 @@ with lib;
         autoResize = true;
         fsType = "ext4";
       };
+
       swapDevices = [
         # Configured in `make-disk-image.nix`.
         { device = "/dev/disk/by-label/swap"; }
       ];
+
       boot = {
         growPartition = true;
         kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
@@ -51,11 +53,15 @@ with lib;
           grub.configurationLimit = 0;
         };
       };
-      services.openssh = {
-        enable = mkDefault true;
-        settings.PasswordAuthentication = mkDefault false;
+
+      services = {
+        do-agent.enable = mkDefault true;
+        openssh = {
+          enable = mkDefault true;
+          settings.PasswordAuthentication = mkDefault false;
+        };
       };
-      services.do-agent.enable = mkDefault true;
+
       networking = {
         hostName = mkDefault ""; # use Digital Ocean metadata server
       };
diff --git a/hive/phobos/default.nix b/hive/phobos/default.nix
index 8078a4b..08f8fcc 100644
--- a/hive/phobos/default.nix
+++ b/hive/phobos/default.nix
@@ -1,4 +1,4 @@
-{ system, stateVersion, sops-nix, modulesPath, pkgs, lib, ... }:
+{ system, stateVersion, sops-nix, pkgs, lib, ... }:
 let
   boardwise = builtins.getFlake
     "github:boardwise-gg/website/c605a09c56234b2c2c0e4593da8f3b798723a5d7";
@@ -7,7 +7,7 @@ let
 in
 {
   imports = lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [
-    (modulesPath + "/virtualisation/digital-ocean-config.nix")
+    ../../digital-ocean/configuration.nix
     sops-nix.nixosModules.sops
   ];
 
@@ -65,7 +65,7 @@ in
     enable = true;
     virtualHosts = {
       "www.boardwise.gg" = {
-        # forceSSL = true;
+        forceSSL = true;
         enableACME = true;
         serverAliases = [ "boardwise.gg" ];
         locations."/" = {
diff --git a/hive/titan/default.nix b/hive/titan/default.nix
index 96613e3..1e4e4ae 100644
--- a/hive/titan/default.nix
+++ b/hive/titan/default.nix
@@ -1,7 +1,7 @@
-{ system, stateVersion, home-manager, modulesPath, lib, ... }:
+{ system, stateVersion, home-manager, lib, ... }:
 {
   imports = lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [
-    (modulesPath + "/virtualisation/digital-ocean-config.nix")
+    ../../digital-ocean/configuration.nix
     home-manager.nixosModules.home-manager
   ];