From e0af023ac90499766a7b8a7630cc45d247f1a1ef Mon Sep 17 00:00:00 2001
From: Zuckerberg <zuckerberg@neet.dev>
Date: Sat, 10 Jan 2026 22:51:09 -0800
Subject: [PATCH] barrier was removed from nixpkgs

---
 common/pc/default.nix         |  2 +-
 machines/zoidberg/default.nix | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/common/pc/default.nix b/common/pc/default.nix
index 1ae0718..90d4990 100644
--- a/common/pc/default.nix
+++ b/common/pc/default.nix
@@ -49,7 +49,7 @@ in
       joplin-desktop
       config.inputs.deploy-rs.packages.${config.currentSystem}.deploy-rs
       lxqt.pavucontrol-qt
-      barrier
+      deskflow
 
       # For Nix IDE
       nixpkgs-fmt
diff --git a/machines/zoidberg/default.nix b/machines/zoidberg/default.nix
index e4ef03a..d3ce7ba 100644
--- a/machines/zoidberg/default.nix
+++ b/machines/zoidberg/default.nix
@@ -39,28 +39,6 @@
     "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
   ];
 
-  # System wide barrier instance
-  # systemd.services.barrier-sddm = {
-  #   description = "Barrier mouse/keyboard share";
-  #   requires = [ "display-manager.service" ];
-  #   after = [ "network.target" "display-manager.service" ];
-  #   wantedBy = [ "multi-user.target" ];
-  #   serviceConfig = {
-  #     Restart = "always";
-  #     RestartSec = 10;
-  #     # todo use user/group
-  #   };
-  #   path = with pkgs; [ barrier doas ];
-  #   script = ''
-  #     # Wait for file to show up. "display-manager.service" finishes a bit too soon
-  #     while ! [ -e /run/sddm/* ]; do sleep 1; done;
-  #     export XAUTHORITY=$(ls /run/sddm/*)
-  #     # Disable crypto is fine because tailscale is E2E encrypting better than barrier could anyway
-  #     barrierc -f --disable-crypto --name zoidberg ray.koi-bebop.ts.net
-  #   '';
-  # };
-
-  # Login into X11 plasma so barrier works well
   services.displayManager.defaultSession = "plasma";
 
   users.users.cris = {