Skip to content

Commit 4f14671

Browse files
authored
Merge branch 'AdamWagner:main' into better_error
2 parents 687b748 + 2aa0bd9 commit 4f14671

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

README.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99

1010
> Visualize yabai window stacks on macOS. Works with yabai & hammerspoon.
1111
12-
**Up next**
12+
**Current status**
1313

14-
- Attempt to fix https://github.com/AdamWagner/stackline/issues/67
15-
- Attempt to fix https://github.com/AdamWagner/stackline/issues/74
14+
Unfortunately, I've haven't been able to work on this project since Q3 2021. Initially, this was due to a scary bout of RSI-esque finger pain that entirely prevented from me from typing (really – I had to use [Talon](https://talonvoice.com/) for basic computer use); The lesson I took away is that my hobbies shouldn't invovlve continuous typing (given I'm already typing all day for work).
1615

17-
**Latest update**
16+
I apologize that I won't be working on this anymore – but that doesn't mean _you_ can't fork & carry the torch ;)
17+
18+
**June 2021 update**
1819

1920
2021-06-06: Fixes & cleanup (`v0.1.61`)
2021

@@ -124,6 +125,8 @@ hs -c "stackline.config:toggle('appearance.showIcons')"
124125
1. Ensure Hammerspoon is running
125126
2. Open the hammerspoon console via the menu bar
126127
3. Type `hs.ipc.cliInstall()` and hit return
128+
129+
If Hammerspoon is installed via Brew on Apple Silicon, `hs.ipc.cliInstall("/opt/homebrew")` [#2930](https://github.com/Hammerspoon/hammerspoon/issues/2930)
127130
4. Confirm that `hs` is available by entering the following in your terminal (shell):
128131

129132
```sh
@@ -182,7 +185,7 @@ All are welcome. Feel free to dive in by opening an [issue](https://github.com/A
182185

183186
[@alin23](https://github.com/alin23) initially proposed the [concept for stackline here](https://github.com/koekeishiya/yabai/issues/203#issuecomment-652948362) and encouraged [@AdamWagner](https://github.com/AdamWagner) to share the mostly-broken proof-of-concept publicly. Since then, [@alin23](https://github.com/alin23) dramatically improved upon the initial proof-of-concept with [#13](https://github.com/AdamWagner/stackline/pull/13), has some pretty whiz-bang functionality on deck with [#17](https://github.com/AdamWagner/stackline/pull/17), and has been a great thought partner/reviewer.
184187

185-
[@zweck](https://github.com/zweck), who, [in the same thread](https://github.com/koekeishiya/yabai/issues/203#issuecomment-656780281), got the gears turning about how [@alin23](gh-alin23)'s idea could be implemented and _also_ urged Adam to share his POC.
188+
[@zweck](https://github.com/zweck), who, [in the same thread](https://github.com/koekeishiya/yabai/issues/203#issuecomment-656780281), got the gears turning about how [@alin23](https://github.com/alin23)'s idea could be implemented and _also_ urged Adam to share his POC.
186189

187190
[@johnallen3d](https://github.com/johnallen3d) for being of one the first folks to install stackline, and for identifying several mistakes & gaps in the setup instructions.
188191

@@ -194,13 +197,13 @@ Give a ⭐️ if you think (a more fully-featured version of) stackline would be
194197

195198
### …on the shoulders of giants
196199

197-
Thanks to [@koekeishiya](gh-koekeishiya) without whom the _wonderful_ [yabai](https://github.com/koekeishiya/yabai) would not exist, and projects like this would have no reason to exist.
200+
Thanks to [@koekeishiya](https://github.com/koekeishiya) without whom the _wonderful_ [yabai](https://github.com/koekeishiya/yabai) would not exist, and projects like this would have no reason to exist.
198201

199202
Similarly, thanks to [@dominiklohmann](https://github.com/dominiklohmann), who has helped _so many people_ make chunkwm/yabai "do the thing" they want and provides great feedback on new and proposed yabai features.
200203

201204
Thanks to [@cmsj](https://github.com/cmsj), [@asmagill](https://github.com/asmagill), and all of the contributors to [hammerspoon](https://github.com/Hammerspoon/hammerspoon) for making macos APIs accessible to the rest of us!
202205

203-
Thanks to the creators & maintainers of the lua utility libaries [underscore.lua](https://github.com/mirven/underscore.lua), [lume.lua](https://github.com/rxi/lume), and [self.lua](https://github.com/M1que4s/self).
206+
Thanks to the creators & maintainers of the lua utility libraries [underscore.lua](https://github.com/mirven/underscore.lua), [lume.lua](https://github.com/rxi/lume), and [self.lua](https://github.com/M1que4s/self).
204207

205208
## License & attribution
206209

init.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- Simplify requiring stackline from ~/hammerspoon/init.lua
1+
-- Simplify requiring stackline from hammerspoon init.lua
22

3-
package.path = os.getenv'HOME' ..'/.hammerspoon/stackline/?.lua;' .. package.path
3+
package.path = hs.configdir ..'/stackline/?.lua;' .. package.path
44
return require 'stackline.stackline'

0 commit comments

Comments
 (0)