From ad516fd7e0c8601bcdfc7d0fd2b65584720dab4c Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 25 Jul 2025 10:30:13 +0100
Subject: [PATCH] Move xbanish configuration

---
 hosts/t480/configuration.nix |  1 -
 modules/nixos/default.nix    |  1 -
 modules/nixos/xbanish.nix    | 14 --------------
 modules2/xbanish.nix         |  3 +++
 4 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 modules/nixos/xbanish.nix
 create mode 100644 modules2/xbanish.nix

diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 2800ecf8..301b8e67 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -29,7 +29,6 @@
     core = {
       openssh.enable = true;
       pipewire.enable = true;
-      xbanish.enable = true;
       zram.enable = true;
     };
 
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index f732bb95..c100a5ff 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -14,7 +14,6 @@
     ./podman.nix
     ./st.nix
     ./thunar.nix
-    ./xbanish.nix
     ./zram.nix
   ];
 }
diff --git a/modules/nixos/xbanish.nix b/modules/nixos/xbanish.nix
deleted file mode 100644
index 723eeff9..00000000
--- a/modules/nixos/xbanish.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.features.core.xbanish;
-in
-{
-  options.features.core.xbanish.enable = mkEnableOption "Enable xbanish";
-
-  config = mkIf cfg.enable {
-    services.xbanish.enable = true;
-  };
-}
diff --git a/modules2/xbanish.nix b/modules2/xbanish.nix
new file mode 100644
index 00000000..5ebb30b0
--- /dev/null
+++ b/modules2/xbanish.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.pc.services.xbanish.enable = true;
+}