From 06e268d66bbf6d606b349a4f0be3af66ab3ea2be Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 5 Oct 2025 14:12:17 -0500
Subject: [PATCH] services/barrier: drop module

Upstream package removed and unmaintained project. Recommended to
replace with maintained alternatives such as `deskflow` and `input-leap`

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 modules/modules.nix                           |  4 +
 modules/services/barrier.nix                  | 96 -------------------
 .../services/barrier/basic-configuration.nix  | 13 ---
 tests/modules/services/barrier/default.nix    |  5 -
 4 files changed, 4 insertions(+), 114 deletions(-)
 delete mode 100644 modules/services/barrier.nix
 delete mode 100644 tests/modules/services/barrier/basic-configuration.nix
 delete mode 100644 tests/modules/services/barrier/default.nix

diff --git a/modules/modules.nix b/modules/modules.nix
index 0a67ea03b..c3303ff88 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -81,6 +81,10 @@ let
     (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.
+    '')
   ]
   ++ (lib.concatMap
     (
diff --git a/modules/services/barrier.nix b/modules/services/barrier.nix
deleted file mode 100644
index c5ac8b9ac..000000000
--- a/modules/services/barrier.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib)
-    getExe'
-    mkEnableOption
-    mkOption
-    optional
-    types
-    ;
-
-  cfg = config.services.barrier;
-in
-{
-
-  meta.maintainers = with lib.maintainers; [ kritnich ];
-
-  imports = [
-    (lib.mkRemovedOptionModule [ "services" "barrier" "client" "tray" ] ''
-      The tray option is non-functional and has been removed.
-    '')
-  ];
-
-  options.services.barrier = {
-
-    package = lib.mkPackageOption pkgs "barrier" { };
-
-    client = {
-
-      enable = mkEnableOption "Barrier Client daemon";
-
-      name = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = ''
-          Screen name of client. Defaults to hostname.
-        '';
-      };
-
-      server = mkOption {
-        type = types.str;
-        description = ''
-          Server to connect to formatted as
-          `<host>[:<port>]`.
-          Port defaults to `24800`.
-        '';
-      };
-
-      enableCrypto = mkEnableOption "crypto (SSL) plugin" // {
-        default = true;
-      };
-
-      enableDragDrop = mkEnableOption "file drag &amp; drop";
-
-      extraFlags = mkOption {
-        type = types.listOf types.str;
-        default = [ "-f" ];
-        defaultText = lib.literalExpression ''[ "-f" ]'';
-        description = ''
-          Additional flags to pass to {command}`barrierc`.
-          See {command}`barrierc --help`.
-        '';
-      };
-
-    };
-  };
-
-  config = lib.mkIf cfg.client.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.barrier" pkgs lib.platforms.linux)
-    ];
-
-    systemd.user.services.barrierc = {
-      Unit = {
-        Description = "Barrier Client daemon";
-        After = [ "graphical-session.target" ];
-        PartOf = [ "graphical-session.target" ];
-      };
-      Install.WantedBy = [ "graphical-session.target" ];
-      Service.ExecStart =
-        with cfg.client;
-        toString (
-          [ "${getExe' cfg.package "barrierc"}" ]
-          ++ optional (name != null) "--name ${name}"
-          ++ optional (!enableCrypto) "--disable-crypto"
-          ++ optional enableDragDrop "--enable-drag-drop"
-          ++ extraFlags
-          ++ [ server ]
-        );
-    };
-  };
-}
diff --git a/tests/modules/services/barrier/basic-configuration.nix b/tests/modules/services/barrier/basic-configuration.nix
deleted file mode 100644
index 7a9ad097a..000000000
--- a/tests/modules/services/barrier/basic-configuration.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  services.barrier.client = {
-    enable = true;
-    server = "testServer";
-  };
-
-  nmt.script = ''
-    clientServiceFile=home-files/.config/systemd/user/barrierc.service
-
-    assertFileExists $clientServiceFile
-    assertFileRegex $clientServiceFile 'ExecStart=.*/bin/barrierc -f testServer'
-  '';
-}
diff --git a/tests/modules/services/barrier/default.nix b/tests/modules/services/barrier/default.nix
deleted file mode 100644
index 6ad82e470..000000000
--- a/tests/modules/services/barrier/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-  barrier-basic-configuration = ./basic-configuration.nix;
-}