From 3f07ce05c3b6d59602bc380e42320483081fa38f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 5 Oct 2025 19:30:18 -0500
Subject: [PATCH] deprecations: add deprecations/removal module

Add a module for consolidating the module level deprecations in an
easier to spot location.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 modules/deprecations.nix | 22 ++++++++++++++++++++++
 modules/modules.nix      | 20 ++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 modules/deprecations.nix

diff --git a/modules/deprecations.nix b/modules/deprecations.nix
new file mode 100644
index 000000000..02f459950
--- /dev/null
+++ b/modules/deprecations.nix
@@ -0,0 +1,22 @@
+{ lib, ... }:
+{
+  imports = [
+    (lib.mkRemovedOptionModule [ "services" "password-store-sync" ] ''
+      Use services.git-sync instead.
+    '')
+    (lib.mkRemovedOptionModule [ "services" "keepassx" ] ''
+      KeePassX is no longer maintained.
+    '')
+    (lib.mkRemovedOptionModule [ "programs" "thefuck" ] ''
+      The corresponding package was removed from nixpkgs,
+      consider using `programs.pay-respects` instead.
+    '')
+    (lib.mkRemovedOptionModule [ "programs" "octant" ] ''
+      Octant is no longer maintained and project was archived.
+    '')
+    (lib.mkRemovedOptionModule [ "services" "barrier" ] ''
+      The corresponding package was removed from nixpkgs,
+      consider using `deskflow` or `input-leap` instead.
+    '')
+  ];
+}
diff --git a/modules/modules.nix b/modules/modules.nix
index c3303ff88..bfa8c763b 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -67,24 +67,8 @@ let
     # keep-sorted end
     (pkgs.path + "/nixos/modules/misc/assertions.nix")
     (pkgs.path + "/nixos/modules/misc/meta.nix")
-
-    (lib.mkRemovedOptionModule [ "services" "password-store-sync" ] ''
-      Use services.git-sync instead.
-    '')
-    (lib.mkRemovedOptionModule [ "services" "keepassx" ] ''
-      KeePassX is no longer maintained.
-    '')
-    (lib.mkRemovedOptionModule [ "programs" "thefuck" ] ''
-      The corresponding package was removed from nixpkgs,
-      consider using `programs.pay-respects` instead.
-    '')
-    (lib.mkRemovedOptionModule [ "programs" "octant" ] ''
-      Octant is no longer maintained and project was archived.
-    '')
-    (lib.mkRemovedOptionModule [ "services" "barrier" ] ''
-      The corresponding package was removed from nixpkgs,
-      consider using `deskflow` or `input-leap` instead.
-    '')
+    # Module deprecations and removals
+    ./deprecations.nix
   ]
   ++ (lib.concatMap
     (