From 73da0808477008facbfebe354bcead06e8882b51 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Fri, 5 May 2023 13:10:09 -0500
Subject: [PATCH] tweaks for hyprland and emacs

---
 eww/eww.scss              |  4 ++--
 modules/emacs.nix         |  2 ++
 pkgs/desktop-packages.nix |  2 ++
 scripts/screenshot        | 20 +++++++++++++++-----
 scripts/window.sh         |  9 ++++++---
 user/modules/hyprland.nix |  3 ++-
 6 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/eww/eww.scss b/eww/eww.scss
index f17dc08..bfe6632 100644
--- a/eww/eww.scss
+++ b/eww/eww.scss
@@ -211,7 +211,7 @@ tooltip label {
 }
 .iconbright {
     color: $base09;
-    margin: 2px 13px 0px 8px;
+    margin: 3px 13px 0px 8px;
 }
 .iconbat, .iconmem, .iconcpu .iconvol .iconbright {
     font-size: 12;
@@ -238,7 +238,7 @@ tooltip label {
 .icondisk {
     font-size: 18;
     color: $base09;
-    margin: 0px 15px 0px 3px;
+    margin: 3px 5px 0px 3px;
 }
 
 .separ {
diff --git a/modules/emacs.nix b/modules/emacs.nix
index 8a4717b..e7772d5 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -130,6 +130,8 @@ with lib;
         gcmh
         use-package
         esh-autosuggest
+        melpaPackages.org-ai
+        melpaPackages.gptel
         pkgs.mu
         pkgs.openjdk
         pkgs.languagetool
diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix
index 73774a7..b648da0 100644
--- a/pkgs/desktop-packages.nix
+++ b/pkgs/desktop-packages.nix
@@ -68,6 +68,8 @@ with lib;
     qt5.qtwayland
     qt6.qtwayland
     swww
+    grim
+    slurp
     # mkchromecast
     plocate
     # librepresenter.libre-presenter
diff --git a/scripts/screenshot b/scripts/screenshot
index b96ecb3..e936f14 100755
--- a/scripts/screenshot
+++ b/scripts/screenshot
@@ -2,9 +2,9 @@
 
 if [ $(hostname) = "syl" ]; then
     if [ $XDG_SESSION_TYPE = "x11" ]; then
-        style="laptop-search"
+        style="laptop"
     else
-        style="laptop-search-wayland"
+        style="laptop-rbw-wayland"
     fi
 else 
     style="desktop-search"
@@ -13,7 +13,12 @@ fi
 
 timestamp=$(date +%F-%T)
 
-picture=$(maim --hidecursor --select /tmp/$timestamp.png)
+if [ $XDG_SESSION_TYPE = "x11" ]; then
+    picture=$(maim --hidecursor --select /tmp/$timestamp.png)
+else
+    region=$(slurp)
+    picture=$(grim -g "$region" /tmp/$timestamp.png)
+fi
 
 declare -a options=(
     "clipboard"
@@ -21,14 +26,19 @@ declare -a options=(
     "cancel"
 )
 
-choice=$(printf '%s\n' "${options[@]}" | rofi -theme /home/chris/.config/rofi/launchers-git/$style.rasi -dmenu -p 'Clip or Save')
+choice=$(printf '%s\n' "${options[@]}" | rofi -sync -i -theme /home/chris/.config/rofi/launchers-git/$style.rasi -dmenu -p 'Clip or Save')
 
 if [[ "$choice" == "cancel" ]]; then
     rm /tmp/$timestamp.png
     echo "Canceled." && exit 1
 
 elif [ "$choice" == "clipboard" ]; then
-    xclip -selection clipboard -target image/png -i /tmp/$timestamp.png
+
+    if [ $XDG_SESSION_TYPE = "x11" ]; then
+        xclip -selection clipboard -target image/png -i /tmp/$timestamp.png
+    else
+        wl-copy /tmp/$timestamp.png
+    fi
     rm /tmp/$timestamp.png
     echo 'saved to clipboard'
     
diff --git a/scripts/window.sh b/scripts/window.sh
index ecf9f3a..85ab336 100755
--- a/scripts/window.sh
+++ b/scripts/window.sh
@@ -2,11 +2,14 @@
 
 window=$(wlrctl window list | rofi -i -sync -dmenu -p " " -theme ~/.config/rofi/launchers-git/laptop-rbw-wayland.rasi)
 
+echo $window
+
 win=$(echo $window | awk '{print $1}' | sed 's/://')
 
-if [ $win == "" ]
+echo $win
+
+if [ ! -z "$win" ]
 then
-    exit 0
+    wlrctl window focus $win
 fi
 
-wlrctl window focus $win
diff --git a/user/modules/hyprland.nix b/user/modules/hyprland.nix
index 1617559..0a711e9 100644
--- a/user/modules/hyprland.nix
+++ b/user/modules/hyprland.nix
@@ -138,7 +138,7 @@
     bind = SUPERSHIFT,D,exec,dolphin
     bind = SUPERSHIFT,F,togglefloating,
     bindr = SUPER,Super_L,exec,/home/chris/bin/launcher.sh
-    # bindr = ALT,Alt_L,exec,/home/chris/bin/window.sh
+    bindr = ALT,Alt_L,exec,/home/chris/bin/window.sh
     bind = SUPER,w,exec,/home/chris/bin/window.sh
     bind = SUPER,E,exec,/home/chris/bin/emacslof
     bind = SUPER,d,exec,emacsclient -c -e '(chris/dired-open-wm)'
@@ -146,6 +146,7 @@
     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
 
     bind = SUPER,P,exec,/home/chris/bin/rbw.sh
     bind = SUPER,M,fullscreen,1