remove window launcher from hammerspoon, reformat

modules/darwin/hammerspoon/Spoons/ControlEscape.spoon/init.lua

@@ -8,15 +8,15 @@
 --- combination with another key, then provide the normal `control` key
 --- behavior.
 
-local obj={}
+local obj = {}
 obj.__index = obj
 
 -- Metadata
-obj.name = 'ControlEscape'
+obj.name = "ControlEscape"
-obj.version = '0.1'
+obj.version = "0.1"
-obj.author = 'Jason Rudolph <jason@jasonrudolph.com>'
+obj.author = "Jason Rudolph <jason@jasonrudolph.com>"
-obj.homepage = 'https://github.com/jasonrudolph/ControlEscape.spoon'
+obj.homepage = "https://github.com/jasonrudolph/ControlEscape.spoon"
-obj.license = 'MIT - https://opensource.org/licenses/MIT'
+obj.license = "MIT - https://opensource.org/licenses/MIT"
 
 function obj:init()
     self.movements = 0
@@ -25,39 +25,36 @@ function obj:init()
 
     -- Create an eventtap to run each time the modifier keys change (i.e., each
     -- time a key like control, shift, option, or command is pressed or released)
-  self.controlTap = hs.eventtap.new({hs.eventtap.event.types.flagsChanged},
+    self.controlTap = hs.eventtap.new({ hs.eventtap.event.types.flagsChanged }, function(event)
-    function(event)
         local newModifiers = event:getFlags()
 
         -- If this change to the modifier keys does not involve a *change* to the
         -- up/down state of the `control` key (i.e., it was up before and it's
         -- still up, or it was down before and it's still down), then don't take
         -- any action.
-      if self.lastModifiers['ctrl'] == newModifiers['ctrl'] then
+        if self.lastModifiers["ctrl"] == newModifiers["ctrl"] then
             return false
         end
 
         -- Control was not down but is now
-      if not self.lastModifiers['ctrl'] then
+        if not self.lastModifiers["ctrl"] then
-
             -- Only prepare to send escape if no other modifier keys are in use
             self.lastModifiers = newModifiers
-        if (not self.lastModifiers['cmd'] and not self.lastModifiers['alt']) then
+            if not self.lastModifiers["cmd"] and not self.lastModifiers["alt"] then
                 self.sendEscape = true
                 self.movements = 0
             end
 
             -- Control was down and is up, hasn't been blocked by another key, and
             -- isn't above the movement threshold
-      elseif (self.sendEscape == true and not newModifiers['ctrl'] and self.movements < 30) then
+        elseif self.sendEscape == true and not newModifiers["ctrl"] and self.movements < 30 then
-
             self.lastModifiers = newModifiers
 
             -- Allow for shift-escape
-        if newModifiers['shift'] then
+            if newModifiers["shift"] then
-          hs.eventtap.keyStroke({'shift'}, 'escape', 0)
+                hs.eventtap.keyStroke({ "shift" }, "escape", 0)
             else
-          hs.eventtap.keyStroke(newModifiers, 'escape', 0)
+                hs.eventtap.keyStroke(newModifiers, "escape", 0)
             end
             self.sendEscape = false
             self.movements = 0
@@ -66,21 +63,17 @@ function obj:init()
             -- Control was down and is up, but isn't ready to send escape
         else
             self.lastModifiers = newModifiers
-
         end
-    end
+    end)
-  )
 
     -- If any other key is pressed, don't send escape
-  self.asModifier = hs.eventtap.new({hs.eventtap.event.types.keyDown},
+    self.asModifier = hs.eventtap.new({ hs.eventtap.event.types.keyDown }, function(_)
-    function(event)
         self.sendEscape = false
-    end
+        print("Don't sent escape")
-  )
+    end)
 
     -- If mouse is moving significantly, don't send escape
-  self.scrolling = hs.eventtap.new({hs.eventtap.event.types.gesture},
+    self.scrolling = hs.eventtap.new({ hs.eventtap.event.types.gesture }, function(event)
-    function(event)
         local touches = event:getTouches()
         local i, v = next(touches, nil)
         while i do
@@ -90,8 +83,7 @@ function obj:init()
             end
             i, v = next(touches, i) -- get next index
         end
-    end
+    end)
-  )
 end
 
 --- ControlEscape:start()

modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua

@@ -8,11 +8,11 @@ obj.name = "Launcher"
 obj.version = "0.1"
 obj.license = "MIT - https://opensource.org/licenses/MIT"
 
-function drawSwitcher()
+function DrawSwitcher()
     -- Drawing
-    width = hs.screen.mainScreen():fullFrame().w
+    local width = hs.screen.mainScreen():fullFrame().w
-    switcherWidth = 500
+    local switcherWidth = 500
-    canv = hs.canvas.new({
+    local canv = hs.canvas.new({
         x = width / 2 - switcherWidth / 2,
         y = 1,
         h = 3,
@@ -39,8 +39,9 @@ function obj:init()
     -- Behaviors on enter
     function self.launcher:entered()
         -- hs.alert("Entered mode")
-        self.canv = drawSwitcher()
+        self.canv = DrawSwitcher()
     end
+
     -- Behaviors on exit
     function self.launcher:exited()
         -- hs.alert("Exited mode")
@@ -54,10 +55,6 @@ function obj:init()
 
     -- Launcher shortcuts
     self.launcher:bind("ctrl", "space", function() end)
-    self.launcher:bind("", "space", function()
-        hs.hints.windowHints()
-        self.launcher:exit()
-    end)
     self.launcher:bind("", "return", function()
         self:switch("Alacritty.app")
     end)