From 319b64e69c1ad2886a34fc76f189204abe70fe8f Mon Sep 17 00:00:00 2001
From: Patrick King <patrick@patrickcking.com>
Date: Thu, 7 Nov 2024 17:21:52 -0800
Subject: [PATCH] Fixing Hammerspoon:

Broke my own hammerspoon config so I am staging changes that I had in place
before pulling them again.
---
 tilde/.hammerspoon/init.lua                |  2 ++
 tilde/.hammerspoon/spoon-config/urls.lua   |  8 +++++---
 tilde/.hammerspoon/system/audioControl.lua | 12 ++++++------
 tilde/.hammerspoon/system/display.lua      |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/tilde/.hammerspoon/init.lua b/tilde/.hammerspoon/init.lua
index 9f22c2cd..1a001c78 100644
--- a/tilde/.hammerspoon/init.lua
+++ b/tilde/.hammerspoon/init.lua
@@ -84,6 +84,8 @@ menubarLargeStyle = { font = { name = "DejaVuSansMono Nerd Font Mono", size = 20
 
 defaultStyle = { font = { name = ".AppleSystemUIFont", size = 13 } }
 
+Homedir = os.getenv( "HOME" )
+
 -- ========================================================================= }}}
 -- Important functions ===================================================== {{{
 run = require("functions/run")
diff --git a/tilde/.hammerspoon/spoon-config/urls.lua b/tilde/.hammerspoon/spoon-config/urls.lua
index e8d716ae..4cd27baf 100644
--- a/tilde/.hammerspoon/spoon-config/urls.lua
+++ b/tilde/.hammerspoon/spoon-config/urls.lua
@@ -28,14 +28,16 @@ function urls.init()
     spoon.URLDispatcher.url_patterns = {
         {"https://captive.apple.com/", builtin},
         {"https?://%w+.beatsense.com", builtin},
-        {"https?://%w+.twitter.com/", builtin},
-        {"https?://%w+.zoom.us/j/", meetings},
         {"https?://%w+.tiktok.com", builtin},
+        {"https?://%w+.twitter.com/", builtin},
         {"https?://%w+.w2g.tv", builtin},
+        {"https?://%w+.x.com/", builtin},
+        {"https?://%w+.zoom.us/j/", meetings},
+        {"https?://meet.google.com", builtin},
         {"https?://tiktok.com", builtin},
-        {"https?://twitter.com/", builtin},
         {"https?://w2g.tv", builtin},
         {"https?://www.beatsense.com", builtin},
+        {"https?://x.com/", builtin},
         {"https?://zoom.us/j/", meetings},
     }
 
diff --git a/tilde/.hammerspoon/system/audioControl.lua b/tilde/.hammerspoon/system/audioControl.lua
index b3dcc3ea..136f8df5 100644
--- a/tilde/.hammerspoon/system/audioControl.lua
+++ b/tilde/.hammerspoon/system/audioControl.lua
@@ -91,11 +91,11 @@ local function trapVolumeControls()
                     if event["key"] == "MUTE" then
                         if isMuted == false then
                             isMuted = true
-                            run.cmd("/Users/patrickking/bin/m1ddc", { "set", "mute", "on" })
+                            run.cmd(string.format("%s/bin/m1ddc", Homedir), { "set", "mute", "on" })
                             _log("Muted external monitor.")
                         else
                             isMuted = false
-                            run.cmd("/Users/patrickking/bin/m1ddc", { "set", "mute", "off" })
+                            run.cmd(string.format("%s/bin/m1ddc", Homedir), { "set", "mute", "off" })
                             _log("Unmuted external monitor.")
                         end
                         return true
@@ -103,11 +103,11 @@ local function trapVolumeControls()
 
                     -- Send volume up to external monitor if connected and it's the default audio output
                     if event["key"] == "SOUND_UP" then
-                        run.cmd("/Users/patrickking/bin/m1ddc", { "chg", "volume", "+5" })
+                        run.cmd(string.format("%s/bin/m1ddc", Homedir), { "chg", "volume", "+5" })
                         return true
                     end
                     if event["key"] == "SOUND_DOWN" then
-                        run.cmd("/Users/patrickking/bin/m1ddc", { "chg", "volume", "-5" })
+                        run.cmd(string.format("%s/bin/m1ddc", Homedir), { "chg", "volume", "-5" })
                         return true
                     end
                 end
@@ -158,7 +158,7 @@ end
 function audioControl.muteOutputs()
     for _, device in pairs(hs.audiodevice.allOutputDevices()) do
         if device:name() == secrets.audioControl.monitorOutput then
-            run.cmd("/Users/patrickking/bin/m1ddc", { "set", "mute", "on" })
+            run.cmd(string.format("%s/bin/m1ddc", Homedir), { "set", "mute", "on" })
             _log("External display " .. device:name() .. " muted")
             return
         end
@@ -173,7 +173,7 @@ end
 function audioControl.unmuteOutputs()
     for _, device in pairs(hs.audiodevice.allOutputDevices()) do
         if device:name() == secrets.audioControl.monitorOutput then
-            run.cmd("/Users/patrickking/bin/m1ddc", { "set", "mute", "off" })
+            run.cmd(string.format("%s/bin/m1ddc", Homedir), { "set", "mute", "off" })
             _log("External display " .. device:name() .. " unmuted")
             return
         end
diff --git a/tilde/.hammerspoon/system/display.lua b/tilde/.hammerspoon/system/display.lua
index 367b9985..36c402c2 100644
--- a/tilde/.hammerspoon/system/display.lua
+++ b/tilde/.hammerspoon/system/display.lua
@@ -19,7 +19,7 @@ function display.setAllBrightness(brightness)
         else
             _log("Setting " .. display:name() .. " brightness to " .. brightness)
             -- Use ddcctl to set the brightness of all external displays
-            run.cmd("/Users/patrickking/bin/m1ddc", {"set", "luminance", tostring(brightness)})
+            run.cmd(string.format("%s/bin/m1ddc", Homedir), {"set", "luminance", tostring(brightness)})
         end
     end
 end