diff --git a/dragonwell/services/atproto.nix b/dragonwell/services/atproto.nix
index e96c1ff7b83ea82cccc743be2bfb3b717fbadbca..6fce0df7fd5ac6a358718aa40a892d7ebcfc899e 100644
--- a/dragonwell/services/atproto.nix
+++ b/dragonwell/services/atproto.nix
@@ -1,15 +1,9 @@
-{
-  jolheiser,
-  config,
-  lib,
-  ...
-}:
+{ jolheiser, config, ... }:
 let
-  enable = true;
   port = 2759;
   host = "pds.${jolheiser.domain}";
 in
-lib.mkIf enable {
+{
   age.secrets.pds.file = ../../secrets/pds.age;
   services = {
     bluesky-pds = {
diff --git a/dragonwell/services/beszel.nix b/dragonwell/services/beszel.nix
index 747ce00f200926a94aced22bbacc1ce825e32e5d..50ef37e7547039fcd3958e2d1d830d57ea69befb 100644
--- a/dragonwell/services/beszel.nix
+++ b/dragonwell/services/beszel.nix
@@ -1,8 +1,5 @@
-{ config, lib, ... }:
-let
-  enable = true;
-in
-lib.mkIf enable {
+{ config, ... }:
+{
   age.secrets.beszel-dragonwell.file = ../../secrets/beszel-dragonwell.age;
   services.beszel.agent = {
     enable = true;
diff --git a/dragonwell/services/caddy.nix b/dragonwell/services/caddy.nix
index 9e9a6901668d34cbadef36927bf96a5aa72e2539..9ce60f5f5fb74eb639fb470e6cd33cf1d8841aeb 100644
--- a/dragonwell/services/caddy.nix
+++ b/dragonwell/services/caddy.nix
@@ -2,13 +2,9 @@ {
   jolheiser,
   inputs,
   pkgs,
-  lib,
   ...
 }:
-let
-  enable = true;
-in
-lib.mkIf enable {
+{
   services.caddy = {
     enable = true;
     virtualHosts = {
diff --git a/dragonwell/services/forge-lines.nix b/dragonwell/services/forge-lines.nix
index fe26d224cb77b736f61bd8aaef4b94a864150b5c..6faec823e772dfce32f9392c55196d6bcd0b673b 100644
--- a/dragonwell/services/forge-lines.nix
+++ b/dragonwell/services/forge-lines.nix
@@ -1,11 +1,8 @@
-{ config, lib, ... }:
-let
-  enable = false;
-in
-lib.mkIf enable {
+{ config, ... }:
+{
   age.secrets.forge-lines.file = ../../secrets/forge-lines.age;
   services.forge-lines = {
-    enable = true;
+    enable = false;
     discordTokenFile = config.age.secrets.forge-lines.path;
   };
 }
diff --git a/dragonwell/services/foundry.nix b/dragonwell/services/foundry.nix
index b2c24d8bf71851d9e4d1231d2809985a5c972d93..cafbf6dc9281dd8878f577434a44d2a91e84d758 100644
--- a/dragonwell/services/foundry.nix
+++ b/dragonwell/services/foundry.nix
@@ -2,15 +2,13 @@ {
   jolheiser,
   inputs,
   pkgs,
-  lib,
   ...
 }:
 let
-  enable = true;
   port = 30000;
   host = "dnd.${jolheiser.domain}";
 in
-lib.mkIf enable {
+{
   services = {
     foundryvtt = {
       enable = true;
diff --git a/dragonwell/services/git-bug.nix b/dragonwell/services/git-bug.nix
index 233629f6110537a4014d64910b9c7b5b9d3a9a84..d5eb1f476da2d0be0f9817a7fdc498bbd4a86d5e 100644
--- a/dragonwell/services/git-bug.nix
+++ b/dragonwell/services/git-bug.nix
@@ -6,7 +6,7 @@ in
 lib.mkIf enable {
   services = {
     git-bug.bugs = {
-      enable = true;
+      enable = false;
       repoDir = "/var/lib/ugit/repos/bugs.git";
       authorUser = "jolheiser";
       authorEmail = "bugs@jolheiser.com";
@@ -15,7 +15,7 @@       host = "localhost";
       inherit port;
     };
     tailproxy.bugs = {
-      enable = true;
+      enable = false;
       hostname = "bugs";
       inherit port;
       authKey = ""; # One-time key
diff --git a/dragonwell/services/git-pr.nix b/dragonwell/services/git-pr.nix
index d54abdde62400dc4c48344f1c7a3a6fe5470c8ae..bbe8a374f5e3db430d9f25da437f4d70fd04f508 100644
--- a/dragonwell/services/git-pr.nix
+++ b/dragonwell/services/git-pr.nix
@@ -1,10 +1,9 @@
-{ jolheiser, lib, ... }:
+{ jolheiser, ... }:
 let
-  enable = true;
   port = 7449;
   host = "pr.${jolheiser.domain}";
 in
-lib.mkIf enable {
+{
   services = {
     git-pr = {
       enable = false;
diff --git a/dragonwell/services/go.nix b/dragonwell/services/go.nix
index ac992aed96aa2d1a1a75e1506cdb2b17847360e0..18fcc61e67a6fade1c3f58cf777b38b762f24bb7 100644
--- a/dragonwell/services/go.nix
+++ b/dragonwell/services/go.nix
@@ -1,6 +1,5 @@
-{ jolheiser, lib, ... }:
+{ jolheiser, ... }:
 let
-  enable = true;
   altModules = [
     {
       name = "hcaptcha";
@@ -23,7 +22,7 @@                 </body></html>`
     '') altModules
   );
 in
-lib.mkIf enable {
+{
   services.caddy.virtualHosts."${host}" = {
     extraConfig = ''
       header Content-Type text/html
diff --git a/dragonwell/services/gollum.nix b/dragonwell/services/gollum.nix
index e08141f17e9edd556a56bbfaef2e66d9e13a0044..9e060cc60cc97f08d51844b18c8b09759a806574 100644
--- a/dragonwell/services/gollum.nix
+++ b/dragonwell/services/gollum.nix
@@ -2,14 +2,12 @@ {
   pkgs,
   jolheiser,
   config,
-  lib,
   ...
 }:
 let
-  enable = true;
   port = 9454;
 in
-lib.mkIf enable {
+{
   services = {
     gollum = {
       enable = true;
diff --git a/dragonwell/services/horcrux.nix b/dragonwell/services/horcrux.nix
index f1c281b810e39aba1854b86d2e73a7795bf7d4fd..de6b52d4a1bdd835c21f95463491f32601fb03e2 100644
--- a/dragonwell/services/horcrux.nix
+++ b/dragonwell/services/horcrux.nix
@@ -1,8 +1,5 @@
-{ config, lib, ... }:
-let
-  enable = true;
-in
-lib.mkIf enable {
+{ config, ... }:
+{
   age.secrets.horcrux = {
     file = ../../secrets/horcrux.age;
     owner = "horcrux";
diff --git a/dragonwell/services/mealie.nix b/dragonwell/services/mealie.nix
index ba7ca5a1bd179f8e09c033cb605ea6ce259fbf22..b67b2443a03498534f7d1906675c79d1047c748f 100644
--- a/dragonwell/services/mealie.nix
+++ b/dragonwell/services/mealie.nix
@@ -1,16 +1,14 @@
 {
   pkgs,
-  lib,
   jolheiser,
   config,
   ...
 }:
 let
-  enable = true;
   port = 3663;
   host = "recipes.${jolheiser.domain}";
 in
-lib.mkIf enable {
+{
   age.secrets.mealie.file = ../../secrets/mealie.age;
   services = {
     mealie = {
diff --git a/dragonwell/services/miniserve.nix b/dragonwell/services/miniserve.nix
index 3b9d28fd12071bc0d25f9825334a8e751a5fcbe2..d4cd4b55b97b71c76e1dcb1e960e29560a88f613 100644
--- a/dragonwell/services/miniserve.nix
+++ b/dragonwell/services/miniserve.nix
@@ -1,9 +1,7 @@
-{ lib, ... }:
 let
-  enable = true;
   port = 3453;
 in
-lib.mkIf enable {
+{
   services = {
     miniserve = {
       enable = true;
diff --git a/dragonwell/services/mint.nix b/dragonwell/services/mint.nix
index 7a7d5e52e32710e9e68cd027c95175867c50536f..71db8d12a12fbe19ee6a48f099686e04d71c93ae 100644
--- a/dragonwell/services/mint.nix
+++ b/dragonwell/services/mint.nix
@@ -2,15 +2,13 @@ {
   inputs,
   jolheiser,
   pkgs,
-  lib,
   config,
   ...
 }:
 let
-  enable = true;
   port = 6468;
 in
-lib.mkIf enable {
+{
   age.secrets.mint.file = ../../secrets/mint.age;
   services = {
     mint = {
diff --git a/dragonwell/services/oa2p.nix b/dragonwell/services/oa2p.nix
index bea283cf8c6550b2159469237d141219e12b7042..bf84920a0853b843cbf0d91714fd4db6d8ae2eeb 100644
--- a/dragonwell/services/oa2p.nix
+++ b/dragonwell/services/oa2p.nix
@@ -1,14 +1,8 @@
-{
-  jolheiser,
-  lib,
-  config,
-  ...
-}:
+{ jolheiser, config, ... }:
 let
-  enable = true;
   port = 6227;
 in
-lib.mkIf enable {
+{
   age.secrets.oa2p.file = ../../secrets/oa2p.age;
   services = {
     oauth2-proxy = {
diff --git a/dragonwell/services/pocket-id.nix b/dragonwell/services/pocket-id.nix
index 12d7367b702d3b41899c374897a1006639ef86d7..04f90178059566e2b3edcff835716def6e6364b2 100644
--- a/dragonwell/services/pocket-id.nix
+++ b/dragonwell/services/pocket-id.nix
@@ -1,15 +1,9 @@
-{
-  config,
-  jolheiser,
-  lib,
-  ...
-}:
+{ config, jolheiser, ... }:
 let
-  enable = true;
   port = 2884;
   host = "id.${jolheiser.domain}";
 in
-lib.mkIf enable {
+{
   age.secrets.pocket-id.file = ../../secrets/pocket-id.age;
   services = {
     pocket-id = {
diff --git a/dragonwell/services/pubserve.nix b/dragonwell/services/pubserve.nix
index 41cd7eddaa4780f2a592bae7401df7e5cdcbb3ad..38ac37e5c5fc542ebcf381c34395888ddd10981f 100644
--- a/dragonwell/services/pubserve.nix
+++ b/dragonwell/services/pubserve.nix
@@ -1,12 +1,11 @@
 { pkgs, lib, ... }:
 let
-  enable = true;
   user = "pubserve";
   path = "/var/lib/pubserve";
   pubPort = 3454;
   privPort = 3455;
 in
-lib.mkIf enable {
+{
   users.users.${user} = {
     group = user;
     home = path;
diff --git a/dragonwell/services/restic.nix b/dragonwell/services/restic.nix
index ae584018b16c7bdc1fadf83f4729344ba81a839c..fe861a1f577743645d830ea80077317099e3b5e3 100644
--- a/dragonwell/services/restic.nix
+++ b/dragonwell/services/restic.nix
@@ -1,8 +1,5 @@
-{ config, lib, ... }:
-let
-  enable = true;
-in
-lib.mkIf enable {
+{ config, ... }:
+{
   age.secrets = {
     restic-env.file = ../../secrets/restic-env.age;
     restic-pass.file = ../../secrets/restic-pass.age;
diff --git a/dragonwell/services/soju.nix b/dragonwell/services/soju.nix
index bd2b96f09880d22b583d75305bd222c44e33c1c6..e2cdc04473fe08dd41dc285e3e3c2c14f43dcf38 100644
--- a/dragonwell/services/soju.nix
+++ b/dragonwell/services/soju.nix
@@ -1,11 +1,10 @@
 { jolheiser, lib, ... }:
 let
-  enable = true;
   baseCertPath = "/var/lib/acme/${host}";
   port = 7658;
   host = "irc.${jolheiser.domain}";
 in
-lib.mkIf enable {
+{
   security.acme = {
     acceptTerms = true;
     email = "irc@jolheiser.com";
diff --git a/dragonwell/services/ugit.nix b/dragonwell/services/ugit.nix
index c268b6d82eb99a133100c153907bcb7ae8411d6b..baa2ffdda1b39b446e54193c640f95d6ff6dfb30 100644
--- a/dragonwell/services/ugit.nix
+++ b/dragonwell/services/ugit.nix
@@ -1,6 +1,5 @@
 { jolheiser, lib, ... }:
 let
-  enable = true;
   pubPort = 8449;
   privPort = 8447;
   host = "git.${jolheiser.domain}";
@@ -37,7 +36,7 @@         };
       };
     };
 in
-lib.mkIf enable {
+{
   services = {
     ugit = {
       public = opts;
diff --git a/dragonwell/services/woodpecker.nix b/dragonwell/services/woodpecker.nix
index 549f05111a3007243f773ab2bc58485c6eed3cf1..ab586889423b3467c1f1fd4f8812c31202fbce30 100644
--- a/dragonwell/services/woodpecker.nix
+++ b/dragonwell/services/woodpecker.nix
@@ -2,15 +2,13 @@ {
   inputs,
   jolheiser,
   pkgs,
-  lib,
   config,
   ...
 }:
 let
-  enable = true;
   port = 2423;
 in
-lib.mkIf enable {
+{
   age.secrets.woodpecker.file = ../../secrets/woodpecker.age;
   services = {
     woodpecker-server = {
diff --git a/dragonwell/services/zoekt.nix b/dragonwell/services/zoekt.nix
index 0f0d8ed8625094864753bd23330d24f1426a5d20..d323150e073984ac9c36e63cc469c46357bea051 100644
--- a/dragonwell/services/zoekt.nix
+++ b/dragonwell/services/zoekt.nix
@@ -1,12 +1,11 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 let
-  enable = true;
   user = "zoekt";
   repoDir = "/var/lib/ugit/repos";
   indexDir = "/var/lib/${user}";
   port = 4737;
 in
-lib.mkIf enable {
+{
   services.tailproxy.zoekt = {
     enable = true;
     hostname = "zoekt";