Extract a bluetooth mixin

home/opdavies/hosts/t480.nix

@@ -2,7 +2,6 @@
 
 {
   homeManagerModules = {
-    bluetuith.enable = true;
     direnv.enable = true;
     discord.enable = true;
     dwm.enable = true;

home/opdavies/hosts/t490.nix

@@ -2,7 +2,6 @@
 
 {
   homeManagerModules = {
-    bluetuith.enable = true;
     direnv.enable = true;
     discord.enable = true;
     dwm.enable = true;

hosts/t480/configuration.nix

@@ -3,12 +3,13 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./hardware.nix
     ./programs.nix
     ./secrets.nix
     ./services
     ./users.nix
 
+    ../../modules/mixins/bluetooth.nix
+
     ./modules/docker.nix
 
     ../common

hosts/t480/hardware.nix

@@ -1,5 +0,0 @@
-{
-  hardware = {
-    bluetooth.enable = true;
-  };
-}

hosts/t480/services/default.nix

@@ -17,8 +17,6 @@
       openFirewall = true;
     };
 
-    blueman.enable = true;
-
     gvfs.enable = true;
     openssh.enable = true;
     power-profiles-daemon.enable = false;

modules/home-manager/cli/default.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ./bin
-    ./bluetuith.nix
     ./direnv.nix
     ./fzf.nix
     ./git.nix

modules/mixins/bluetooth.nix

@@ -1,20 +1,15 @@
-{
+{ pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
 
 {
-  options.homeManagerModules.bluetuith.enable = mkEnableOption "Enable bluetuith";
+  hardware.bluetooth.enable = true;
 
-  config = mkIf config.homeManagerModules.bluetuith.enable {
+  services.blueman.enable = true;
-    home.packages = with pkgs; [
-      bluetuith
-    ];
 
+  environment.systemPackages = with pkgs; [
+    bluetuith
+  ];
+
+  home-manager.users.opdavies = {
     xdg.configFile."bluetuith/bluetuith.conf" = {
       text = ''
         {
@@ -23,10 +18,12 @@ with lib;
           connect-bdaddr: ""
           gsm-apn: ""
           gsm-number: ""
+
           keybindings: {
             NavigateDown: j
             NavigateUp: k
           }
+
           receive-dir: ""
           theme: {}
         }