Compare commits
No commits in common. "1aacc80e6e4930fc08c36d079e9029e1ce280c14" and "288e8803b394f20702d8f462364484d75bf247a1" have entirely different histories.
1aacc80e6e
...
288e8803b3
201
.gitmodules
vendored
201
.gitmodules
vendored
@ -1,102 +1,99 @@
|
||||
[submodule ".vim/bundle/vim-argwrap"]
|
||||
path = pack/plugins/start/vim-argwrap
|
||||
url = https://git.foosoft.net/alex/vim-argwrap.git
|
||||
[submodule ".vim/bundle/vim-sort-motion"]
|
||||
path = pack/plugins/start/vim-sort-motion
|
||||
url = https://github.com/christoomey/vim-sort-motion.git
|
||||
[submodule ".vim/bundle/vim-go"]
|
||||
path = pack/plugins/start/vim-go
|
||||
url = https://github.com/fatih/vim-go.git
|
||||
[submodule ".vim/bundle/vim-easy-align"]
|
||||
path = pack/plugins/start/vim-easy-align
|
||||
url = https://github.com/junegunn/vim-easy-align.git
|
||||
[submodule ".vim/bundle/vim-indent-object"]
|
||||
path = pack/plugins/start/vim-indent-object
|
||||
url = https://github.com/michaeljsmith/vim-indent-object.git
|
||||
[submodule ".vim/bundle/vim-better-whitespace"]
|
||||
path = pack/plugins/start/vim-better-whitespace
|
||||
url = https://github.com/ntpeters/vim-better-whitespace.git
|
||||
[submodule ".vim/bundle/vim-abolish"]
|
||||
path = pack/plugins/start/vim-abolish
|
||||
url = https://github.com/tpope/vim-abolish.git
|
||||
[submodule ".vim/bundle/vim-repeat"]
|
||||
path = pack/plugins/start/vim-repeat
|
||||
url = https://github.com/tpope/vim-repeat
|
||||
[submodule ".vim/bundle/vim-surround"]
|
||||
path = pack/plugins/start/vim-surround
|
||||
url = https://github.com/tpope/vim-surround
|
||||
[submodule ".vim/bundle/vim-unimpaired"]
|
||||
path = pack/plugins/start/vim-unimpaired
|
||||
url = https://github.com/tpope/vim-unimpaired.git
|
||||
[submodule ".vim/bundle/vim-dirvish"]
|
||||
path = pack/plugins/start/vim-dirvish
|
||||
url = https://github.com/justinmk/vim-dirvish.git
|
||||
[submodule ".vim/bundle/vim-signify"]
|
||||
path = pack/plugins/start/vim-signify
|
||||
url = https://github.com/mhinz/vim-signify.git
|
||||
[submodule ".vim/bundle/vim-angry"]
|
||||
path = pack/plugins/start/vim-angry
|
||||
url = https://github.com/b4winckler/vim-angry.git
|
||||
[submodule ".vim/pack/plugins/start/vim-fugitive"]
|
||||
path = pack/plugins/start/vim-fugitive
|
||||
url = https://github.com/tpope/vim-fugitive.git
|
||||
[submodule "pack/plugins/start/vim-polyglot"]
|
||||
path = pack/plugins/start/vim-polyglot
|
||||
url = https://github.com/sheerun/vim-polyglot
|
||||
[submodule "pack/plugins/opt/cmp-nvim-lsp"]
|
||||
path = pack/plugins/start/cmp-nvim-lsp
|
||||
url = https://github.com/hrsh7th/cmp-nvim-lsp.git
|
||||
[submodule "pack/plugins/opt/nvim-lspconfig"]
|
||||
path = pack/plugins/start/nvim-lspconfig
|
||||
url = https://github.com/neovim/nvim-lspconfig.git
|
||||
[submodule "pack/plugins/opt/nvim-cmp"]
|
||||
path = pack/plugins/start/nvim-cmp
|
||||
url = https://github.com/hrsh7th/nvim-cmp.git
|
||||
[submodule "pack/plugins/opt/cmp-vsnip"]
|
||||
path = pack/plugins/start/cmp-vsnip
|
||||
url = https://github.com/hrsh7th/cmp-vsnip
|
||||
[submodule "pack/plugins/opt/vim-vsnip"]
|
||||
path = pack/plugins/start/vim-vsnip
|
||||
url = https://github.com/hrsh7th/vim-vsnip
|
||||
[submodule "pack/plugins/start/suda.vim"]
|
||||
path = pack/plugins/start/suda.vim
|
||||
url = https://github.com/lambdalisue/suda.vim.git
|
||||
[submodule "pack/plugins/start/plenary.nvim"]
|
||||
path = pack/plugins/start/plenary.nvim
|
||||
url = https://github.com/nvim-lua/plenary.nvim.git
|
||||
[submodule "pack/plugins/start/vim-rooter"]
|
||||
path = pack/plugins/start/vim-rooter
|
||||
url = https://github.com/airblade/vim-rooter.git
|
||||
[submodule "pack/plugins/start/fzf.vim"]
|
||||
path = pack/plugins/start/fzf.vim
|
||||
url = https://github.com/junegunn/fzf.vim.git
|
||||
[submodule "pack/plugins/start/fzf"]
|
||||
path = pack/plugins/start/fzf
|
||||
url = https://github.com/junegunn/fzf.git
|
||||
[submodule "pack/plugins/start/neodev.nvim"]
|
||||
path = pack/plugins/start/neodev.nvim
|
||||
url = https://github.com/folke/neodev.nvim.git
|
||||
[submodule "pack/plugins/start/cmp-nvim-lsp-signature-help"]
|
||||
path = pack/plugins/start/cmp-nvim-lsp-signature-help
|
||||
url = https://github.com/hrsh7th/cmp-nvim-lsp-signature-help.git
|
||||
[submodule "pack/plugins/start/nightfox.nvim"]
|
||||
path = pack/plugins/start/nightfox.nvim
|
||||
url = https://github.com/EdenEast/nightfox.nvim.git
|
||||
[submodule "pack/plugins/start/lualine.nvim"]
|
||||
path = pack/plugins/start/lualine.nvim
|
||||
url = https://github.com/nvim-lualine/lualine.nvim.git
|
||||
[submodule "pack/plugins/start/Comment.nvim"]
|
||||
path = pack/plugins/start/Comment.nvim
|
||||
url = https://github.com/numToStr/Comment.nvim.git
|
||||
[submodule "pack/plugins/start/guid.nvim"]
|
||||
path = pack/plugins/start/guid.nvim
|
||||
url = https://git.foosoft.net/alex/guid.nvim.git
|
||||
[submodule "pack/plugins/start/revolver.nvim"]
|
||||
path = pack/plugins/start/revolver.nvim
|
||||
url = https://git.foosoft.net/alex/revolver.nvim.git
|
||||
[submodule "pack/plugins/start/vim-quickhl"]
|
||||
path = pack/plugins/start/vim-quickhl
|
||||
url = https://github.com/t9md/vim-quickhl.git
|
||||
[submodule "pack/plugins/start/vim-jdaddy"]
|
||||
path = pack/plugins/start/vim-jdaddy
|
||||
url = https://github.com/tpope/vim-jdaddy.git
|
||||
[submodule ".vim/bundle/vim-argwrap"]
|
||||
path = pack/plugins/start/vim-argwrap
|
||||
url = https://git.foosoft.net/alex/vim-argwrap.git
|
||||
[submodule ".vim/bundle/vim-sort-motion"]
|
||||
path = pack/plugins/start/vim-sort-motion
|
||||
url = https://github.com/christoomey/vim-sort-motion.git
|
||||
[submodule ".vim/bundle/vim-go"]
|
||||
path = pack/plugins/start/vim-go
|
||||
url = https://github.com/fatih/vim-go.git
|
||||
[submodule ".vim/bundle/vim-easy-align"]
|
||||
path = pack/plugins/start/vim-easy-align
|
||||
url = https://github.com/junegunn/vim-easy-align.git
|
||||
[submodule ".vim/bundle/vim-indent-object"]
|
||||
path = pack/plugins/start/vim-indent-object
|
||||
url = https://github.com/michaeljsmith/vim-indent-object.git
|
||||
[submodule ".vim/bundle/vim-better-whitespace"]
|
||||
path = pack/plugins/start/vim-better-whitespace
|
||||
url = https://github.com/ntpeters/vim-better-whitespace.git
|
||||
[submodule ".vim/bundle/vim-abolish"]
|
||||
path = pack/plugins/start/vim-abolish
|
||||
url = https://github.com/tpope/vim-abolish.git
|
||||
[submodule ".vim/bundle/vim-repeat"]
|
||||
path = pack/plugins/start/vim-repeat
|
||||
url = https://github.com/tpope/vim-repeat
|
||||
[submodule ".vim/bundle/vim-surround"]
|
||||
path = pack/plugins/start/vim-surround
|
||||
url = https://github.com/tpope/vim-surround
|
||||
[submodule ".vim/bundle/vim-unimpaired"]
|
||||
path = pack/plugins/start/vim-unimpaired
|
||||
url = https://github.com/tpope/vim-unimpaired.git
|
||||
[submodule ".vim/bundle/vim-dirvish"]
|
||||
path = pack/plugins/start/vim-dirvish
|
||||
url = https://github.com/justinmk/vim-dirvish.git
|
||||
[submodule ".vim/bundle/vim-signify"]
|
||||
path = pack/plugins/start/vim-signify
|
||||
url = https://github.com/mhinz/vim-signify.git
|
||||
[submodule ".vim/bundle/vim-angry"]
|
||||
path = pack/plugins/start/vim-angry
|
||||
url = https://github.com/b4winckler/vim-angry.git
|
||||
[submodule ".vim/pack/plugins/start/vim-fugitive"]
|
||||
path = pack/plugins/start/vim-fugitive
|
||||
url = https://github.com/tpope/vim-fugitive.git
|
||||
[submodule "pack/plugins/start/vim-polyglot"]
|
||||
path = pack/plugins/start/vim-polyglot
|
||||
url = https://github.com/sheerun/vim-polyglot
|
||||
[submodule "pack/plugins/opt/cmp-nvim-lsp"]
|
||||
path = pack/plugins/start/cmp-nvim-lsp
|
||||
url = https://github.com/hrsh7th/cmp-nvim-lsp.git
|
||||
[submodule "pack/plugins/opt/nvim-lspconfig"]
|
||||
path = pack/plugins/start/nvim-lspconfig
|
||||
url = https://github.com/neovim/nvim-lspconfig.git
|
||||
[submodule "pack/plugins/opt/nvim-cmp"]
|
||||
path = pack/plugins/start/nvim-cmp
|
||||
url = https://github.com/hrsh7th/nvim-cmp.git
|
||||
[submodule "pack/plugins/opt/cmp-vsnip"]
|
||||
path = pack/plugins/start/cmp-vsnip
|
||||
url = https://github.com/hrsh7th/cmp-vsnip
|
||||
[submodule "pack/plugins/opt/vim-vsnip"]
|
||||
path = pack/plugins/start/vim-vsnip
|
||||
url = https://github.com/hrsh7th/vim-vsnip
|
||||
[submodule "pack/plugins/start/suda.vim"]
|
||||
path = pack/plugins/start/suda.vim
|
||||
url = https://github.com/lambdalisue/suda.vim.git
|
||||
[submodule "pack/plugins/start/plenary.nvim"]
|
||||
path = pack/plugins/start/plenary.nvim
|
||||
url = https://github.com/nvim-lua/plenary.nvim.git
|
||||
[submodule "pack/plugins/start/vim-rooter"]
|
||||
path = pack/plugins/start/vim-rooter
|
||||
url = https://github.com/airblade/vim-rooter.git
|
||||
[submodule "pack/plugins/start/fzf.vim"]
|
||||
path = pack/plugins/start/fzf.vim
|
||||
url = https://github.com/junegunn/fzf.vim.git
|
||||
[submodule "pack/plugins/start/fzf"]
|
||||
path = pack/plugins/start/fzf
|
||||
url = https://github.com/junegunn/fzf.git
|
||||
[submodule "pack/plugins/start/neodev.nvim"]
|
||||
path = pack/plugins/start/neodev.nvim
|
||||
url = https://github.com/folke/neodev.nvim.git
|
||||
[submodule "pack/plugins/start/cmp-nvim-lsp-signature-help"]
|
||||
path = pack/plugins/start/cmp-nvim-lsp-signature-help
|
||||
url = https://github.com/hrsh7th/cmp-nvim-lsp-signature-help.git
|
||||
[submodule "pack/plugins/start/nightfox.nvim"]
|
||||
path = pack/plugins/start/nightfox.nvim
|
||||
url = https://github.com/EdenEast/nightfox.nvim.git
|
||||
[submodule "pack/plugins/start/lualine.nvim"]
|
||||
path = pack/plugins/start/lualine.nvim
|
||||
url = https://github.com/nvim-lualine/lualine.nvim.git
|
||||
[submodule "pack/plugins/start/Comment.nvim"]
|
||||
path = pack/plugins/start/Comment.nvim
|
||||
url = https://github.com/numToStr/Comment.nvim.git
|
||||
[submodule "pack/plugins/start/guid.nvim"]
|
||||
path = pack/plugins/start/guid.nvim
|
||||
url = https://git.foosoft.net/alex/guid.nvim.git
|
||||
[submodule "pack/plugins/start/revolver.nvim"]
|
||||
path = pack/plugins/start/revolver.nvim
|
||||
url = https://git.foosoft.net/alex/revolver.nvim.git
|
||||
[submodule "pack/plugins/start/vim-quickhl"]
|
||||
path = pack/plugins/start/vim-quickhl
|
||||
url = https://github.com/t9md/vim-quickhl.git
|
||||
|
||||
@ -5,10 +5,6 @@ end
|
||||
|
||||
local function get_branch_parent()
|
||||
local author = invoke({'git', 'config', 'user.name'})
|
||||
if #author == 0 then
|
||||
print('User name is not set')
|
||||
return
|
||||
end
|
||||
|
||||
local hash = invoke{
|
||||
'git',
|
||||
@ -26,13 +22,6 @@ local function get_branch_parent()
|
||||
end
|
||||
end
|
||||
|
||||
local function edit_git_paths(names)
|
||||
local root_dir = invoke({'git', 'rev-parse', '--show-toplevel'})
|
||||
for name in string.gmatch(names, '[^\r\n]+') do
|
||||
vim.cmd(string.format('e %s/%s', root_dir, name))
|
||||
end
|
||||
end
|
||||
|
||||
-- UnAlign
|
||||
vim.api.nvim_create_user_command(
|
||||
'UnAlign',
|
||||
@ -42,22 +31,21 @@ vim.api.nvim_create_user_command(
|
||||
{range = '%'}
|
||||
)
|
||||
|
||||
-- Conflicts
|
||||
vim.api.nvim_create_user_command(
|
||||
'Conflicts',
|
||||
function(ctx)
|
||||
edit_git_paths(invoke({'git', 'diff', '--name-only', '--diff-filter=U'}))
|
||||
end,
|
||||
{}
|
||||
)
|
||||
|
||||
-- TopicEdit
|
||||
vim.api.nvim_create_user_command(
|
||||
'TopicEdit',
|
||||
function(ctx)
|
||||
local hash = get_branch_parent()
|
||||
if hash then
|
||||
edit_git_paths(invoke({'git', 'diff', '--name-only', hash}))
|
||||
local names = invoke({'git', 'diff', '--name-only', hash})
|
||||
if #names == 0 then
|
||||
print('No files changed since previous author')
|
||||
else
|
||||
local root_dir = invoke({'git', 'rev-parse', '--show-toplevel'})
|
||||
for name in string.gmatch(names, '[^\r\n]+') do
|
||||
vim.cmd(string.format('e %s/%s', root_dir, name))
|
||||
end
|
||||
end
|
||||
end
|
||||
end,
|
||||
{}
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 23b67752cb869dd9c8f3109173b69aa96a1f3acf
|
||||
Loading…
Reference in New Issue
Block a user