From 8b67ff20b274a8501f9c0ff57447276a5b48624a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 10 Jul 2024 00:31:00 +0200
Subject: [PATCH] fix micro

---
 base.nix                              |  2 ++
 overlay.nix                           | 27 +++++++++++++++++++++++++++
 users/pbsds/home/profiles/desktop.nix | 20 +-------------------
 users/pbsds/home/profiles/micro.nix   | 24 +-----------------------
 4 files changed, 31 insertions(+), 42 deletions(-)
 create mode 100644 overlay.nix

diff --git a/base.nix b/base.nix
index 6df4c6b..d2c3c2d 100644
--- a/base.nix
+++ b/base.nix
@@ -11,6 +11,8 @@
     (ifExists ./hardware-configuration.nix )
   ];
 
+  nixpkgs.overlays = [ (import ./overlay.nix) ];
+
   nixpkgs.config.permittedInsecurePackages = [
     pkgs.pulsar.name
     pkgs.zotero.name
diff --git a/overlay.nix b/overlay.nix
new file mode 100644
index 0000000..76affba
--- /dev/null
+++ b/overlay.nix
@@ -0,0 +1,27 @@
+final: prev:
+
+let
+  inherit (final) lib;
+in
+
+rec {
+
+  # https://github.com/bugaevc/wl-clipboard/issues/185
+  wl-clipboard-timeout = prev.symlinkJoin {
+    inherit (prev.wl-clipboard) name;
+    paths = [
+      (prev.writeShellScriptBin "wl-copy" ''
+        timeout 0.3s ${lib.getExe' prev.wl-clipboard "wl-copy"} "$@"
+      '')
+      (prev.writeShellScriptBin "wl-paste" ''
+        timeout 0.3s ${lib.getExe' prev.wl-clipboard "wl-paste"} "$@"
+      '')
+      prev.wl-clipboard
+    ];
+  };
+
+  micro = prev.micro.override {
+    wl-clipboard = wl-clipboard-timeout;
+  };
+
+}
diff --git a/users/pbsds/home/profiles/desktop.nix b/users/pbsds/home/profiles/desktop.nix
index 05cfccb..c98fe5f 100644
--- a/users/pbsds/home/profiles/desktop.nix
+++ b/users/pbsds/home/profiles/desktop.nix
@@ -1,23 +1,5 @@
 { pkgs, lib, ... }:
 
-let
-
-  # https://github.com/bugaevc/wl-clipboard/issues/185
-  wl-clipboard' = pkgs.symlinkJoin {
-    inherit (pkgs.wl-clipboard) name;
-    paths = [
-      (pkgs.writeShellScriptBin "wl-copy" ''
-        timeout 0.25s ${lib.getExe' pkgs.wl-clipboard "wl-copy"} "$@"
-      '')
-      (pkgs.writeShellScriptBin "wl-paste" ''
-        timeout 0.25s ${lib.getExe' pkgs.wl-clipboard "wl-paste"} "$@"
-      '')
-      pkgs.wl-clipboard
-    ];
-  };
-
-in
-
 {
 
   imports = [
@@ -38,7 +20,7 @@ in
   ];
 
   home.packages = with pkgs; [
-    wl-clipboard'
+    wl-clipboard-timeout
 
     discord
     element-desktop
diff --git a/users/pbsds/home/profiles/micro.nix b/users/pbsds/home/profiles/micro.nix
index 48cab29..9beb4e9 100644
--- a/users/pbsds/home/profiles/micro.nix
+++ b/users/pbsds/home/profiles/micro.nix
@@ -1,27 +1,5 @@
 { pkgs, lib, ... }:
 
-let
-
-  # https://github.com/bugaevc/wl-clipboard/issues/185
-  wl-clipboard' = pkgs.symlinkJoin {
-    inherit (pkgs.wl-clipboard) name;
-    paths = [
-      (pkgs.writeShellScriptBin "wl-copy" ''
-        timeout 0.25s ${lib.getExe' pkgs.wl-clipboard "wl-copy"} "$@"
-      '')
-      (pkgs.writeShellScriptBin "wl-paste" ''
-        timeout 0.25s ${lib.getExe' pkgs.wl-clipboard "wl-paste"} "$@"
-      '')
-      pkgs.wl-clipboard
-    ];
-  };
-
-  micro' = pkgs.micro.override {
-    wl-clipboard = wl-clipboard';
-  };
-
-in
-
 {
   # TODO: upstream this
   imports         = [ ../modules/micro.nix ];
@@ -32,7 +10,7 @@ in
   home.sessionVariables.EDITOR = "micro";
 
   home.packages = with pkgs; [
-    micro'
+    micro
     aspell
     aspellDicts.en
     aspellDicts.nb