diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index f940267..38abc1f 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -265,6 +265,10 @@ _G.packer_plugins = { loaded = true, path = "/home/sahin/.local/share/nvim/site/pack/packer/start/vim-surround" }, + ["vim-tmux-navigator"] = { + loaded = true, + path = "/home/sahin/.local/share/nvim/site/pack/packer/start/vim-tmux-navigator" + }, ["vim-unimpaired"] = { loaded = true, path = "/home/sahin/.local/share/nvim/site/pack/packer/start/vim-unimpaired" @@ -276,14 +280,14 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Setup for: indent-blankline.nvim -time([[Setup for indent-blankline.nvim]], true) -try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\14blankline\15misc-utils\frequire\0", "setup", "indent-blankline.nvim") -time([[Setup for indent-blankline.nvim]], false) -- Setup for: dashboard-nvim time([[Setup for dashboard-nvim]], true) try_loadstring("\27LJ\2\n8\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\vconfig\14dashboard\frequire\0", "setup", "dashboard-nvim") time([[Setup for dashboard-nvim]], false) +-- Setup for: indent-blankline.nvim +time([[Setup for indent-blankline.nvim]], true) +try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\14blankline\15misc-utils\frequire\0", "setup", "indent-blankline.nvim") +time([[Setup for indent-blankline.nvim]], false) -- Conditional loads time("Condition for { 'AutoSave.nvim' }", true) if @@ -303,30 +307,30 @@ end -- Command lazy-loads time([[Defining lazy-load commands]], true) +vim.cmd [[command! -nargs=* -range -bang -complete=file TZAtaraxis lua require("packer.load")({'TrueZen.nvim'}, { cmd = "TZAtaraxis", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] vim.cmd [[command! -nargs=* -range -bang -complete=file TZMinimalist lua require("packer.load")({'TrueZen.nvim'}, { cmd = "TZMinimalist", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] vim.cmd [[command! -nargs=* -range -bang -complete=file NvimTreeToggle lua require("packer.load")({'nvim-tree.lua'}, { cmd = "NvimTreeToggle", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] +vim.cmd [[command! -nargs=* -range -bang -complete=file Neoformat lua require("packer.load")({'neoformat'}, { cmd = "Neoformat", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] +vim.cmd [[command! -nargs=* -range -bang -complete=file CommentToggle lua require("packer.load")({'nvim-comment'}, { cmd = "CommentToggle", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] +vim.cmd [[command! -nargs=* -range -bang -complete=file Telescope lua require("packer.load")({'telescope.nvim'}, { cmd = "Telescope", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] +vim.cmd [[command! -nargs=* -range -bang -complete=file TZFocus lua require("packer.load")({'TrueZen.nvim'}, { cmd = "TZFocus", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] +vim.cmd [[command! -nargs=* -range -bang -complete=file Dashboard lua require("packer.load")({'dashboard-nvim'}, { cmd = "Dashboard", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] +vim.cmd [[command! -nargs=* -range -bang -complete=file DashboardNewFile lua require("packer.load")({'dashboard-nvim'}, { cmd = "DashboardNewFile", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] +vim.cmd [[command! -nargs=* -range -bang -complete=file DashboardJumpMarks lua require("packer.load")({'dashboard-nvim'}, { cmd = "DashboardJumpMarks", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] vim.cmd [[command! -nargs=* -range -bang -complete=file SessionLoad lua require("packer.load")({'dashboard-nvim'}, { cmd = "SessionLoad", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] vim.cmd [[command! -nargs=* -range -bang -complete=file SessionSave lua require("packer.load")({'dashboard-nvim'}, { cmd = "SessionSave", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] vim.cmd [[command! -nargs=* -range -bang -complete=file StartupTime lua require("packer.load")({'startuptime.vim'}, { cmd = "StartupTime", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] -vim.cmd [[command! -nargs=* -range -bang -complete=file Neoformat lua require("packer.load")({'neoformat'}, { cmd = "Neoformat", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] -vim.cmd [[command! -nargs=* -range -bang -complete=file DashboardJumpMarks lua require("packer.load")({'dashboard-nvim'}, { cmd = "DashboardJumpMarks", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] -vim.cmd [[command! -nargs=* -range -bang -complete=file Telescope lua require("packer.load")({'telescope.nvim'}, { cmd = "Telescope", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] -vim.cmd [[command! -nargs=* -range -bang -complete=file DashboardNewFile lua require("packer.load")({'dashboard-nvim'}, { cmd = "DashboardNewFile", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] -vim.cmd [[command! -nargs=* -range -bang -complete=file CommentToggle lua require("packer.load")({'nvim-comment'}, { cmd = "CommentToggle", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] -vim.cmd [[command! -nargs=* -range -bang -complete=file TZAtaraxis lua require("packer.load")({'TrueZen.nvim'}, { cmd = "TZAtaraxis", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] -vim.cmd [[command! -nargs=* -range -bang -complete=file TZFocus lua require("packer.load")({'TrueZen.nvim'}, { cmd = "TZFocus", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] -vim.cmd [[command! -nargs=* -range -bang -complete=file Dashboard lua require("packer.load")({'dashboard-nvim'}, { cmd = "Dashboard", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]] time([[Defining lazy-load commands]], false) vim.cmd [[augroup packer_load_aucmds]] vim.cmd [[au!]] -- Event lazy-loads time([[Defining lazy-load event autocommands]], true) -vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'nvim-compe', 'nvim-autopairs'}, { event = "InsertEnter *" }, _G.packer_plugins)]] -vim.cmd [[au CursorMoved * ++once lua require("packer.load")({'vim-matchup'}, { event = "CursorMoved *" }, _G.packer_plugins)]] +vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'nvim-autopairs', 'nvim-compe'}, { event = "InsertEnter *" }, _G.packer_plugins)]] vim.cmd [[au InsertCharPre * ++once lua require("packer.load")({'LuaSnip'}, { event = "InsertCharPre *" }, _G.packer_plugins)]] -vim.cmd [[au BufRead * ++once lua require("packer.load")({'nvim-lspconfig', 'nvim-treesitter', 'gitsigns.nvim', 'indent-blankline.nvim', 'lspkind-nvim', 'nvim-colorizer.lua'}, { event = "BufRead *" }, _G.packer_plugins)]] +vim.cmd [[au CursorMoved * ++once lua require("packer.load")({'vim-matchup'}, { event = "CursorMoved *" }, _G.packer_plugins)]] vim.cmd [[au WinScrolled * ++once lua require("packer.load")({'neoscroll.nvim'}, { event = "WinScrolled *" }, _G.packer_plugins)]] +vim.cmd [[au BufRead * ++once lua require("packer.load")({'nvim-colorizer.lua', 'nvim-treesitter', 'nvim-lspconfig', 'gitsigns.nvim', 'indent-blankline.nvim', 'lspkind-nvim'}, { event = "BufRead *" }, _G.packer_plugins)]] time([[Defining lazy-load event autocommands]], false) vim.cmd("augroup END") if should_profile then save_profiles() end diff --git a/.vimrc b/.vimrc index c713bec..f8dac6d 100644 --- a/.vimrc +++ b/.vimrc @@ -38,6 +38,18 @@ set ttymouse=xterm2 nmap // gcc vmap // gc +" https://unix.stackexchange.com/questions/149209/refresh-changed-content-of-file-opened-in-vim/383044#383044 +" Triger `autoread` when files changes on disk +" https://unix.stackexchange.com/questions/149209/refresh-changed-content-of-file-opened-in-vim/383044#383044 +" https://vi.stackexchange.com/questions/13692/prevent-focusgained-autocmd-running-in-command-line-editing-mode + autocmd FocusGained,BufEnter,CursorHold,CursorHoldI * + \ if mode() !~ '\v(c|r.?|!|t)' && getcmdwintype() == '' | checktime | endif + +" Notification after file change +" https://vi.stackexchange.com/questions/13091/autocmd-event-for-autoread +autocmd FileChangedShellPost * + \ echohl WarningMsg | echo "File changed on disk. Buffer reloaded." | echohl None + " Toggle relative line number nmap :set invrelativenumber @@ -61,8 +73,8 @@ nnoremap ' ` nnoremap ` ' " q quits the current window -nnoremap q :q -inoremap q :q +" nnoremap q :q +" inoremap q :q " indent with tab in visual mode vmap > @@ -148,6 +160,7 @@ Plugin 'kana/vim-textobj-line' Plugin 'kana/vim-textobj-user' Plugin 'lepture/vim-jinja' Plugin 'liuchengxu/vim-which-key' +Plugin 'dylanaraps/wal.vim' "rainbow parenthesis Plugin 'luochen1990/rainbow' Plugin 'mbbill/undotree' @@ -216,6 +229,7 @@ nmap (ale_next_wrap) " Disable tmux navigator when zooming the Vim pane let g:tmux_navigator_disable_when_zoomed = 1 +let g:tmux_navigator_no_wrap = 1 set backup " keep a backup file (restore to previous version) set swapfile diff --git a/.zshrc b/.zshrc index 819fd7e..9733531 100644 --- a/.zshrc +++ b/.zshrc @@ -51,7 +51,6 @@ DISABLE_UNTRACKED_FILES_DIRTY="true" # see 'man strftime' for details. HIST_STAMPS="mm/dd/yyyy" - # plugins=() plugins=( gitignore alias-finder zsh-autosuggestions pip last-working-dir dirhistory history thefuck command-not-found git extract zsh-syntax-highlighting docker docker-compose zsh-vi-mode z.lua pyenv-lazy @@ -73,7 +72,7 @@ fpath=(~/.zsh $fpath) unsetopt nomatch export LANG=en_US.UTF-8 -export VISUAL=vim +export VISUAL=nvim export EDITOR="$VISUAL" export PYTHONBREAKPOINT=ipdb.set_trace export ZSH_AUTOSUGGEST_USE_ASYNC=true @@ -83,6 +82,7 @@ export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -l -g ""' export FZF_DEFAULT_OPTS='--bind change:top' # export TERM_ITALICS=false export PATH="$HOME/.poetry/bin:$PATH" +export PATH=$PATH:$HOME/scripts # . /usr/share/autojump/autojump.sh