diff --git a/kitty/kitty.conf b/kitty/kitty.conf index ab54a24..e311d47 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -42,3 +42,40 @@ color14 #3a8b84 # white color7 #fafafa color15 #fafafa + +# Tab Bar +tab_bar_style separator +tab_separator "" +tab_title_template " {fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{'/'.join(tab.active_oldest_wd.split('/')[-2:])} " + +tab_bar_background #b05ccc +inactive_tab_foreground #fafafa +inactive_tab_background #b05ccc +active_tab_background #fafafa +active_tab_foreground #4b505b + +# Layouts +enabled_layouts fat:bias=70;full_size=1;mirrored=false,tall:bias=50;full_size=1;mirrored=false,stack +active_border_color #b05ccc + +# Window movement +map ctrl+left neighboring_window left +map ctrl+right neighboring_window right +map ctrl+down neighboring_window down +map ctrl+up neighboring_window up + +# Temporary zoom window +map ctrl+space toggle_layout stack + +# Window sizing +map ctrl+shift+left resize_window narrower +map ctrl+shift+right resize_window wider +map ctrl+shift+up resize_window taller +map ctrl+shift+down resize_window shorter + +# Tabs +map ctrl+shift+] next_tab +map ctrl+shift+[ previous_tab + +map ctrl+shift+enter launch --cwd=current +map ctrl+shift+t new_tab_with_cwd diff --git a/nvim/init.vim b/nvim/init.vim index d90b630..1761e21 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -119,7 +119,7 @@ endif if exists('##TextYankPost') augroup BlinkClipboardIntegration autocmd! - autocmd TextYankPost * if v:event.operator is 'y' && v:event.regname is '' | execute 'OSCYankReg "' | endif + autocmd TextYankPost * if v:event.operator is 'y' && v:event.regname is '' | execute 'OSCYankRegister +' | endif augroup END endif @@ -147,6 +147,7 @@ require'nvim-treesitter.configs'.setup { "yaml", "glsl", "glimmer", + "jsonc", }, -- Install languages synchronously (only applied to `ensure_installed`) sync_install = false, diff --git a/zsh/zshrc b/zsh/zshrc index 40639bc..e5871c6 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -1,7 +1,6 @@ source ~/.zplug/init.zsh # PLUGINS -export ZSH_TMUX_AUTOSTART=true if ! zplug check; then zplug install fi @@ -18,12 +17,8 @@ if ! zplug check --verbose; then fi fi -# If not kitty -# Then don't start tmux. -if [[ -z $KITTY_PID ]]; -then - export ZSH_TMUX_AUTOSTART=false -fi +# Do not autostart tmux. +export ZSH_TMUX_AUTOSTART=false zplug load