From ffc6b6e8165518808ff31192920c80ec638ae3bb Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Mon, 27 Dec 2021 20:37:30 -0500 Subject: remove a bunch of unused stuff --- .../Spoons/ReloadConfiguration.spoon/docs.json | 90 ------------ .../Spoons/ReloadConfiguration.spoon/init.lua | 49 ------- hammerspoon/Spoons/SpeedMenu.spoon/docs.json | 39 ------ hammerspoon/Spoons/SpeedMenu.spoon/init.lua | 111 --------------- hammerspoon/init.lua | 156 --------------------- hammerspoon/src/spaces | 1 - 6 files changed, 446 deletions(-) delete mode 100644 hammerspoon/Spoons/ReloadConfiguration.spoon/docs.json delete mode 100644 hammerspoon/Spoons/ReloadConfiguration.spoon/init.lua delete mode 100644 hammerspoon/Spoons/SpeedMenu.spoon/docs.json delete mode 100644 hammerspoon/Spoons/SpeedMenu.spoon/init.lua delete mode 100644 hammerspoon/init.lua delete mode 160000 hammerspoon/src/spaces (limited to 'hammerspoon') diff --git a/hammerspoon/Spoons/ReloadConfiguration.spoon/docs.json b/hammerspoon/Spoons/ReloadConfiguration.spoon/docs.json deleted file mode 100644 index 50c62f2..0000000 --- a/hammerspoon/Spoons/ReloadConfiguration.spoon/docs.json +++ /dev/null @@ -1,90 +0,0 @@ -[ - { - "Command": [], - "Constant": [], - "Constructor": [], - "Deprecated": [], - "Field": [], - "Function": [], - "Method": [ - { - "def": "ReloadConfiguration:bindHotkeys(mapping)", - "desc": "Binds hotkeys for ReloadConfiguration", - "doc": "Binds hotkeys for ReloadConfiguration\n\nParameters:\n * mapping - A table containing hotkey modifier/key details for the following items:\n * reloadConfiguration - This will cause the configuration to be reloaded", - "name": "bindHotkeys", - "parameters": [ - " * mapping - A table containing hotkey modifier/key details for the following items:", - " * reloadConfiguration - This will cause the configuration to be reloaded" - ], - "signature": "ReloadConfiguration:bindHotkeys(mapping)", - "stripped_doc": "", - "type": "Method" - }, - { - "def": "ReloadConfiguration:start()", - "desc": "Start ReloadConfiguration", - "doc": "Start ReloadConfiguration\n\nParameters:\n * None", - "name": "start", - "parameters": [ - " * None" - ], - "signature": "ReloadConfiguration:start()", - "stripped_doc": "", - "type": "Method" - } - ], - "Variable": [ - { - "def": "ReloadConfiguration.watch_paths", - "desc": "List of directories to watch for changes, defaults to hs.configdir", - "doc": "List of directories to watch for changes, defaults to hs.configdir", - "name": "watch_paths", - "signature": "ReloadConfiguration.watch_paths", - "stripped_doc": "", - "type": "Variable" - } - ], - "desc": "Adds a hotkey to reload the hammerspoon configuration, and a pathwatcher to automatically reload on changes.", - "doc": "Adds a hotkey to reload the hammerspoon configuration, and a pathwatcher to automatically reload on changes.\n\nDownload: [https://github.com/Hammerspoon/Spoons/raw/master/Spoons/ReloadConfiguration.spoon.zip](https://github.com/Hammerspoon/Spoons/raw/master/Spoons/ReloadConfiguration.spoon.zip)", - "items": [ - { - "def": "ReloadConfiguration:bindHotkeys(mapping)", - "desc": "Binds hotkeys for ReloadConfiguration", - "doc": "Binds hotkeys for ReloadConfiguration\n\nParameters:\n * mapping - A table containing hotkey modifier/key details for the following items:\n * reloadConfiguration - This will cause the configuration to be reloaded", - "name": "bindHotkeys", - "parameters": [ - " * mapping - A table containing hotkey modifier/key details for the following items:", - " * reloadConfiguration - This will cause the configuration to be reloaded" - ], - "signature": "ReloadConfiguration:bindHotkeys(mapping)", - "stripped_doc": "", - "type": "Method" - }, - { - "def": "ReloadConfiguration:start()", - "desc": "Start ReloadConfiguration", - "doc": "Start ReloadConfiguration\n\nParameters:\n * None", - "name": "start", - "parameters": [ - " * None" - ], - "signature": "ReloadConfiguration:start()", - "stripped_doc": "", - "type": "Method" - }, - { - "def": "ReloadConfiguration.watch_paths", - "desc": "List of directories to watch for changes, defaults to hs.configdir", - "doc": "List of directories to watch for changes, defaults to hs.configdir", - "name": "watch_paths", - "signature": "ReloadConfiguration.watch_paths", - "stripped_doc": "", - "type": "Variable" - } - ], - "name": "ReloadConfiguration", - "stripped_doc": "\nDownload: [https://github.com/Hammerspoon/Spoons/raw/master/Spoons/ReloadConfiguration.spoon.zip](https://github.com/Hammerspoon/Spoons/raw/master/Spoons/ReloadConfiguration.spoon.zip)", - "submodules": [], - "type": "Module" - } -] \ No newline at end of file diff --git a/hammerspoon/Spoons/ReloadConfiguration.spoon/init.lua b/hammerspoon/Spoons/ReloadConfiguration.spoon/init.lua deleted file mode 100644 index bb83f67..0000000 --- a/hammerspoon/Spoons/ReloadConfiguration.spoon/init.lua +++ /dev/null @@ -1,49 +0,0 @@ ---- === ReloadConfiguration === ---- ---- Adds a hotkey to reload the hammerspoon configuration, and a pathwatcher to automatically reload on changes. ---- ---- Download: [https://github.com/Hammerspoon/Spoons/raw/master/Spoons/ReloadConfiguration.spoon.zip](https://github.com/Hammerspoon/Spoons/raw/master/Spoons/ReloadConfiguration.spoon.zip) - -local obj = {} -obj.__index = obj - --- Metadata -obj.name = "ReloadConfiguration" -obj.version = "1.0" -obj.author = "Jon Lorusso " -obj.homepage = "https://github.com/Hammerspoon/Spoons" -obj.license = "MIT - https://opensource.org/licenses/MIT" - - ---- ReloadConfiguration.watch_paths ---- Variable ---- List of directories to watch for changes, defaults to hs.configdir -obj.watch_paths = { hs.configdir } - ---- ReloadConfiguration:bindHotkeys(mapping) ---- Method ---- Binds hotkeys for ReloadConfiguration ---- ---- Parameters: ---- * mapping - A table containing hotkey modifier/key details for the following items: ---- * reloadConfiguration - This will cause the configuration to be reloaded -function obj:bindHotkeys(mapping) - local def = { reloadConfiguration = hs.fnutils.partial(hs.reload, self) } - hs.spoons.bindHotkeysToSpec(def, mapping) -end - ---- ReloadConfiguration:start() ---- Method ---- Start ReloadConfiguration ---- ---- Parameters: ---- * None -function obj:start() - self.watchers = {} - for _,dir in pairs(self.watch_paths) do - self.watchers[dir] = hs.pathwatcher.new(dir, hs.reload):start() - end - return self -end - -return obj diff --git a/hammerspoon/Spoons/SpeedMenu.spoon/docs.json b/hammerspoon/Spoons/SpeedMenu.spoon/docs.json deleted file mode 100644 index f57b965..0000000 --- a/hammerspoon/Spoons/SpeedMenu.spoon/docs.json +++ /dev/null @@ -1,39 +0,0 @@ -[ - { - "Command": [], - "Constant": [], - "Constructor": [], - "Deprecated": [], - "Field": [], - "Function": [], - "Method": [ - { - "def": "SpeedMenu:rescan()", - "desc": "Redetect the active interface, darkmode …And redraw everything.", - "doc": "Redetect the active interface, darkmode …And redraw everything.\n", - "name": "rescan", - "signature": "SpeedMenu:rescan()", - "stripped_doc": "", - "type": "Method" - } - ], - "Variable": [], - "desc": "Menubar netspeed meter", - "doc": "Menubar netspeed meter\n\nDownload: [https://github.com/Hammerspoon/Spoons/raw/master/Spoons/SpeedMenu.spoon.zip](https://github.com/Hammerspoon/Spoons/raw/master/Spoons/SpeedMenu.spoon.zip)", - "items": [ - { - "def": "SpeedMenu:rescan()", - "desc": "Redetect the active interface, darkmode …And redraw everything.", - "doc": "Redetect the active interface, darkmode …And redraw everything.\n", - "name": "rescan", - "signature": "SpeedMenu:rescan()", - "stripped_doc": "", - "type": "Method" - } - ], - "name": "SpeedMenu", - "stripped_doc": "\nDownload: [https://github.com/Hammerspoon/Spoons/raw/master/Spoons/SpeedMenu.spoon.zip](https://github.com/Hammerspoon/Spoons/raw/master/Spoons/SpeedMenu.spoon.zip)", - "submodules": [], - "type": "Module" - } -] \ No newline at end of file diff --git a/hammerspoon/Spoons/SpeedMenu.spoon/init.lua b/hammerspoon/Spoons/SpeedMenu.spoon/init.lua deleted file mode 100644 index d4ecdac..0000000 --- a/hammerspoon/Spoons/SpeedMenu.spoon/init.lua +++ /dev/null @@ -1,111 +0,0 @@ ---- === SpeedMenu === ---- ---- Menubar netspeed meter ---- ---- Download: [https://github.com/Hammerspoon/Spoons/raw/master/Spoons/SpeedMenu.spoon.zip](https://github.com/Hammerspoon/Spoons/raw/master/Spoons/SpeedMenu.spoon.zip) - -local obj={} -obj.__index = obj - --- Metadata -obj.name = "SpeedMenu" -obj.version = "1.0" -obj.author = "ashfinal " -obj.homepage = "https://github.com/Hammerspoon/Spoons" -obj.license = "MIT - https://opensource.org/licenses/MIT" - -function obj:init() - self.menubar = hs.menubar.new() - obj:rescan() -end - -local function data_diff() - local in_seq = hs.execute(obj.instr) - local out_seq = hs.execute(obj.outstr) - local in_diff = in_seq - obj.inseq - local out_diff = out_seq - obj.outseq - if in_diff/1024 > 1024 then - obj.kbin = string.format("%6.2f", in_diff/1024/1024) .. ' mb/s' - else - obj.kbin = string.format("%6.2f", in_diff/1024) .. ' kb/s' - end - if out_diff/1024 > 1024 then - obj.kbout = string.format("%6.2f", out_diff/1024/1024) .. ' mb/s' - else - obj.kbout = string.format("%6.2f", out_diff/1024) .. ' kb/s' - end - local disp_str = '⥄ ' .. obj.kbout .. '\n⥂ ' .. obj.kbin - if obj.darkmode then - obj.disp_str = hs.styledtext.new(disp_str, {font={size=9.0, color={hex="#FFFFFF"}}}) - else - obj.disp_str = hs.styledtext.new(disp_str, {font={size=9.0, color={hex="#000000"}}}) - end - obj.menubar:setTitle(obj.disp_str) - obj.inseq = in_seq - obj.outseq = out_seq -end - ---- SpeedMenu:rescan() ---- Method ---- Redetect the active interface, darkmode …And redraw everything. ---- - -function obj:rescan() - obj.interface = hs.network.primaryInterfaces() - obj.darkmode = hs.osascript.applescript('tell application "System Events"\nreturn dark mode of appearance preferences\nend tell') - local menuitems_table = {} - if obj.interface then - -- Inspect active interface and create menuitems - local interface_detail = hs.network.interfaceDetails(obj.interface) - if interface_detail.AirPort then - local ssid = interface_detail.AirPort.SSID - table.insert(menuitems_table, { - title = "SSID: " .. ssid, - tooltip = "Copy SSID to clipboard", - fn = function() hs.pasteboard.setContents(ssid) end - }) - end - if interface_detail.IPv4 then - local ipv4 = interface_detail.IPv4.Addresses[1] - table.insert(menuitems_table, { - title = "IPv4: " .. ipv4, - tooltip = "Copy IPv4 to clipboard", - fn = function() hs.pasteboard.setContents(ipv4) end - }) - end - if interface_detail.IPv6 then - local ipv6 = interface_detail.IPv6.Addresses[1] - table.insert(menuitems_table, { - title = "IPv6: " .. ipv6, - tooltip = "Copy IPv6 to clipboard", - fn = function() hs.pasteboard.setContents(ipv6) end - }) - end - local macaddr = hs.execute('ifconfig ' .. obj.interface .. ' | grep ether | awk \'{print $2}\'') - table.insert(menuitems_table, { - title = "MAC Addr: " .. macaddr, - tooltip = "Copy MAC Address to clipboard", - fn = function() hs.pasteboard.setContents(macaddr) end - }) - -- Start watching the netspeed delta - obj.instr = 'netstat -ibn | grep -e ' .. obj.interface .. ' -m 1 | awk \'{print $7}\'' - obj.outstr = 'netstat -ibn | grep -e ' .. obj.interface .. ' -m 1 | awk \'{print $10}\'' - - obj.inseq = hs.execute(obj.instr) - obj.outseq = hs.execute(obj.outstr) - - if obj.timer then - obj.timer:stop() - obj.timer = nil - end - obj.timer = hs.timer.doEvery(1, data_diff) - end - table.insert(menuitems_table, { - title = "Rescan Network Interfaces", - fn = function() obj:rescan() end - }) - obj.menubar:setTitle("⚠︎") - obj.menubar:setMenu(menuitems_table) -end - -return obj diff --git a/hammerspoon/init.lua b/hammerspoon/init.lua deleted file mode 100644 index 3b38695..0000000 --- a/hammerspoon/init.lua +++ /dev/null @@ -1,156 +0,0 @@ -hs.loadSpoon("ReloadConfiguration") -spoon.ReloadConfiguration:start() - -hs.loadSpoon("SpeedMenu") - -spaces = require("hs._asm.undocumented.spaces") - --- apparently hs.eventtap.keyStroke doesn't always work, this is more reliable --- https://github.com/Hammerspoon/hammerspoon/issues/1984#issuecomment-455317739 -doKeyStroke = function(modifiers, character) - if type(modifiers) == 'table' then - local event = hs.eventtap.event - - for _, modifier in pairs(modifiers) do - event.newKeyEvent(modifier, true):post() - end - - event.newKeyEvent(character, true):post() - event.newKeyEvent(character, false):post() - - for i = #modifiers, 1, -1 do - event.newKeyEvent(modifiers[i], false):post() - end - end -end - -hs.hotkey.bind({"alt"}, "d", function() - hs.caffeinate.lockScreen() -end) - -hs.hotkey.bind({"alt"}, "f", function() - hs.window.focusedWindow():toggleFullScreen() -end) - -hs.hotkey.bind({"alt"}, "q", function() - hs.window.focusedWindow():close() -end) - -hs.hotkey.bind({"alt"}, "r", function() - doKeyStroke({"cmd"}, "space") -end) - -hs.hotkey.bind({"alt"}, "[", function() - doKeyStroke({"ctrl"}, "left") -end) - -hs.hotkey.bind({"alt"}, "]", function() - doKeyStroke({"ctrl"}, "right") -end) - -hs.hotkey.bind({"cmd"}, "u", function() - doKeyStroke({"cmd"}, "delete") -end) - -hs.hotkey.bind({"cmd"}, "a", function() - doKeyStroke({"cmd"}, "left") -end) - -hs.hotkey.bind({"cmd"}, "e", function() - doKeyStroke({"cmd"}, "right") -end) - -for i = 1, 6 do - hs.hotkey.bind({"alt"}, tostring(i), function() - id = spaces.layout()[spaces.mainScreenUUID()][i] - spaces.changeToSpace(id) - end) - hs.hotkey.bind({"alt", "shift"}, tostring(i), function() - id = spaces.layout()[spaces.mainScreenUUID()][i] - hs.window.focusedWindow():spacesMoveTo(id) - end) -end - -extra_bindings = { - ["Alacritty"] = hs.hotkey.modal.new(), - ["Google Chrome"] = hs.hotkey.modal.new(), -} - -slack_cmd_k_watcher = nil -extra_bindings["Alacritty"]:bind({"ctrl"}, "k", function() - slack_cmd_k_watcher = hs.application.watcher.new(function(name, event_type, app) - if event_type == hs.application.watcher.activated then - if app:name() == "Slack" then - hs.timer.doAfter(0.001, function() - doKeyStroke({"cmd"}, "k") - end) - slack_cmd_k_watcher:stop() - slack_cmd_k_watcher = nil - end - end - end) - slack_cmd_k_watcher:start() - hs.application.get("Slack"):mainWindow():focus() -end) - -extra_bindings["Google Chrome"]:bind({"cmd"}, "h", function() - doKeyStroke({"cmd"}, "left") -end) - -extra_bindings["Google Chrome"]:bind({"cmd"}, "l", function() - doKeyStroke({"cmd"}, "right") -end) - --- doesn't seem to work? --- extra_bindings["Google Chrome"]:bind({"cmd", "shift"}, "i", function() --- doKeyStroke({"cmd", "option"}, "i") --- end) - -current_app_name = nil - -function enter_bindings(name) - if extra_bindings[name] then - extra_bindings[name]:enter() - current_app_name = name - end -end - -function exit_bindings(name) - if extra_bindings[name] then - extra_bindings[name]:exit() - current_app_name = nil - end -end - --- the application watcher receives notifications about new apps being --- activated before the old apps are deactivated, so we can't rely on --- deactivated events. this should be fine because there should always be an --- active app (at the very least, Finder) -current_application_watcher = hs.application.watcher.new(function(name, event_type, app) - if event_type == hs.application.watcher.activated then - if current_app_name ~= app:name() then - exit_bindings(current_app_name) - enter_bindings(app:name()) - end - end -end) -enter_bindings(hs.application.frontmostApplication():name()) -current_application_watcher:start() - -cpu_usage_bar = hs.menubar.new() -cpu_timer = hs.timer.doEvery(1, function() - hs.host.cpuUsage(function(cpu) - local cpuUsage = cpu["overall"]["active"] - cpu_usage_bar:setTitle(math.floor(cpuUsage + 0.5) .. "%") - end) -end) - -power_usage_bar = hs.menubar.new() -power_timer = hs.timer.doEvery(5, function() - local watts = hs.execute("/Users/doy/.bin/st-doy2/power-usage") - power_usage_bar:setTitle(string.gsub(watts, "\n", "") .. "W") -end) - -hs.caffeinate.set("systemIdle", true, true) - -hs.alert("Hammerspoon config reloaded") diff --git a/hammerspoon/src/spaces b/hammerspoon/src/spaces deleted file mode 160000 index f48e7d7..0000000 --- a/hammerspoon/src/spaces +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f48e7d7487d2352099a9917429ffc93e6e5088bd -- cgit v1.2.3-54-g00ecf