From 679a0900126cd338a7fc4a8bb4995e7676b74139 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 27 Jul 2025 19:45:14 +0100
Subject: [PATCH] Move bluetuith configuration

---
 home-manager/opdavies/t480.nix     |  1 -
 modules/home-manager/bluetuith.nix | 41 ------------------------------
 modules/home-manager/default.nix   |  1 -
 modules2/bluetuith.nix             | 29 +++++++++++++++++++++
 4 files changed, 29 insertions(+), 43 deletions(-)
 delete mode 100644 modules/home-manager/bluetuith.nix
 create mode 100644 modules2/bluetuith.nix

diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index c6588ff6..69ce0434 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -8,7 +8,6 @@
 
   features = {
     cli = {
-      bluetuith.enable = true;
       bookmarkthis.enable = true;
       direnv.enable = true;
       node.enable = true;
diff --git a/modules/home-manager/bluetuith.nix b/modules/home-manager/bluetuith.nix
deleted file mode 100644
index fff34766..00000000
--- a/modules/home-manager/bluetuith.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.features.cli.bluetuith;
-in
-{
-  options.features.cli.bluetuith.enable = mkEnableOption "Enable bluetuith";
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      bluetuith
-    ];
-
-    xdg.configFile."bluetuith/bluetuith.conf" = {
-      text = ''
-        {
-          adapter: ""
-          adapter-states: ""
-          connect-bdaddr: ""
-          gsm-apn: ""
-          gsm-number: ""
-
-          keybindings: {
-            NavigateDown: j
-            NavigateUp: k
-          }
-
-          receive-dir: ""
-          theme: {}
-        }
-      '';
-    };
-  };
-}
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 67ff3031..8b161110 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./bluetuith.nix
     ./bookmarkthis.nix
     ./browsers/chromium.nix
     ./browsers/firefox.nix
diff --git a/modules2/bluetuith.nix b/modules2/bluetuith.nix
new file mode 100644
index 00000000..a3ff23db
--- /dev/null
+++ b/modules2/bluetuith.nix
@@ -0,0 +1,29 @@
+{
+  flake.modules.homeManager.base =
+    { pkgs, ... }:
+    {
+      home.packages = [
+        pkgs.bluetuith
+      ];
+
+      xdg.configFile."bluetuith/bluetuith.conf" = {
+        text = ''
+          {
+            adapter: ""
+            adapter-states: ""
+            connect-bdaddr: ""
+            gsm-apn: ""
+            gsm-number: ""
+
+            keybindings: {
+              NavigateDown: j
+              NavigateUp: k
+            }
+
+            receive-dir: ""
+            theme: {}
+          }
+        '';
+      };
+    };
+}