diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix
deleted file mode 100644
index 4353bb00780e0244c1a9550caa1067745e0d24e1..0000000000000000000000000000000000000000
--- a/machines/dragonwell/caddy.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{lib, ...}: let
- packages = ["tmpl" "git-age" "ffmd"];
-in {
- services.caddy = {
- enable = true;
- virtualHosts = {
- "jolheiser.com" = {
- extraConfig = ''
- root * /srv/jolheiser.com/dist
- file_server
- '';
- serverAliases = ["www.jolheiser.com"];
- };
- "go.jolheiser.com" = {
- extraConfig =
- ''
- header Content-Type text/html
- respond / `Go Packages${lib.strings.concatMapStrings (pkg: "- ${pkg}
") packages}
`
- ''
- + lib.strings.concatMapStrings (pkg: ''
- respond /${pkg}* `
-
-
-
- Redirecting to https://pkg.go.dev/go.jolheiser.com/${pkg}
- `
- '')
- packages;
- };
- };
- };
-}
diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index 6d02f3a5a7a3f0f0ecc4f341cf1f69fb6b3ee8a6..c35fef6c1cbc43d44411ff1943b68602a1d11e0b 100644
--- a/machines/dragonwell/default.nix
+++ b/machines/dragonwell/default.nix
@@ -1,7 +1,7 @@
-let
+{pkgs, ...}: let
username = "jolheiser";
in {
- imports = [./caddy.nix ./hardware.nix ../common/nogui];
+ imports = [./hardware.nix ../common/nogui];
boot.tmp.cleanOnBoot = true;
zramSwap.enable = true;
@@ -9,11 +9,8 @@
networking = {
hostName = "dragonwell";
- firewall = {
- enable = true;
-let
username = "jolheiser";
- };
+ hostName = "dragonwell";
};
services = {