From d37ccb80be86e1f790f231f3af88f25f4624f127 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Fri, 20 Oct 2023 16:24:52 -0500
Subject: [PATCH] tweaks

---
 .config/rofi/config.rasi |  1 +
 guix/channels.scm        | 90 ++++++++++++++++++----------------------
 guix/home.scm            |  3 +-
 scripts/window.sh        | 29 +++++++------
 4 files changed, 58 insertions(+), 65 deletions(-)

diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index dc05d0b..ccdf591 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -10,6 +10,7 @@ configuration {
     run-list-command:               "fish -c functions";
     display-drun:                   " ";
     display-run:                    " ";
+    display-window:                 " ";
     display-combi:                  " ";
     drun-display-format:            "{name} [<span weight='light' size='small'><i>({generic})</i></span>]";/* - {exec}*/
     threads:                        0;
diff --git a/guix/channels.scm b/guix/channels.scm
index 950fa4c..a96821f 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -1,54 +1,44 @@
 (list (channel
-       (name 'rde)
-       (url "https://git.sr.ht/~abcdw/rde")
-       (branch "master")
-       (commit
-        "793aa8aeb73ea2da28b314da08d4c3296cb3ff4e")
-       (introduction
-        (make-channel-introduction
-         "257cebd587b66e4d865b3537a9a88cccd7107c95"
-         (openpgp-fingerprint
-          "2841 9AC6 5038 7440 C7E9  2FFA 2208 D209 58C1 DEB0"))))
+        (name 'guix)
+        (url "https://git.savannah.gnu.org/git/guix.git")
+        (branch "master")
+        (commit
+          "b3d0797d279b0aa48f6b652c149b7f974f3acc89")
+        (introduction
+          (make-channel-introduction
+            "9edb3f66fd807b096b48283debdcddccfea34bad"
+            (openpgp-fingerprint
+              "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"))))
       (channel
-       (name 'rosenthal)
-       (url "https://codeberg.org/hako/rosenthal.git")
-       (branch "trunk")
-       (commit
-        "d47daea1e4f17fd897e2727584f2b042695fc780")
-       (introduction
-        (make-channel-introduction
-         "7677db76330121a901604dfbad19077893865f35"
-         (openpgp-fingerprint
-          "13E7 6CD6 E649 C28C 3385  4DF5 5E5A A665 6149 17F7"))))
+        (name 'nonguix)
+        (url "https://gitlab.com/nonguix/nonguix")
+        (branch "master")
+        (commit
+          "14656d642dc113c73f9b144ccba366376a274a2b")
+        (introduction
+          (make-channel-introduction
+            "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
+            (openpgp-fingerprint
+              "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
       (channel
-       (name 'nonguix)
-       (url "https://gitlab.com/nonguix/nonguix")
-       (branch "master")
-       (commit
-        "14656d642dc113c73f9b144ccba366376a274a2b")
-       (introduction
-        (make-channel-introduction
-         "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
-         (openpgp-fingerprint
-          "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
-      ;; (channel
-      ;;  (name 'emacs)
-      ;;  (url "https://github.com/babariviere/guix-emacs")
-      ;;  (commit
-      ;;   "a0c3bd55f9f8a33e65e28743d8d5df0c6deb5176")
-      ;;  (introduction
-      ;;   (make-channel-introduction
-      ;;    "72ca4ef5b572fea10a4589c37264fa35d4564783"
-      ;;    (openpgp-fingerprint
-      ;;     "261C A284 3452 FB01 F6DF  6CF4 F9B7 864F 2AB4 6F18"))))
+        (name 'rosenthal)
+        (url "https://codeberg.org/hako/rosenthal.git")
+        (branch "trunk")
+        (commit
+          "d47daea1e4f17fd897e2727584f2b042695fc780")
+        (introduction
+          (make-channel-introduction
+            "7677db76330121a901604dfbad19077893865f35"
+            (openpgp-fingerprint
+              "13E7 6CD6 E649 C28C 3385  4DF5 5E5A A665 6149 17F7"))))
       (channel
-       (name 'guix)
-       (url "https://git.savannah.gnu.org/git/guix.git")
-       (branch "master")
-       (commit
-        "d389f6777359aa44ef9c71989fc1f49e6b222f1d")
-       (introduction
-        (make-channel-introduction
-         "9edb3f66fd807b096b48283debdcddccfea34bad"
-         (openpgp-fingerprint
-          "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA")))))
+        (name 'rde)
+        (url "https://git.sr.ht/~abcdw/rde")
+        (branch "master")
+        (commit
+          "793aa8aeb73ea2da28b314da08d4c3296cb3ff4e")
+        (introduction
+          (make-channel-introduction
+            "257cebd587b66e4d865b3537a9a88cccd7107c95"
+            (openpgp-fingerprint
+              "2841 9AC6 5038 7440 C7E9  2FFA 2208 D209 58C1 DEB0")))))
diff --git a/guix/home.scm b/guix/home.scm
index 8fb616a..b433800 100644
--- a/guix/home.scm
+++ b/guix/home.scm
@@ -77,8 +77,6 @@
    "vlc"
    "mpv"
    "mpv-mpris"
-   "libva"
-   "libva-utils"
    "neofetch"
    "qrencode"
    "git:send-email"
@@ -117,6 +115,7 @@
 
    ;; Utilities and Libraries
    "libva"
+   "libva-utils"
    "libvpx"
    "python"
    "gstreamer"
diff --git a/scripts/window.sh b/scripts/window.sh
index c257a0a..d85659f 100755
--- a/scripts/window.sh
+++ b/scripts/window.sh
@@ -1,16 +1,19 @@
 #!/usr/bin/env bash
 
-json=$(hyprctl clients -j)
-window=$(echo $json | jq .[].title | rofi -i -sync -dmenu -p " " -theme ~/.config/rofi/launchers-git/laptop-rbw-wayland.rasi)
-
-echo $window
-
-win=$(echo $json | jq ".[] | select(.title==$window).address" | sed 's/"//g')
-
-echo $win
-
-if [ ! -z "$win" ]
-then
-    hyprctl dispatch focuswindow address:$win
+if [[ $HYPRLAND_INSTANCE_SIGNATURE ]];
+   rofi -i -show window -p " " -theme ~/.config/rofi/launchers-git/laptop-rbw-wayland.rasi
+else
+    json=$(hyprctl clients -j)
+    window=$(echo $json | jq .[].title | rofi -i -sync -dmenu -p " " -theme ~/.config/rofi/launchers-git/laptop-rbw-wayland.rasi)
+    
+    echo $window
+    
+    win=$(echo $json | jq ".[] | select(.title==$window).address" | sed 's/"//g')
+    
+    echo $win
+    
+    if [ ! -z "$win" ]
+    then
+        hyprctl dispatch focuswindow address:$win
+    fi
 fi
-