From 31c3dbb2055e3a40168cd3e0c399663dd4ee0978 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Wed, 24 Apr 2024 17:44:08 -0400
Subject: [PATCH] feat(mice): solaar -> ratbagd/piper

---
 devices/binto/default.nix                 |  2 +-
 flake.lock                                | 38 -----------------------
 flake.nix                                 |  8 -----
 modules/{logitech.nix => ratbag-mice.nix} | 12 +++----
 4 files changed, 6 insertions(+), 54 deletions(-)
 rename modules/{logitech.nix => ratbag-mice.nix} (69%)

diff --git a/devices/binto/default.nix b/devices/binto/default.nix
index 41ba361..1c19b5c 100644
--- a/devices/binto/default.nix
+++ b/devices/binto/default.nix
@@ -10,8 +10,8 @@ in {
     ../../modules/hyprland
     ../../modules/kmscon.nix
     ../../modules/printer.nix
+    ../../modules/ratbag-mice.nix
     ../../modules/razer.nix
-    ../../modules/logitech.nix
     ../../modules/sshd.nix
     ../../modules/tailscale.nix
 
diff --git a/flake.lock b/flake.lock
index 0c795f1..3f42f4e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -204,22 +204,6 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -1583,7 +1567,6 @@
         "pointer-event-src": "pointer-event-src",
         "pokemon-colorscripts-src": "pokemon-colorscripts-src",
         "secrets": "secrets",
-        "solaar": "solaar",
         "sops-nix": "sops-nix",
         "subsync": "subsync",
         "touch-gestures-src": "touch-gestures-src",
@@ -1633,27 +1616,6 @@
         "url": "ssh://git@git.nelim.org/matt1432/nixos-secrets"
       }
     },
-    "solaar": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1713808175,
-        "narHash": "sha256-GB8y5ml5nKUylTrJFJ4bUgiaGpLvH5Q3PvgJ3ZVebLE=",
-        "owner": "Svenum",
-        "repo": "Solaar-Flake",
-        "rev": "9667c00bae54130c0df321e92577df00b2f01835",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Svenum",
-        "repo": "Solaar-Flake",
-        "type": "github"
-      }
-    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index f551464..e1a312a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -250,14 +250,6 @@
     #
 
     # Desktop inputs
-    solaar = {
-      type = "github";
-      owner = "Svenum";
-      repo = "Solaar-Flake";
-
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     ## Hyprland
     hyprland = {
       type = "github";
diff --git a/modules/logitech.nix b/modules/ratbag-mice.nix
similarity index 69%
rename from modules/logitech.nix
rename to modules/ratbag-mice.nix
index a9efe0b..3fd9e2b 100644
--- a/modules/logitech.nix
+++ b/modules/ratbag-mice.nix
@@ -1,7 +1,7 @@
 {
   config,
   lib,
-  solaar,
+  pkgs,
   ...
 }: let
   inherit (config.vars) mainUser;
@@ -15,16 +15,14 @@
     .windowManager
     .hyprland;
 in {
-  imports = [
-    solaar.nixosModules.default
-  ];
-
-  programs.solaar.enable = true;
+  services.ratbagd.enable = true;
 
   # HOME-MANAGER CONFIG
   home-manager.users.${mainUser} = {
+    home.packages = with pkgs; [piper];
+
     wayland.windowManager.hyprland = mkIf (cfgHypr.enable) {
-      settings.exec-once = ["solaar -w hide -b symbolic"];
+      # settings.exec-once = [""];
     };
   };
 }