diff --git a/.gitconfig b/.gitconfig index f0dc661..11c7187 100644 --- a/.gitconfig +++ b/.gitconfig @@ -3,3 +3,7 @@ email = tracer@24unix.net [core] autocrlf = input +[init] + defaultBranch = master +[push] + autoSetupRemote = true diff --git a/karabiner/karabiner.json b/karabiner/karabiner.json index 39568f5..33b2dc1 100644 --- a/karabiner/karabiner.json +++ b/karabiner/karabiner.json @@ -4,32 +4,8 @@ "complex_modifications": { "rules": [ { - "description": "kitty: map cmd+v and shift+enter for codex cli", + "description": "kitty: map shift+enter for codex cli", "manipulators": [ - { - "conditions": [ - { - "bundle_identifiers": [ - "^net\\.kovidgoyal\\.kitty(-quick-access)?$" - ], - "type": "frontmost_application_if" - } - ], - "from": { - "key_code": "v", - "modifiers": { - "mandatory": ["command"], - "optional": ["any"] - } - }, - "to": [ - { - "key_code": "v", - "modifiers": ["control"] - } - ], - "type": "basic" - }, { "conditions": [ { @@ -66,8 +42,7 @@ "from": { "key_code": "return_or_enter", "modifiers": { - "mandatory": ["option"], - "optional": ["any"] + "mandatory": ["option"] } }, "to": [ @@ -87,7 +62,7 @@ "conditions": [ { "bundle_identifiers": [ - "^net\\.kovidgoyal\\.kitty$" + "^net\\.kovidgoyal\\.kitty(-quick-access)?$" ], "type": "frontmost_application_unless" } @@ -103,7 +78,7 @@ "key_code": "vk_none" }, { - "shell_command": "/usr/bin/osascript -e 'tell application \"kitty\" to activate' -e 'tell application \"System Events\" to keystroke return using command down'" + "shell_command": "/Applications/kitty.app/Contents/MacOS/kitty --single-instance --directory ~" } ], "type": "basic" diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 120b008..ed09272 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -6,10 +6,15 @@ bold_italic_font auto font_size 14 adjust_line_height 125% cursor_shape block +cursor_trail 120 +cursor_trail_decay 0.08 0.25 +cursor_trail_start_threshold 3 +cursor_trail_color #ff8844 cursor_blink_interval 0.5 cursor_stop_blinking_after 0 shell_integration no-cursor enable_audio_bell 0 +background_opacity 0.85 hide_window_decorations titlebar-only macos_show_window_title_in none macos_titlebar_color background @@ -21,6 +26,9 @@ tab_bar_style separator tab_separator " ┇" tab_bar_edge top window_padding_width 10 +remember_window_size no +initial_window_width 160c +initial_window_height 35c map cmd+shift+r load_config_file map cmd+enter launch --type=os-window --cwd=~ diff --git a/kitty/launch-quick-access-terminal.sh b/kitty/launch-quick-access-terminal.sh index fdea13e..0acb2c0 100755 --- a/kitty/launch-quick-access-terminal.sh +++ b/kitty/launch-quick-access-terminal.sh @@ -10,9 +10,9 @@ kitty_kitten=/Applications/kitty.app/Contents/MacOS/kitten studio_config=$dotfiles_dir/hosts/studio/kitty/quick-access-terminal.conf if [ "$host_name" = "studio" ] && [ -f "$studio_config" ]; then - exec "$kitty_kitten" quick-access-terminal --config "$studio_config" \ + exec "$kitty_kitten" quick-access-terminal --instance-group quick-access --config "$studio_config" \ "$kitty_kitten" run-shell --cwd "$HOME" fi -exec "$kitty_kitten" quick-access-terminal \ +exec "$kitty_kitten" quick-access-terminal --instance-group quick-access \ "$kitty_kitten" run-shell --cwd "$HOME"