From 2af364ef9699b8a96f5bc9ff0e0cb2a1f536dd93 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 5 Apr 2025 09:00:00 +0100
Subject: [PATCH] Extract a screenkey mixin

---
 hosts/t480/configuration.nix        |  1 +
 modules/mixins/screenkey.nix        | 15 +++++++++++++++
 modules/nixos/default.nix           |  1 -
 modules/nixos/desktop/default.nix   |  5 -----
 modules/nixos/desktop/screenkey.nix | 25 -------------------------
 5 files changed, 16 insertions(+), 31 deletions(-)
 create mode 100644 modules/mixins/screenkey.nix
 delete mode 100644 modules/nixos/desktop/default.nix
 delete mode 100644 modules/nixos/desktop/screenkey.nix

diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 5d655a94..10bd033a 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -15,6 +15,7 @@
     ../../modules/mixins/fzf.nix
     ../../modules/mixins/phpactor
     ../../modules/mixins/pipewire.nix
+    ../../modules/mixins/screenkey.nix
     ../../modules/mixins/thunar.nix
     ../../modules/profiles/dwm
     ../../modules/profiles/xbanish.nix
diff --git a/modules/mixins/screenkey.nix b/modules/mixins/screenkey.nix
new file mode 100644
index 00000000..70c8941f
--- /dev/null
+++ b/modules/mixins/screenkey.nix
@@ -0,0 +1,15 @@
+{
+  home-manager.users.opdavies =
+    { pkgs, ... }:
+    {
+      home.packages = with pkgs; [ screenkey ];
+
+      xdg.configFile."screenkey.json".text = builtins.toJSON {
+        key_mode = "composed";
+        mods_mode = "emacs";
+        persist = true;
+        size = "small";
+        timeout = 0.25;
+      };
+    };
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 5cdba89b..46985cc0 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./desktop
     ./homelab
   ];
 }
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
deleted file mode 100644
index e8a21886..00000000
--- a/modules/nixos/desktop/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./screenkey.nix
-  ];
-}
diff --git a/modules/nixos/desktop/screenkey.nix b/modules/nixos/desktop/screenkey.nix
deleted file mode 100644
index 1c667b41..00000000
--- a/modules/nixos/desktop/screenkey.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  username,
-  ...
-}:
-
-with lib;
-
-{
-  options.nixosModules.screenkey.enable = mkEnableOption "Enable screenkey";
-
-  config = mkIf config.nixosModules.screenkey.enable {
-    environment.systemPackages = with pkgs; [ screenkey ];
-
-    home-manager.users.${username}.xdg.configFile."screenkey.json".text = builtins.toJSON {
-      key_mode = "composed";
-      mods_mode = "emacs";
-      persist = true;
-      size = "small";
-      timeout = 0.25;
-    };
-  };
-}