Merge conflict

This commit is contained in:
ayo 2026-07-03 15:00:29 +02:00
parent d371b31193
commit 6fbb9ada66
3 changed files with 12 additions and 1 deletions

View file

@ -0,0 +1,7 @@
{
"permissions": {
"allow": [
"WebSearch"
]
}
}

View file

@ -77,9 +77,13 @@ bind -n C-k select-pane -D
# switch windows using Ctrl + Tab # switch windows using Ctrl + Tab
bind -n C-Tab next-window bind -n C-Tab next-window
bind q killp
# Enable mouse # Enable mouse
set -g mouse on set -g mouse on
set-option -g status-position top set-option -g status-position top
# set -g status-right '[#(gitmux "#{pane_current_path}")] %m.%d.%y %H:%M' # set -g status-right '[#(gitmux "#{pane_current_path}")] %m.%d.%y %H:%M'
set -g status-right '%m.%d.%Y %H:%M ' set -g status-right '%m.%d.%Y %H:%M '
set-option -g allow-rename off

2
.vimrc
View file

@ -90,7 +90,7 @@ Plugin 'mattn/emmet-vim'
" Plugin 'jiangmiao/auto-pairs' " Plugin 'jiangmiao/auto-pairs'
Plugin 'ctrlpvim/ctrlp.vim' Plugin 'ctrlpvim/ctrlp.vim'
Plugin 'junegunn/vim-easy-align' Plugin 'junegunn/vim-easy-align'
Plugin 'instant-markdown/vim-instant-markdown' " Plugin 'instant-markdown/vim-instant-markdown'
Plugin 'ervandew/supertab' Plugin 'ervandew/supertab'
Plugin 'leafgarland/typescript-vim' Plugin 'leafgarland/typescript-vim'
Plugin 'dense-analysis/ale' Plugin 'dense-analysis/ale'