de-utm urls and use newfound fennel knowledge
diff --git a/.hammerspoon/init.fnl b/.hammerspoon/init.fnl
index 6cfa35c3..a57f8e63 100644
--- a/.hammerspoon/init.fnl
+++ b/.hammerspoon/init.fnl
@@ -1,22 +1,23 @@
-(local log (hs.logger.new "log" "info"))
-(set hs.logger.defaultLogLevel "info")
+(local log (hs.logger.new :log :info))
+(set hs.logger.defaultLogLevel :info)
(local mash [:cmd :alt :ctrl])
(local smash [:cmd :alt :ctrl :shift])
(set hs.window.animationDuration 0.0)
-(hs.loadSpoon "MiroWindowsManager")
-;; (set spoon.MiroWindowsManager.fullScreenSizes [1 (/ 4 3) 2]) ;; only fullscreen
-(spoon.MiroWindowsManager:bindHotkeys {
- :up [ mash "k" ]
- :left [ mash "h" ]
- :down [ mash "j" ]
- :right [ mash "l" ]
- :fullscreen [ mash "m" ]
- ;; :center [ mash "c" ]
- ;; :move [ smash "m" ]
- ;; :resize [ mash "d" ]
-})
+(hs.loadSpoon :MiroWindowsManager)
+;; (set spoon.MiroWindowsManager.fullScreenSizes [1 (/ 4 3) 2]) ; only fullscreen
+
+;; fnlfmt: skip
+(spoon.MiroWindowsManager:bindHotkeys {:up [mash :k]
+ :left [mash :h]
+ :down [mash :j]
+ :right [mash :l]
+ :fullscreen [mash :m]
+ ;; :center [mash "c"]
+ ;; :move [smash "m"]
+ ;; :resize [mash "d"]
+ })
;; debugging
;; (hs.hotkey.bind mash "d" (fn []))
@@ -24,70 +25,74 @@
;; (hs.hotkey.bind mash "d" (fn [] (hs.dialog.alert 100 100 (fn [] ) "message" "text" "one" "two")))
;; defeat paste blocking
-(hs.hotkey.bind [:cmd :alt] "v" (fn [] (hs.eventtap.keyStrokes (hs.pasteboard.getContents))))
-
-(hs.hotkey.bind mash "e" (fn []
- (let [app (hs.application.frontmostApplication)
- prev-pasteboard (hs.pasteboard.getContents)
- e (hs.uielement.focusedElement)
- text (if e (e:selectedText)
- (do
- (hs.eventtap.keyStroke [:cmd] "c")
- (hs.pasteboard.getContents)))
- date (hs.execute "date -Iseconds -u | tr -d '\n'")
- file (.. "~/.quickcursor." date)]
- (hs.pasteboard.setContents text)
- (hs.execute (.. "pbpaste > " file))
- (hs.execute (.. "/opt/homebrew/bin/mvim --nofork " file))
- (hs.execute (.. "pbcopy < " file))
- (app:setFrontmost)
- (hs.eventtap.keyStroke [:cmd] "v")
- (hs.execute (.. "rm " file))
- (hs.pasteboard.setContents prev-pasteboard))))
+(hs.hotkey.bind [:cmd :alt] :v
+ #(hs.eventtap.keyStrokes (hs.pasteboard.getContents)))
+
+(hs.hotkey.bind mash :e
+ #(let [app (hs.application.frontmostApplication)
+ prev-pasteboard (hs.pasteboard.getContents)
+ e (hs.uielement.focusedElement)
+ text (if e (e:selectedText)
+ (do
+ (hs.eventtap.keyStroke [:cmd] :c)
+ (hs.pasteboard.getContents)))
+ date (hs.execute "date -Iseconds -u | tr -d '\n'")
+ file (.. "~/.quickcursor." date)]
+ (hs.pasteboard.setContents text)
+ (hs.execute (.. "pbpaste > " file))
+ (hs.execute (.. "/opt/homebrew/bin/mvim --nofork " file))
+ (hs.execute (.. "pbcopy < " file))
+ (app:setFrontmost)
+ (hs.eventtap.keyStroke [:cmd] :v)
+ (hs.execute (.. "rm " file))
+ (hs.pasteboard.setContents prev-pasteboard)))
;; https://stackoverflow.com/questions/39464668/how-to-get-bundle-id-of-mac-application
;; osascript -e 'id of app "SomeApp"'
;; mdls -name kMDItemCFBundleIdentifier -r SomeApp.app
+
+;; fnlfmt: skip
+(local matchers {".*[.]zoom.us/j/%d+" :us.zoom.xos
+ ".*[.]discnw.org/" :com.apple.Safari
+ :squareup.com/ :com.apple.Safari})
+
(fn bundleIDForURL [url]
- (let [matchers {
- ".*[.]zoom.us/j/%d+" "us.zoom.xos"
- ".*[.]discnw.org/" "com.apple.Safari"
- "squareup.com/" "com.apple.Safari" }]
- (do
- (var bundleID nil)
- (each [key value (pairs matchers) :until bundleID]
- (if (string.find url (.. "^https://" key))
- (set bundleID value)))
- (or bundleID "org.mozilla.firefoxdeveloperedition"))))
+ (var bundleID nil)
+ (each [key value (pairs matchers) :until bundleID]
+ (if (string.find url (.. "^https://" key))
+ (set bundleID value)))
+ (or bundleID :org.mozilla.firefoxdeveloperedition))
(set hs.urlevent.httpCallback
- (fn [scheme host params fullURL]
- (let [command (.. "curl -Ls -o /dev/null -w %{url_effective} " fullURL)
- handle (io.popen command)
- url (handle:read "*a")
- bundleID (bundleIDForURL url)]
- (hs.urlevent.openURLWithBundle fullURL bundleID))))
-
-;; Spoons
-
-(hs.loadSpoon "ReloadConfiguration")
-(spoon.ReloadConfiguration:start)
-
-(hs.loadSpoon "Quitter")
-(set spoon.Quitter.quitAppsAfter {
- :Discord 300
- :MailMate 600
- :Messages 300
- :Reeder 600
- :Slack 300
- :Telegram 300
- :Twitterrific 300
-})
+ (fn [scheme host params url]
+ (let [run #(: (io.popen (.. $1 " \"" $2 "\"")) :read :*a)
+ de-utm (partial run "~/.dotfiles/bin/de-utm")
+ redirect (partial run "curl -Ls -o /dev/null -w %{url_effective}")
+ final-url (->> url
+ (de-utm)
+ (redirect)
+ (de-utm))
+ bundleID (bundleIDForURL final-url)]
+ (hs.urlevent.openURLWithBundle final-url bundleID))))
+
+;;; Spoons
+
+(: (hs.loadSpoon :ReloadConfiguration) :start)
+
+(hs.loadSpoon :Quitter)
+
+;; fnlfmt: skip
+(set spoon.Quitter.quitAppsAfter
+ {:Discord 300
+ :MailMate 600
+ :Messages 300
+ :Reeder 600
+ :Slack 300
+ :Telegram 300
+ :Twitterrific 300})
+
(spoon.Quitter:start)
-(let [n (hs.notify.new {
- :title "Hammerspoon"
- :informativeText "Config loaded"
- :withdrawAfter 2
- })]
- (n:send))
+(: (hs.notify.new {:title :Hammerspoon
+ :informativeText "Config loaded"
+ :withdrawAfter 2}) :send)
diff --git a/bin/de-utm b/bin/de-utm
index 48a8ff09..eac03789 100755
Binary files a/bin/de-utm and b/bin/de-utm differ