From 261e587384e8389b45ac7c7c55b96ee7b098eed7 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Mon, 3 Jul 2023 16:32:41 -0500
Subject: [PATCH] adding some tweaks

---
 .config/hypr/hyprland.conf      |  2 +-
 guix/home-services/hyprland.scm |  5 +++++
 guix/home.scm                   |  1 +
 guix/pkgs/zola.scm              | 17 ++++++++++++++++-
 scripts/kdenlivelof             | 10 +++++-----
 5 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 guix/home-services/hyprland.scm

diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index dc4aed3..fa4f58f 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -138,7 +138,7 @@ bind = SUPER,w,exec,/home/chris/bin/window.sh
 bind = SUPER,E,exec,/home/chris/bin/emacslof
 bind = SUPER,d,exec,emacsclient -c -e '(dired-jump)'
 bind = SUPER,v,exec,emacsclient -e '(chris/dired-open-videos)'
-bind = SUPER,B,exec,/home/chris/bin/nyxtlof
+bind = SUPER,B,exec,/home/chris/bin/fflof
 bind = SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer
 bind = SUPERCTRL,i,exec,alacritty --class btop -e btop
 bind = ,Print,exec,screenshot
diff --git a/guix/home-services/hyprland.scm b/guix/home-services/hyprland.scm
new file mode 100644
index 0000000..da03436
--- /dev/null
+++ b/guix/home-services/hyprland.scm
@@ -0,0 +1,5 @@
+(define-module (hyprland)
+  #:use-module (ice-9 popen)
+  #:use-module (ice-9 rdelim))
+
+(read-line)
diff --git a/guix/home.scm b/guix/home.scm
index cbc409f..9185145 100644
--- a/guix/home.scm
+++ b/guix/home.scm
@@ -57,6 +57,7 @@
         "btop"
         "htop"
         "ripgrep"
+        "jq"
         "bat"
         "dutree"
         "alacritty"
diff --git a/guix/pkgs/zola.scm b/guix/pkgs/zola.scm
index 448d329..4753429 100644
--- a/guix/pkgs/zola.scm
+++ b/guix/pkgs/zola.scm
@@ -1,6 +1,7 @@
 (define-module (zola)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages crates-io)
   #:use-module (gnu packages compression)
   #:use-module (gnu services)
   #:use-module (guix utils)
@@ -25,7 +26,21 @@
                  (base32
                   "1x9xdrp6j9n6nlj3xvv5b71vl08yizq16cm4dv9zkd9pm6w6szxa"))))
       (build-system cargo-build-system)
-      (native-inputs (list tar bzip2))
+      (native-inputs (list tar
+                           bzip2
+                           rust-serde-1
+                           rust-anyhow-1
+                           rust-ahash-0.8
+                           rust-clap-4
+                           rust-hyper-tls-0.5
+                           rust-tokio-fs-0.1
+                           rust-time-0.3
+                           rust-notify-4
+                           rust-ctrlc-3
+                           rust-open-2
+                           rust-pathdiff-0.2
+                           rust-mime-0.3
+                           rust-mime-guess-2))
       ;; (arguments
       ;;  )
       (home-page "https://github.com/phisch/phinger-cursors")
diff --git a/scripts/kdenlivelof b/scripts/kdenlivelof
index c4a6aa9..376a743 100755
--- a/scripts/kdenlivelof
+++ b/scripts/kdenlivelof
@@ -3,7 +3,7 @@
 # Check to see if an kdenlive is running
 if [ $(pgrep -c kdenlive) -gt 0 ]; then
     
-    if [ $XDG_SESSION_TYPE = "x11" ]; then
+    if [ "$XDG_SESSION_TYPE" = "x11" ]; then
         #X11
         kdenliverg=$(wmctrl -lx | rg kdenlive.kdenlive | rg -v org-agenda | awk '{print $1}')
         # echo $kdenliverg
@@ -16,17 +16,17 @@ if [ $(pgrep -c kdenlive) -gt 0 ]; then
             exit
         fi
     else
-        if [ $KDE_FULL_SESSION = "true" ]; then
+        if [ "$KDE_FULL_SESSION" = "true" ]; then
             exec /home/chris/bin/ww -fa Kdenlive -c kdenlive
             exit
         else
             # WAYLAND
-            kdenliverg=$(wlrctl window list | rg -v 'kdenlive:\sorg-agenda' | rg 'kdenlive:')
+            # kdenliverg=$(wlrctl window list | rg -v 'kdenlive:\sorg-agenda' | rg 'kdenlive:')
 
-            kdenlivewin=$(echo $kdenliverg | sed 's/.*\: //')
+            # kdenlivewin=$(echo $kdenliverg | sed 's/.*\: //')
             # echo $kdenlivewin
 
-            exec wlrctl toplevel focus title:"$kdenlivewin"
+            exec hyprctl dispatch focuswindow kdenlive
             exit
         fi
     fi