From f4447c25e1844ab9e41c7d74521554fb1644d208 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Thu, 4 May 2023 15:27:27 -0500
Subject: [PATCH] idk some tweaks

---
 alacritty/alacritty.yml   |  2 +-
 dunst/dunstrc             |  2 +-
 eww/eww.scss              |  9 +++++++++
 eww/eww.yuck              | 20 +++++++++++++++++++-
 pkgs/desktop-packages.nix |  2 +-
 scripts/disk              |  2 +-
 user/modules/hyprland.nix |  5 ++++-
 7 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index f98459f..fcfdbc7 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -357,7 +357,7 @@ colors:
 #   - (Linux/BSD) user login shell
 #   - (Windows) powershell
 shell:
-  program: nu
+  program: fish
 #  args:
 #    - --login
 
diff --git a/dunst/dunstrc b/dunst/dunstrc
index 533decc..cd6b768 100644
--- a/dunst/dunstrc
+++ b/dunst/dunstrc
@@ -2,7 +2,7 @@
     ### Display ###
 
     # Which monitor should the notifications be displayed on.
-    monitor = 0
+    monitor = 2
 
     # Display notification on focused monitor.  Possible modes are:
     #   mouse: follow mouse pointer
diff --git a/eww/eww.scss b/eww/eww.scss
index d3b6c5c..f17dc08 100644
--- a/eww/eww.scss
+++ b/eww/eww.scss
@@ -231,6 +231,15 @@ tooltip label {
     margin: 0px 15px 0px 3px;
 }
 
+.disk_label {
+    color: $base09;
+}
+
+.icondisk {
+    font-size: 18;
+    color: $base09;
+    margin: 0px 15px 0px 3px;
+}
 
 .separ {
     color: $base03;
diff --git a/eww/eww.yuck b/eww/eww.yuck
index 937bcfd..4816c71 100644
--- a/eww/eww.yuck
+++ b/eww/eww.yuck
@@ -16,6 +16,7 @@
 (defpoll ESSID_WLAN :interval "1m" "scripts/wifi --ESSID")
 (defpoll WLAN_ICON :interval "1m" "scripts/wifi --ICON")
 (defpoll HOST :interval "1h" "hostname")
+(defpoll DISK :interval "1m" "disk")
 (deflisten volume_percent :interval "0.5s"  "tail -F /tmp/vol")
 (deflisten workspace "scripts/workspace")
 (deflisten appname "scripts/appname")
@@ -175,11 +176,27 @@
              :text "${round(EWW_BATTERY['BAT1'].capacity, 0)}%"
              :class "bat_label")))
 
+(defwidget disk []
+	   (box
+	    :class "disk_module"
+	    :vexpand "false"
+	    :hexpand "false" 
+            :spacing 0
+            (button 
+             :onclick "scripts/pop system"
+             :class "icondisk"
+             :tooltip "${DISK}"
+             "󰋊")
+            (label
+             :text "${DISK}"
+             :class "disk_label")))
+
 (defwidget bright []
 	   (box
 	    :class "bright_module"
 	    :vexpand "false"
 	    :hexpand "false" 
+            :visible {HOST == "kaladin" ? "false" : "true"}
             (button 
              :class "iconbright"
              ;; :onclick "scripts/pop audio"
@@ -267,7 +284,7 @@
     :space-evenly "false"
     :orientation "h"
     (button
-     :onclick "exec nextcloud"
+     :onclick "nextcloud"
       (label
       :text ""))))
 
@@ -314,6 +331,7 @@
             :halign "end"
 	    :class "right_modules"
             (sep)
+            (disk)
             (cpu)
             (mem)
             (volume)
diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix
index e03bf47..73774a7 100644
--- a/pkgs/desktop-packages.nix
+++ b/pkgs/desktop-packages.nix
@@ -121,7 +121,7 @@ with lib;
     picom-jonaburg
     pamixer
     playerctl
-    # jellyfin-mpv-shim
+    jellyfin-mpv-shim
     pfetch
     macchina
     gimp
diff --git a/scripts/disk b/scripts/disk
index 6bd1f83..cdd638a 100755
--- a/scripts/disk
+++ b/scripts/disk
@@ -2,4 +2,4 @@
 
 disk_usage=$(df -h | rg /dev/nvme0n1p2 | awk '{print $4}' | head -n 1)
 
-echo "󰋊 $disk_usage "
+echo "$disk_usage "
diff --git a/user/modules/hyprland.nix b/user/modules/hyprland.nix
index c4cc1be..ab187b1 100644
--- a/user/modules/hyprland.nix
+++ b/user/modules/hyprland.nix
@@ -107,6 +107,9 @@
     }
 
     # misc:disable_autoreload = true
+    misc {
+        focus_on_activate = true
+    }
 
     # example window rules
     # for windows named/classed as abc and xyz
@@ -185,7 +188,7 @@
     bind = SUPERSHIFT,9,movetoworkspace,9
     bind = SUPERSHIFT,0,movetoworkspace,10
 
-    bind = SUPER,o,movewindow,mon: next
+    bind = SUPER,o,movewindow,mon:l
     bind = SUPER,y,togglespecialworkspace
     bind = SUPER,i,movewindow,left
     bind = SUPERSHIFT,p,pin