diff --git a/.config/nvim/coc.vim b/.config/nvim/coc.vim index 33694be..89c31f0 100644 --- a/.config/nvim/coc.vim +++ b/.config/nvim/coc.vim @@ -2,34 +2,20 @@ " Use tab for trigger completion with characters ahead and navigate. " NOTE: Use command ':verbose imap ' to make sure tab is not mapped by " other plugin before putting this into your config. -inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : - \ coc#refresh() -inoremap pumvisible() ? "\" : "\" -function! s:check_back_space() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' +inoremap + \ coc#pum#visible() ? coc#_select_confirm() : + \ coc#expandableOrJumpable() ? + \ "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" : + \ CheckBackSpace() ? "\" : + \ coc#refresh() + +function! CheckBackSpace() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' endfunction -" Use to trigger completion. -if has('nvim') - inoremap coc#refresh() -else - inoremap coc#refresh() -endif - - -" Make auto-select the first completion item and notify coc.nvim to -" format on enter, could be remapped by other vim plugin -inoremap pumvisible() ? coc#_select_confirm() - \: "\u\\=coc#on_enter()\" - -" Use `[g` and `]g` to navigate diagnostics -" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. -nmap [g (coc-diagnostic-prev) -nmap ]g (coc-diagnostic-next) +let g:coc_snippet_next = '' set runtimepath^=/home/xyvs/.vim/plugged/coc.nvim filetype plugin indent on diff --git a/.config/yabai/yabairc b/.config/yabai/yabairc index 33d6a3c..448f509 100755 --- a/.config/yabai/yabairc +++ b/.config/yabai/yabairc @@ -50,6 +50,7 @@ yabai -m config right_padding 10 yabai -m config window_gap 20 # floating rules +yabai -m rule --add app="^System Settings$" manage=off yabai -m rule --add app="^System Preferences$" manage=off yabai -m rule --add app="^System Information$" manage=off yabai -m rule --add app="^Preview$" manage=off diff --git a/.vim/vimrc b/.vim/vimrc index 1ae862e..b1d1dbd 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -1,14 +1,12 @@ call plug#begin('~/.vim/plugged') Plug 'fxn/vim-monochrome' -Plug 'dylanaraps/wal.vim' Plug 'arcticicestudio/nord-vim' -Plug 'lurst/austere.vim' " autocomplete Plug 'neoclide/coc.nvim', {'branch': 'release'} -Plug 'github/copilot.vim' Plug 'mattn/emmet-vim' +Plug 'github/copilot.vim' " other Plug 'preservim/nerdcommenter' @@ -49,7 +47,6 @@ if (empty($TMUX)) endif set background=dark -colorscheme austere colorscheme nord " new leader key @@ -99,7 +96,7 @@ nnoremap m :MaximizerToggle let g:user_emmet_leader_key=',' " build commands -nnoremap :w:!clear;python windmill.py /tests/ui/participant/suite_b/test_participant_1028_investment_election_beta.py +nnoremap :w:!clear;python3 % nnoremap :w:!clear;pipenv run pytest -v " vim settings diff --git a/Brewfile b/Brewfile deleted file mode 100644 index fc39cc8..0000000 --- a/Brewfile +++ /dev/null @@ -1,60 +0,0 @@ -tap "clementtsang/bottom" -tap "homebrew/bundle" -tap "homebrew/cask" -tap "homebrew/core" -tap "homebrew/services" -tap "jhawthorn/fzy" -tap "koekeishiya/formulae" -tap "universal-ctags/universal-ctags" -brew "openssl@1.1" -brew "autojump" -brew "bat" -brew "emacs" -brew "cask" -brew "ccat" -brew "cmus" -brew "curl" -brew "fzf" -brew "fzy" -brew "gcc" -brew "geckodriver" -brew "git" -brew "gotop" -brew "grep" -brew "httpie" -brew "libheif" -brew "imagemagick" -brew "jq" -brew "lf" -brew "libao" -brew "media-info" -brew "vapoursynth" -brew "youtube-dl" -brew "mpv" -brew "neofetch" -brew "neovim" -brew "node" -brew "nvm" -brew "peco" -brew "percol" -brew "pipenv" -brew "postgresql" -brew "pyenv" -brew "ranger" -brew "rust" -brew "scala" -brew "screen" -brew "screenfetch" -brew "tmux" -brew "tree" -brew "vim" -brew "wget" -brew "yadm" -brew "yarn" -brew "zsh-vi-mode" -brew "clementtsang/bottom/bottom" -brew "koekeishiya/formulae/skhd" -brew "koekeishiya/formulae/yabai" -brew "universal-ctags/universal-ctags/universal-ctags", args: ["HEAD"] -cask "chromedriver" -cask "mpv"