From 96c5af1ef7db8a6771e267ecc8c276182bd75284 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Wed, 21 Dec 2022 09:14:17 -0600
Subject: [PATCH] switching to self built ydotool

---
 LightlyShaders/default.nix       |  3 +--
 LightlyShaders/flake.lock        |  6 +++---
 README.org                       |  5 +++--
 scripts/kderofi-rbw              | 10 +++++-----
 system/kaladin/configuration.nix |  4 ++--
 system/syl/configuration.nix     |  3 ++-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/LightlyShaders/default.nix b/LightlyShaders/default.nix
index 5050b2c..b84847b 100644
--- a/LightlyShaders/default.nix
+++ b/LightlyShaders/default.nix
@@ -16,7 +16,7 @@
   kcoreaddons,
   # systemsettings,
   cmake,
-  qt5Full,
+  qt5base,
   extra-cmake-modules,
   wrapQtAppsHook,
   libepoxy,
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     qtbase
-    qt5Full
     qtx11extras
     qttools
     kglobalaccel
diff --git a/LightlyShaders/flake.lock b/LightlyShaders/flake.lock
index 1700c1e..a37b72c 100644
--- a/LightlyShaders/flake.lock
+++ b/LightlyShaders/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1668417584,
-        "narHash": "sha256-yeuEyxKPwsm5fIHN49L/syn9g5coxnPp3GsVquhrv5A=",
+        "lastModified": 1671359686,
+        "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "013fcdd106823416918004bb684c3c186d3c460f",
+        "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
         "type": "github"
       },
       "original": {
diff --git a/README.org b/README.org
index 8ecb91c..c73ca84 100644
--- a/README.org
+++ b/README.org
@@ -475,7 +475,7 @@ pulsemixer
 any-nix-shell
 wtype
 xdotool
-ydotool
+# ydotool
 wmctrl
 xcape
 xclip
@@ -555,7 +555,7 @@ Let's also add our own package from my WIP presenter
 
 #+NAME: ydotool
 #+begin_src nix
-(callPackage /home/chris/.dotfiles/ydotool {})
+(import /home/chris/.dotfiles/ydotool { inherit lib stdenv util-linux cmake scdoc fetchFromGitHub; })
 #+end_src
 
 Firefox has it's own setup
@@ -880,6 +880,7 @@ Notice how I am including all of my software here. It may be a big file, but hav
     fet-sh
     macchina
     # Dev tools
+    <<ydotool>>
     <<dev-tools>>
     <<lightlyshaders>>
     <<librepresenter>>
diff --git a/scripts/kderofi-rbw b/scripts/kderofi-rbw
index 867a937..e3436c2 100755
--- a/scripts/kderofi-rbw
+++ b/scripts/kderofi-rbw
@@ -69,16 +69,16 @@ fi
 case ${option} in
     Password )
 	echo "${SECRET}"
-	ydotool type --key-delay 2ms $(rbw get "${SECRET}")
+	ydotool type --key-delay 1ms $(rbw get "${SECRET}")
 	;;
     User )
 	echo "$(rbw get --full "${SECRET}" | rg Username: | awk '{print $2}')"
-	ydotool type --key-delay 2ms "$(rbw get --full "${SECRET}" | rg Username: | awk '{print $2}')"
+	ydotool type --key-delay 1ms "$(rbw get --full "${SECRET}" | rg Username: | awk '{print $2}')"
 	;;
     "User and password" )
-	ydotool type --key-delay 2ms $(rbw get --full "${SECRET}" | rg Username: | awk '{print $2}')
+	ydotool type --key-delay 1ms $(rbw get --full "${SECRET}" | rg Username: | awk '{print $2}')
 	ydotool key 15:1 15:0
-	ydotool type --key-delay 2ms $(rbw get "${SECRET}")
+	ydotool type --key-delay 1ms $(rbw get "${SECRET}")
 	;;
     "QR-Code" )
 	if [[ $SECRET =~ wifi$ ]]; then
@@ -93,7 +93,7 @@ case ${option} in
 	fi
 	;;
     OTP )
-	ydotool type --key-delay 2ms $(rbw code "${SECRET}")
+	ydotool type --key-delay 1ms $(rbw code "${SECRET}")
 	;;
 esac
 
diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index 620afad..f110645 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -351,7 +351,7 @@
     any-nix-shell
     wtype
     xdotool
-    ydotool
+    # ydotool
     wmctrl
     xcape
     xclip
@@ -390,7 +390,7 @@
     protonup
     nvtop
     # Dev tools
-    (callPackage /home/chris/.dotfiles/ydotool {})
+    (import /home/chris/.dotfiles/ydotool { inherit lib stdenv util-linux cmake scdoc fetchFromGitHub; })
     # android-tools
     nix-index
     # meson
diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix
index db6ba45..e6b4d43 100644
--- a/system/syl/configuration.nix
+++ b/system/syl/configuration.nix
@@ -370,7 +370,7 @@
     any-nix-shell
     wtype
     xdotool
-    ydotool
+    # ydotool
     wmctrl
     xcape
     xclip
@@ -411,6 +411,7 @@
     fet-sh
     macchina
     # Dev tools
+    (import /home/chris/.dotfiles/ydotool { inherit lib stdenv util-linux cmake scdoc fetchFromGitHub; })
     # android-tools
     nix-index
     # meson