From d03df4ba26b13a367df4c7b2b911649da41ddee0 Mon Sep 17 00:00:00 2001 From: aleidk Date: Mon, 3 Feb 2025 12:16:19 -0300 Subject: [PATCH] update kitty config --- config/kitty/kitty.conf | 77 +++++++++++++++---- config/nvim/lazy-lock.json | 2 +- .../lua/aleidk/plugins-core/smart-splits.lua | 2 + 3 files changed, 64 insertions(+), 17 deletions(-) diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index a40a1bf..465bebf 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -737,7 +737,7 @@ font_size 12.0 #: Request window attention on bell. Makes the dock icon bounce on #: macOS or the taskbar flash on linux. -# bell_on_tab "🔔 " +bell_on_tab " " #: Some text or a Unicode symbol to show on the tab if a window in the #: tab that does not have focus has a bell. If you want to use leading @@ -784,7 +784,7 @@ font_size 12.0 #: suffix of "c" on the width/height values to have them interpreted #: as number of cells instead of pixels. -# enabled_layouts * +enabled_layouts fat:bias=70,tall:bias=55,stack #: The enabled window layouts. A comma separated list of layout names. #: The special value all means all layouts. The first listed layout @@ -954,7 +954,7 @@ confirm_os_window_close 0 #: Tab bar {{{ -# tab_bar_edge bottom +tab_bar_edge top #: The edge to show the tab bar on, top or bottom. @@ -969,7 +969,7 @@ confirm_os_window_close 0 #: The second number is the margin between the tab bar and the #: contents of the current tab. -# tab_bar_style fade +tab_bar_style separator #: The tab bar style, can be one of: @@ -995,12 +995,12 @@ confirm_os_window_close 0 #: a mapping for the select_tab action which presents you with a list of #: tabs and allows for easy switching to a tab. -# tab_bar_align left +tab_bar_align center #: The horizontal alignment of the tab bar, can be one of: left, #: center, right. -# tab_bar_min_tabs 2 +tab_bar_min_tabs 1 #: The minimum number of tabs that must exist before the tab bar is #: shown. @@ -1022,7 +1022,7 @@ confirm_os_window_close 0 #: can change the number of cells used by adding/removing entries to #: this list. -# tab_separator " ┇" +tab_separator " │ " #: The separator between tabs in the tab bar when using separator as #: the tab_bar_style. @@ -1033,7 +1033,7 @@ confirm_os_window_close 0 #: using powerline as the tab_bar_style, can be one of: angled, #: slanted, round. -# tab_activity_symbol none +tab_activity_symbol " " #: Some text or a Unicode symbol to show on the tab if a window in the #: tab that does not have focus has some activity. If you want to use @@ -1045,7 +1045,7 @@ confirm_os_window_close 0 #: The maximum number of cells that can be used to render the text in #: a tab. A value of zero means that no limit is applied. -# tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title}" +tab_title_template "{fmt.fg.orange}{bell_symbol}{activity_symbol}{fmt.fg.tab}{'' if layout_name == 'stack' else '' if layout_name == 'fat' else '' if layout_name == 'tall' else ' '} {index}:{title}" #: A template to render the tab title. The default just renders the #: title with optional symbols for bell and activity. If you wish to @@ -1355,7 +1355,7 @@ confirm_os_window_close 0 #: See rc_custom_auth for details. -allow_remote_control socket-only +allow_remote_control yes #: Allow other programs to control kitty. If you turn this on, other #: programs can control all aspects of kitty, including sending text @@ -1384,7 +1384,7 @@ allow_remote_control socket-only #: yes #: Remote control requests are always accepted. -listen_on unix:/tmp/kitty +listen_on unix:@mykitty #: Listen to the specified socket for remote control connections. Note #: that this will apply to all kitty instances. It can be overridden @@ -1778,6 +1778,8 @@ wayland_titlebar_color background #: E.g. action_alias launch_tab launch --type=tab --cwd=current +action_alias zoom combine : toggle_layout stack : scroll_prompt_to_bottom + #: Define action aliases to avoid repeating the same options in #: multiple mappings. Aliases can be defined for any action and will #: be expanded recursively. For example, the above alias allows you to @@ -1939,9 +1941,37 @@ wayland_titlebar_color background #: Window management {{{ #: New window +# +# + +map ctrl+j neighboring_window down +map ctrl+k neighboring_window up +map ctrl+h neighboring_window left +map ctrl+l neighboring_window right + +# Unset the mapping to pass the keys to neovim +map --when-focus-on var:IS_NVIM ctrl+j +map --when-focus-on var:IS_NVIM ctrl+k +map --when-focus-on var:IS_NVIM ctrl+h +map --when-focus-on var:IS_NVIM ctrl+l + +# the 3 here is the resize amount, adjust as needed +map alt+j kitten relative_resize.py down 3 +map alt+k kitten relative_resize.py up 3 +map alt+h kitten relative_resize.py left 3 +map alt+l kitten relative_resize.py right 3 + +map --when-focus-on var:IS_NVIM alt+j +map --when-focus-on var:IS_NVIM alt+k +map --when-focus-on var:IS_NVIM alt+h +map --when-focus-on var:IS_NVIM alt+l + # map kitty_mod+enter new_window # map cmd+enter new_window +map ctrl+space>enter new_window +map ctrl+space>s launch --location=vsplit --cwd=current +map ctrl+space>v launch --location=split --cwd=current #:: You can open a new kitty window running an arbitrary program, for #:: example:: @@ -1969,6 +1999,8 @@ wayland_titlebar_color background #:: For more details, see launch #:: . +map ctrl+space>g launch --cwd=current --type=overlay lazygit + #: New OS window # map kitty_mod+n new_os_window @@ -2060,6 +2092,7 @@ wayland_titlebar_color background #: Visually select and focus window # map kitty_mod+f7 focus_visible_window +map ctrl+space>tab focus_visible_window #:: Display overlay numbers and alphabets on the window, and switch #:: the focus to the window when you press the key. When there are @@ -2070,6 +2103,7 @@ wayland_titlebar_color background #: Visually swap window with another # map kitty_mod+f8 swap_with_window +map ctrl+space>ctrl+tab swap_with_window #:: Works like focus_visible_window above, but swaps the window. @@ -2093,6 +2127,7 @@ wayland_titlebar_color background # map kitty_mod+t new_tab # map cmd+t new_tab +map ctrl+space>t new_tab #: Close tab @@ -2115,14 +2150,23 @@ wayland_titlebar_color background # map kitty_mod+alt+t set_tab_title # map shift+cmd+i set_tab_title +map ctrl+space>shift+r set_tab_title #: You can also create shortcuts to go to specific tabs, with 1 being #: the first tab, 2 the second tab and -1 being the previously active #: tab, and any number larger than the last tab being the last tab:: -#: map ctrl+alt+1 goto_tab 1 -#: map ctrl+alt+2 goto_tab 2 +map ctrl+space>1 goto_tab 1 +map ctrl+space>2 goto_tab 2 +map ctrl+space>3 goto_tab 3 +map ctrl+space>4 goto_tab 4 +map ctrl+space>5 goto_tab 5 +map ctrl+space>6 goto_tab 6 +map ctrl+space>7 goto_tab 7 +map ctrl+space>8 goto_tab 8 +map ctrl+space>9 goto_tab 9 +map ctrl+space>0 goto_tab 10 #: Just as with new_window above, you can also pass the name of #: arbitrary commands to run when using new_tab and new_tab_with_cwd. @@ -2137,6 +2181,7 @@ wayland_titlebar_color background #: Next layout # map kitty_mod+l next_layout +map ctrl+space>ctrl+l next_layout #: You can also create shortcuts to switch to specific layouts:: @@ -2154,6 +2199,8 @@ wayland_titlebar_color background #: stack layout:: #: map ctrl+alt+z toggle_layout stack +map ctrl+space>m zoom + #: }}} #: Font sizes {{{ @@ -2375,6 +2422,7 @@ wayland_titlebar_color background # map kitty_mod+f5 load_config_file # map ctrl+cmd+, load_config_file +map ctrl+space>ctrl+r load_config_file #:: Reload kitty.conf, applying any changes since the last time it #:: was loaded. Note that a handful of options cannot be dynamically @@ -2453,6 +2501,3 @@ wayland_titlebar_color background #: }}} #: }}} - - - diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 8a2cc47..e2d6ca1 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -42,7 +42,7 @@ "remote-nvim.nvim": { "branch": "main", "commit": "66fc20fd259401c7bb6ac5189ecb6283c2eb65d2" }, "remote-sshfs.nvim": { "branch": "main", "commit": "03f6c40c4032eeb1ab91368e06db9c3f3a97a75d" }, "render-markdown": { "branch": "main", "commit": "6096cf3608b576a38fd1396227dbc0473091714d" }, - "smart-splits.nvim": { "branch": "master", "commit": "d8b0e772a0244169534b1fd57c1660c9bf323d26" }, + "smart-splits.nvim": { "branch": "master", "commit": "fc7bb00fe67ab504356bed4310d23c2e4cb4b06b" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, diff --git a/config/nvim/lua/aleidk/plugins-core/smart-splits.lua b/config/nvim/lua/aleidk/plugins-core/smart-splits.lua index c58890c..a11d29e 100644 --- a/config/nvim/lua/aleidk/plugins-core/smart-splits.lua +++ b/config/nvim/lua/aleidk/plugins-core/smart-splits.lua @@ -3,6 +3,8 @@ -- Tmux aware return { "mrjones2014/smart-splits.nvim", + lazy = false, + build = './kitty/install-kittens.bash', opts = { ignored_filetypes = { "nofile", "quickfix", "qf", "prompt" }, ignored_buftypes = { "nofile" } }, keys = { {