File tree 4 files changed +12
-7
lines changed
4 files changed +12
-7
lines changed Original file line number Diff line number Diff line change 110
110
[includeIf "gitdir :~ /truelayer/ "]
111
111
path = ~ /.gitconfig-tl.inc
112
112
[includeIf "gitdir :/opt/homebrew/Library/Taps/truelayer/ "]
113
+ # this is annoyingly not picked up on by brew update, but you can still brew install truelayer/internal/X
113
114
path = ~ /.gitconfig-tl.inc
114
115
; include for all repositories inside ~/repos and ~/kube
115
116
[includeIf "gitdir :~ /repos/ "]
Original file line number Diff line number Diff line change @@ -102,7 +102,8 @@ if [[ "${OSTYPE}" =~ "darwin" ]]; then
102
102
# python on mac is also fun
103
103
path+=" $( python3 -m site --user-base) /bin"
104
104
105
- # want a consistent hostname for ansible
105
+ # Want a consistent hostname for ansible
106
+ # we re-initialise HostName / LocalHostName / ComputerName props at boot
106
107
export HOSTNAME=" $( scutil --get LocalHostName) "
107
108
108
109
# disable analytics sending to homebrew
Original file line number Diff line number Diff line change 1
1
mash = {" ⌘" , " ⌥" , " ⌃" }
2
2
3
+ -- Non-laggy exec
3
4
function aerospace (args )
4
5
hs .task .new (" /opt/homebrew/bin/aerospace" , function (ud , ...)
5
6
hs .inspect (table.pack (... ))
6
7
return true
7
8
end , args ):start ()
8
9
end
9
10
10
-
11
+ MAIN = " 3 "
11
12
local function activateApp (name )
12
13
local app = hs .application .find (name )
13
14
if not app or app :isHidden () then
14
15
hs .application .launchOrFocus (name )
15
16
elseif hs .application .frontmostApplication () ~= app then
16
17
app :activate ()
17
18
else
18
- -- unfortunately we cannot swap out easily with aerospace
19
+ -- unfortunately we cannot swap back easily with aerospace
19
20
-- hiding the window would mean an empty workspace or pulling in another window
20
- -- thus we hardcode the toggle to go back to 3 for now
21
- aerospace ({" workspace" , " 3 " })
21
+ -- thus we hardcode the toggle return
22
+ aerospace ({" workspace" , MAIN })
22
23
end
23
24
end
24
25
25
26
-- Global terminal activation
26
27
hs .hotkey .bind ({}, " F1" , function () activateApp (" alacritty" ) end )
27
28
hs .hotkey .bind (mash , " r" , function () hs .reload (); aerospace (" reload-config" ); end )
28
29
hs .alert (" HS + aerospace loaded" )
30
+
31
+ -- TODO: use hs to trigger aerospace for switching so we could keep track of MAIN?
Original file line number Diff line number Diff line change @@ -19,12 +19,12 @@ link: fontguard && check
19
19
# OS specific links
20
20
ln -sf $PWD/ config/ alacritty/ {{ os ()}} .toml config/ alacritty/ os .toml
21
21
# key specific overrides (using whyq)
22
- yq -i ' .SKIP_HOST_UPDATE=true' --input=json ~/ .config/ discord/ settings.json
22
+ # yq -i '.SKIP_HOST_UPDATE=true' --input=json ~/.config/discord/settings.json
23
23
24
24
# font guard helper
25
25
fontguard :
26
26
fd . {{ FONT_DIR}} -e ttf | rg -q " Inconsolata.*Mono"
27
- fd . {{ FONT_DIR}} -e ttf | rg -q " Liberation"
27
+ fd . {{ FONT_DIR}} -e ttf | rg -q " Liberation" # font-liberation pkg technically not necessary on mac
28
28
29
29
# reload configs insofar as possible/necessary
30
30
check :
You can’t perform that action at this time.
0 commit comments