From 12e9b9c0cb462e77cdf450d9616d9860ead7867e Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@stripe.com>
Date: Tue, 2 Mar 2021 10:52:02 -0800
Subject: use the hammerspoon spaces module

---
 .gitignore             |  1 +
 .gitmodules            |  3 +++
 Makefile.st-doy2       |  6 +++++-
 hammerspoon/init.lua   | 12 ++++++++----
 hammerspoon/src/spaces |  1 +
 5 files changed, 18 insertions(+), 5 deletions(-)
 create mode 160000 hammerspoon/src/spaces

diff --git a/.gitignore b/.gitignore
index 47de586..b699bb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /config/alacritty/alacritty.yml
 /config/darksky/api
+/hammerspoon/hs
 /local/share/fortune/*.dat
 /less
 /mpdscribble/mpdscribble.conf
diff --git a/.gitmodules b/.gitmodules
index 6138d43..19a2de8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,3 +82,6 @@
 [submodule "vim/pack/filetype/start/terraform"]
 	path = vim/pack/filetype/start/terraform
 	url = git://github.com/hashivim/vim-terraform
+[submodule "hammerspoon/src/spaces"]
+	path = hammerspoon/src/spaces
+	url = git://github.com/asmagill/hs._asm.undocumented.spaces
diff --git a/Makefile.st-doy2 b/Makefile.st-doy2
index d4b3106..e7bd455 100644
--- a/Makefile.st-doy2
+++ b/Makefile.st-doy2
@@ -10,7 +10,11 @@ EMPTYDIRS := \
 INSTALL_CUSTOM := \
 
 BUILD := \
-    config/alacritty/alacritty.yml
+    config/alacritty/alacritty.yml \
+    hammerspoon/hs/_asm/undocumented/spaces/internal.so
 
 config/alacritty/alacritty.yml : config/alacritty/alacritty.yml.st-doy2
 	$(LN) $(notdir $<) $@
+
+hammerspoon/hs/_asm/undocumented/spaces/internal.so :
+	cd hammerspoon/src/spaces && PREFIX=$(HOME)/conf/hammerspoon make install
diff --git a/hammerspoon/init.lua b/hammerspoon/init.lua
index c68ca8d..3b38695 100644
--- a/hammerspoon/init.lua
+++ b/hammerspoon/init.lua
@@ -3,6 +3,8 @@ 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)
@@ -60,13 +62,15 @@ end)
 
 for i = 1, 6 do
     hs.hotkey.bind({"alt"}, tostring(i), function()
-        doKeyStroke({"ctrl"}, tostring(i))
+        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
 
--- bindings for window movement are handled by amethyst, since hammerspoon
--- doesn't support that well
-
 extra_bindings = {
     ["Alacritty"] = hs.hotkey.modal.new(),
     ["Google Chrome"] = hs.hotkey.modal.new(),
diff --git a/hammerspoon/src/spaces b/hammerspoon/src/spaces
new file mode 160000
index 0000000..25aecf2
--- /dev/null
+++ b/hammerspoon/src/spaces
@@ -0,0 +1 @@
+Subproject commit 25aecf2c48eb72afbd76abc00d9f6edadeca2805
-- 
cgit v1.2.3-54-g00ecf