From 07fc44eb5c56248746852144c520082f445d547e Mon Sep 17 00:00:00 2001
From: Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com>
Date: Sat, 17 Jan 2026 15:36:30 +0530
Subject: [PATCH] feat: lollipop ships with a systemd service now

---
 flake.nix                       |  2 +-
 hosts/default/configuration.nix | 14 +++----------
 hosts/default/sticky-keys.nix   | 35 ---------------------------------
 3 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 hosts/default/sticky-keys.nix

diff --git a/flake.nix b/flake.nix
index 0520af9..01d8f96 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,7 +49,7 @@
       cafeModules = [
         ./hosts/default/configuration.nix
         ./hosts/default/stylix.nix
-        { nixpkgs.overlays = [lollipop.overlays.default]; }
+        lollipop.nixosModules.default
       ];
 
       secureBootModules = [
diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 1801864..2ffeab4 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -51,6 +51,9 @@
   xdg.portal.enable = true;
   hardware.uinput.enable = true;
   services = {
+    # sticky keys
+    lollipop.enable = true;
+
     # dbus broker is faster
     dbus.implementation = "broker";
 
@@ -142,19 +145,8 @@
     sbctl
     wl-clipboard
     transmission_4-qt
-    lollipop
   ];
 
-  systemd.services.lollipop = {
-    enable = true;
-    description = "lollipop";
-    wantedBy = [ "multi-user.target" ];
-    # after = [ "network.target" ];
-    serviceConfig = {
-      ExecStart = "${pkgs.lollipop}/bin/lollipop";
-    };
-  };
-
   # Make sure opengl is enabled
   hardware.graphics.enable = true;
 
diff --git a/hosts/default/sticky-keys.nix b/hosts/default/sticky-keys.nix
deleted file mode 100644
index 1ce5b0f..0000000
--- a/hosts/default/sticky-keys.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  services.keyd = {
-    enable = true;
-    keyboards.sticky_keys.settings = {
-      global.layer_indicator = true;
-      main = {
-        control = "oneshot(control)";
-        meta = "oneshot(meta)";
-        shift = "oneshot(shift)";
-        leftalt = "oneshot(alt)";
-      };
-
-      control = {
-        control = "toggle(control)";
-        capslock = "clear()";
-      };
-
-      meta = {
-        meta = "toggle(meta)";
-        capslock = "clear()";
-      };
-
-      shift = {
-        shift = "toggle(shift)";
-        capslock = "clear()";
-      };
-
-      alt = {
-        leftalt = "toggle(alt)";
-        capslock = "clear()";
-      };
-
-    };
-  };
-}