From 4c2ac2539f7a0e331004ad3970c4f9452cceb9d1 Mon Sep 17 00:00:00 2001
From: "Agatha V. Lovelace" <agatha@technogothic.net>
Date: Sat, 15 Apr 2023 14:09:45 +0200
Subject: [PATCH] Use url-eater NixOS module

---
 common/fragments/graphical/url-eater.nix | 16 +++------
 flake.lock                               | 44 ++++++++----------------
 flake.nix                                |  2 +-
 3 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/common/fragments/graphical/url-eater.nix b/common/fragments/graphical/url-eater.nix
index e70df31..3713392 100644
--- a/common/fragments/graphical/url-eater.nix
+++ b/common/fragments/graphical/url-eater.nix
@@ -1,6 +1,6 @@
-{ pkgs, config, lib, ... }:
+{ ... }:
 let
-  filters = pkgs.writeText "filters.kdl" ''
+  filters = ''
     category "Action Map" {
     	params "action_object_map" "action_ref_map" "action_type_map"
     }
@@ -133,14 +133,8 @@ let
     }
   '';
 in {
-  systemd.user.services."url-eater" = {
-    description = "Clipboard URL cleanup service";
-
-    after = [ "graphical-session-pre.target" ];
-    wantedBy = [ "graphical-session.target" ];
-
-    script = ''
-      exec ${pkgs.url-eater}/bin/url-eater ${filters}
-    '';
+  services.url-eater = {
+    enable = true;
+    inherit filters;
   };
 }
diff --git a/flake.lock b/flake.lock
index 3462f8d..9592bfd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -232,11 +232,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1680958354,
-        "narHash": "sha256-lU5r4RgrRmlqiRsefZFahvD/bsnKJbVHNRwRjBXg3fY=",
+        "lastModified": 1681484601,
+        "narHash": "sha256-P4PKDkK34HcKpz+JM6J/A+xalX6JS0T4OpOK68vmf1c=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "58e457a4e1037caf43c17dea93c5321c1ae74103",
+        "rev": "4cdba7cccdd6a9fe5fbb3d15c9db3edc147b7a90",
         "type": "github"
       },
       "original": {
@@ -249,15 +249,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "utils": "utils_3"
+        ]
       },
       "locked": {
-        "lastModified": 1680667162,
-        "narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=",
+        "lastModified": 1681468923,
+        "narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d",
+        "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189",
         "type": "github"
       },
       "original": {
@@ -569,11 +568,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1680865339,
-        "narHash": "sha256-H6rmJ1CyJ3Q5ZyoLMYq/UEYMS9Q1orJjRpWiQ47HudE=",
+        "lastModified": 1681349002,
+        "narHash": "sha256-9Ckc2WvSwuYrPfk3ZXgPasM1ir/cgs6UV0EpIWyPGZE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0040164e473509b4aee6aedb3b923e400d6df10b",
+        "rev": "2b1bba76a13ed39c7abc0a6e8f74f9e168cf3c7c",
         "type": "github"
       },
       "original": {
@@ -719,14 +718,14 @@
       "inputs": {
         "naersk": "naersk_3",
         "nixpkgs": "nixpkgs_9",
-        "utils": "utils_4"
+        "utils": "utils_3"
       },
       "locked": {
-        "lastModified": 1680708368,
-        "narHash": "sha256-ZsFU/5aRoD6ggqLJzSv+j6wFN6A6ZCBnmK18WeNjU50=",
+        "lastModified": 1681559430,
+        "narHash": "sha256-d2Xh2YoFALsNqmsQgwGVEda7pGFvLF+WS0DMDBmYHSI=",
         "owner": "AgathaSorceress",
         "repo": "url-eater",
-        "rev": "1ee90d22937dcf3fcb939d49dcfcf5cd3c1ae617",
+        "rev": "d007d1f2f7d9b4c658d684c60b2767718e5f2383",
         "type": "github"
       },
       "original": {
@@ -785,21 +784,6 @@
         "repo": "flake-utils",
         "type": "github"
       }
-    },
-    "utils_4": {
-      "locked": {
-        "lastModified": 1678901627,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index f5ea95e..fac3c00 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,6 @@
             overlays = [
               (final: prev: {
                 helix = helix.packages.${final.system}.default;
-                url-eater = url-eater.defaultPackage.${final.system};
                 colorpickle = colorpickle.defaultPackage.${final.system};
                 frq-friend = frq-friend.defaultPackage.${final.system};
               })
@@ -75,6 +74,7 @@
             ./common
             ./hosts/ritual/configuration.nix
             (import "${home-manager}/nixos")
+            url-eater.nixosModule
           ];
 
           deployment = {