Compare commits
No commits in common. "3f15abf71f4847a7305dcc195028e7ee00b6805f" and "b66651422c8943fe8b36b879dfeb94621b7718ce" have entirely different histories.
3f15abf71f
...
b66651422c
9 changed files with 83 additions and 27 deletions
|
@ -15,7 +15,7 @@ preg_match('|/(?<repo>[^/]*)\.git$|', $remote, $res);
|
||||||
|
|
||||||
$repo = $res['repo'];
|
$repo = $res['repo'];
|
||||||
|
|
||||||
chdir("{{.chezmoi.homeDir }}/devel/");
|
chdir("{{.chezmoi.homeDir }}/jopixel/");
|
||||||
exec("git clone '$remote'");
|
exec("git clone '$remote'");
|
||||||
chdir($repo);
|
chdir($repo);
|
||||||
pcntl_exec('/bin/zsh');
|
pcntl_exec('/bin/zsh');
|
||||||
|
|
|
@ -58,9 +58,6 @@ function M.setup()
|
||||||
end, { desc = 'Toggle foldmethod marker/expr' })
|
end, { desc = 'Toggle foldmethod marker/expr' })
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>di', '<cmd>Inspect<CR>', { desc = 'Inspect' })
|
vim.keymap.set('n', '<leader>di', '<cmd>Inspect<CR>', { desc = 'Inspect' })
|
||||||
|
|
||||||
vim.keymap.set('x', '<leader>eB', "c<c-r>=system('base64 -w0', @\")<cr><esc>", { desc = 'Encode to base64' })
|
|
||||||
vim.keymap.set('x', '<leader>eb', "c<c-r>=system('base64 -d -w0', @\")<cr><esc>", { desc = 'Decode from base64' })
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
|
@ -21,7 +21,6 @@ function M.setup()
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
-- }}} LAYA
|
-- }}} LAYA
|
||||||
|
|
||||||
--- terminal {{{
|
--- terminal {{{
|
||||||
|
@ -30,11 +29,11 @@ function M.setup()
|
||||||
group = termgroup,
|
group = termgroup,
|
||||||
callback = function()
|
callback = function()
|
||||||
-- local buf = args.buf
|
-- local buf = args.buf
|
||||||
vim.api.nvim_set_option_value('number', false, { win = 0 })
|
vim.api.nvim_win_set_option(0, 'number', false)
|
||||||
vim.api.nvim_set_option_value('signcolumn', 'no', { win = 0 })
|
vim.api.nvim_win_set_option(0, 'signcolumn', 'no')
|
||||||
|
|
||||||
local winid = vim.api.nvim_get_current_win();
|
local winid = vim.api.nvim_get_current_win();
|
||||||
vim.schedule(function()
|
vim.schedule(function ()
|
||||||
if vim.api.nvim_get_current_win() == winid then
|
if vim.api.nvim_get_current_win() == winid then
|
||||||
vim.cmd.startinsert()
|
vim.cmd.startinsert()
|
||||||
end
|
end
|
||||||
|
@ -84,10 +83,6 @@ function M.setup()
|
||||||
-- end
|
-- end
|
||||||
|
|
||||||
-- }}}
|
-- }}}
|
||||||
|
|
||||||
-- abbrevs {{{
|
|
||||||
vim.cmd.iabbrev('anisble', 'ansible')
|
|
||||||
-- }}}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
|
@ -4,7 +4,6 @@ local M = {
|
||||||
{ '<Space>gg', '<Plug>Lazygit', desc = 'Lazygit' },
|
{ '<Space>gg', '<Plug>Lazygit', desc = 'Lazygit' },
|
||||||
{ '<Space>gh', '<Plug>GitHistory', desc = 'Git history' },
|
{ '<Space>gh', '<Plug>GitHistory', desc = 'Git history' },
|
||||||
{ '<Space>gB', '<Plug>GitBlame', desc = 'Git Blame' },
|
{ '<Space>gB', '<Plug>GitBlame', desc = 'Git Blame' },
|
||||||
{ '<Space>gC', '<Plug>GitLabCIView', desc = 'Show gitlab pipeline' },
|
|
||||||
},
|
},
|
||||||
lazy = true,
|
lazy = true,
|
||||||
}
|
}
|
||||||
|
@ -47,22 +46,9 @@ function M.config()
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
local gitlab_ci = function()
|
|
||||||
local file = vim.api.nvim_buf_get_name(0)
|
|
||||||
local cmd = 'glab ci view'
|
|
||||||
fterm.scratch({
|
|
||||||
cmd = cmd,
|
|
||||||
dimensions = {
|
|
||||||
height = 0.9,
|
|
||||||
width = 0.9,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.keymap.set('n', '<Plug>Lazygit', function() lazygit:toggle() end, { desc = 'Toggle lazygit' })
|
vim.keymap.set('n', '<Plug>Lazygit', function() lazygit:toggle() end, { desc = 'Toggle lazygit' })
|
||||||
vim.keymap.set('n', '<Plug>GitHistory', git_history, { desc = 'Show git history' })
|
vim.keymap.set('n', '<Plug>GitHistory', git_history, { desc = 'Show git history' })
|
||||||
vim.keymap.set('n', '<Plug>GitBlame', git_blame, { desc = 'Show git blame' })
|
vim.keymap.set('n', '<Plug>GitBlame', git_blame, { desc = 'Show git blame' })
|
||||||
vim.keymap.set('n', '<Plug>GitLabCIView', gitlab_ci, { desc = 'Show gitlab pipeline' })
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
30
dot_config/nvim/queries/xml.bak/highlights.scm
Normal file
30
dot_config/nvim/queries/xml.bak/highlights.scm
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
[
|
||||||
|
"<"
|
||||||
|
">"
|
||||||
|
"</"
|
||||||
|
"/>"
|
||||||
|
] @tag.delimiter
|
||||||
|
|
||||||
|
"=" @operator
|
||||||
|
[
|
||||||
|
(start_tag)
|
||||||
|
(end_tag)
|
||||||
|
(xml_decl)
|
||||||
|
] @tag
|
||||||
|
(empty_elem_tag) @tag
|
||||||
|
|
||||||
|
[(doctype_decl) (xml_decl)] @keyword
|
||||||
|
(doctype) @string
|
||||||
|
(system_literal) @string
|
||||||
|
|
||||||
|
["encoding" "standalone" "version" ] @tag.attribute
|
||||||
|
[
|
||||||
|
(version_info)
|
||||||
|
(encoding_decl)
|
||||||
|
(standalone_decl)
|
||||||
|
] @string
|
||||||
|
|
||||||
|
|
||||||
|
(attribute_name) @tag.attribute
|
||||||
|
(attribute_value) @string
|
||||||
|
(comment) @comment
|
9
dot_config/nvim/queries/xml.bak/indents.scm
Normal file
9
dot_config/nvim/queries/xml.bak/indents.scm
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
|
||||||
|
(prolog) @indent.zero
|
||||||
|
|
||||||
|
[
|
||||||
|
(start_tag)
|
||||||
|
(element)
|
||||||
|
] @indent.begin
|
||||||
|
|
||||||
|
[ (end_tag) ">" "/>"] @indent.branch
|
30
dot_config/nvim/queries/xml/highlights.scm
Normal file
30
dot_config/nvim/queries/xml/highlights.scm
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
[
|
||||||
|
"<"
|
||||||
|
">"
|
||||||
|
"</"
|
||||||
|
"/>"
|
||||||
|
] @tag.delimiter
|
||||||
|
|
||||||
|
"=" @operator
|
||||||
|
[
|
||||||
|
(start_tag)
|
||||||
|
(end_tag)
|
||||||
|
(xml_decl)
|
||||||
|
] @tag
|
||||||
|
(empty_elem_tag) @tag
|
||||||
|
|
||||||
|
[(doctype_decl) (xml_decl)] @keyword
|
||||||
|
(doctype) @string
|
||||||
|
(system_literal) @string
|
||||||
|
|
||||||
|
["encoding" "standalone" "version" ] @tag.attribute
|
||||||
|
[
|
||||||
|
(version_info)
|
||||||
|
(encoding_decl)
|
||||||
|
(standalone_decl)
|
||||||
|
] @string
|
||||||
|
|
||||||
|
|
||||||
|
(attribute_name) @tag.attribute
|
||||||
|
(attribute_value) @string
|
||||||
|
(comment) @comment
|
9
dot_config/nvim/queries/xml/indents.scm
Normal file
9
dot_config/nvim/queries/xml/indents.scm
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
|
||||||
|
(prolog) @indent.zero
|
||||||
|
|
||||||
|
[
|
||||||
|
(start_tag)
|
||||||
|
(element)
|
||||||
|
] @indent.begin
|
||||||
|
|
||||||
|
[ (end_tag) ">" "/>"] @indent.branch
|
|
@ -1,4 +1,4 @@
|
||||||
|
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5X/Wicqlt5rKalIRt0b6bNMo7NhCHHeJteDnqOXYxXoLt2Iry9sQEffj5B+D793lsjvGs63iwkUlXVwyaUg5JLZPMPsLdv1skSNrafDumoDLkdhfVKTJz9BmR+wyHL7mw15IdtcuceMEXL+kN3xnD/pFQWurrCb3i4jUbrO2YvkiJMq9PNS6S/2s15nfTLdJ4plQhHGgZ1S6UT4fxfjqqwcyT9pYd5gHvi8ELBXz1OzNFFRe34KGYWVCgeqBuAXFQ5prKm3ZI2GszOvhn6mvEgrZp78EUgkg86Zz6fqIp79IY1L0wRuJ8yI63J8gn9CKdxOf9yBDhaSfPXYTomv9+w4VytndtuaGxpXf55DHzloFZFRQSP8XgSyukhWGI4Hv+ukPGS8bN7ypt70JeVT3cMtnlpfEhTOc/pt8ecpLVSPoDqbT/XGXgKXle3brMlsrA+RwY5ni/sXjsV+s4+rsxa2xc+BToHutA5H9yebBmS5eOuinXqUyfPDZOVMpdRK0mV2F0GE3AW6HR/1d9ug1zEjT6cpXGmh1HecZ1HHFvI2olBpkpOds5mJR9hf7qndYSzxVS0h0ya8pRM6GPvwnSrfP+RW8zLDtJrPhH0snNoDdlz6t+hp6+JJZfpO+z7Lm3iQ5FAhm6ue7ftBn4IyzRNeGrc1VK+lG051k2Bs5p5Q== schwarz@jopixel.cz
|
||||||
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOfPouqE2S+rgfYKL4EA/TL3M9U9KsRQhXWQb7jogkcEyNtaoqjGMKxX/PaMimcnQTstFieO/1TxaLxb6igXF84= sogun@Iluminator
|
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOfPouqE2S+rgfYKL4EA/TL3M9U9KsRQhXWQb7jogkcEyNtaoqjGMKxX/PaMimcnQTstFieO/1TxaLxb6igXF84= sogun@Iluminator
|
||||||
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJBTTvkanxWgKeUZFghuDB0NfeHkW0TmAYh7S6CAxgt/SzQyqV73DJMwoiFDoGU1lLD7c2aoovz5l+lSVYECo0A= fon
|
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJBTTvkanxWgKeUZFghuDB0NfeHkW0TmAYh7S6CAxgt/SzQyqV73DJMwoiFDoGU1lLD7c2aoovz5l+lSVYECo0A= fon
|
||||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPqVeOJZ/i4lgl4UlzSDFZmY7N05EkD7/8+ezS0nWzcC sogun@Iluminator
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPqVeOJZ/i4lgl4UlzSDFZmY7N05EkD7/8+ezS0nWzcC sogun@Iluminator
|
||||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGHm0mHtwB0uVCJTOs6xxvhbQIVP8ZAoEev8rODbCPtV vladimir@archdudr
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue