mirror of
https://github.com/tiyn/dotfiles.git
synced 2025-04-19 16:27:45 +02:00
Compare commits
No commits in common. "7931d193b69fa6000eb592962d96d03c5b0738a4" and "f789c139cbe87f23f01d2c5e4c9652b15716b58a" have entirely different histories.
7931d193b6
...
f789c139cb
@ -1,5 +1,4 @@
|
|||||||
Bonitur
|
Bonitur
|
||||||
Königinnensubstanz
|
Königinnensubstanz
|
||||||
Magazinbeute
|
Magazinbeute
|
||||||
Magazinbeuten
|
|
||||||
Pollenhose
|
Pollenhose
|
||||||
|
@ -20,43 +20,43 @@ m.nname("<leader>s", "Substitute")
|
|||||||
m.nname("<leader>t", "Terminal")
|
m.nname("<leader>t", "Terminal")
|
||||||
|
|
||||||
-- unmap unwanted commands
|
-- unmap unwanted commands
|
||||||
m.nnoremap("Zt", '<NOP>')
|
m.nnoremap("Zt", '<NOP>')
|
||||||
m.nnoremap("ZT", '<NOP>')
|
m.nnoremap("ZT", '<NOP>')
|
||||||
m.nnoremap("<Space>", '<NOP>')
|
m.nnoremap("<Space>", '<NOP>')
|
||||||
m.inoremap("<F2>", '<NOP>')
|
m.inoremap("<F2>", '<NOP>')
|
||||||
m.inoremap("<F3>", '<NOP>')
|
m.inoremap("<F3>", '<NOP>')
|
||||||
m.inoremap("<F4>", '<NOP>')
|
m.inoremap("<F4>", '<NOP>')
|
||||||
m.inoremap("<F5>", '<NOP>')
|
m.inoremap("<F5>", '<NOP>')
|
||||||
m.inoremap("<F6>", '<NOP>')
|
m.inoremap("<F6>", '<NOP>')
|
||||||
m.inoremap("<F8>", '<NOP>')
|
m.inoremap("<F8>", '<NOP>')
|
||||||
m.inoremap("<F9>", '<NOP>')
|
m.inoremap("<F9>", '<NOP>')
|
||||||
m.nnoremap("<F9>", '<NOP>')
|
m.nnoremap("<F9>", '<NOP>')
|
||||||
m.inoremap("<F10>", '<NOP>')
|
m.inoremap("<F10>", '<NOP>')
|
||||||
m.nnoremap("<F10>", '<NOP>')
|
m.nnoremap("<F10>", '<NOP>')
|
||||||
m.inoremap("<F11>", '<NOP>')
|
m.inoremap("<F11>", '<NOP>')
|
||||||
m.nnoremap("<F11>", '<NOP>')
|
m.nnoremap("<F11>", '<NOP>')
|
||||||
m.inoremap("<F12>", '<NOP>')
|
m.inoremap("<F12>", '<NOP>')
|
||||||
m.nnoremap("<F12>", '<NOP>')
|
m.nnoremap("<F12>", '<NOP>')
|
||||||
|
|
||||||
-- shortcut for split navigation
|
-- shortcut for split navigation
|
||||||
m.nnoremap("<C-h>", '<C-w>h', 'Navigation: go to left split')
|
m.nnoremap("<C-h>", '<C-w>h', 'Navigation: go to left split')
|
||||||
m.nnoremap("<C-j>", '<C-w>j', 'Navigation: go to lower split')
|
m.nnoremap("<C-j>", '<C-w>j', 'Navigation: go to lower split')
|
||||||
m.nnoremap("<C-k>", '<C-w>k', 'Navigation: go to upper split')
|
m.nnoremap("<C-k>", '<C-w>k', 'Navigation: go to upper split')
|
||||||
m.nnoremap("<C-l>", '<C-w>l', 'Navigation: go to right split')
|
m.nnoremap("<C-l>", '<C-w>l', 'Navigation: go to right split')
|
||||||
|
|
||||||
-- remap for dealing with word wrap
|
-- remap for dealing with word wrap
|
||||||
m.nmap('j', "v:count == 0 ? 'gj' : 'j'", { "expr", "silent" }, 'Navigation: go down in wrapped lines')
|
m.nmap('j', "v:count == 0 ? 'gj' : 'j'", { "expr", "silent" }, 'Navigation: go down in wrapped lines')
|
||||||
m.nmap('k', "v:count == 0 ? 'gk' : 'k'", { "expr", "silent" }, 'Navigation: go up in wrapped lines')
|
m.nmap('k', "v:count == 0 ? 'gk' : 'k'", { "expr", "silent" }, 'Navigation: go up in wrapped lines')
|
||||||
|
|
||||||
-- compiler for languages
|
-- compiler for languages
|
||||||
m.nnoremap("<leader>c", ':w! | !compiler <c-r>%<CR>', 'Compile: current file')
|
m.nnoremap("<leader>c", ':w! | !compiler <c-r>%<CR>', 'Compile: current file')
|
||||||
|
|
||||||
-- save file as sudo on files that require root permission
|
-- save file as sudo on files that require root permission
|
||||||
m.cnoremap("w!!", 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!', 'Write: overwrite file over with sudo')
|
m.cnoremap("w!!", 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!', 'Write: overwrite file over with sudo')
|
||||||
|
|
||||||
-- tpope/vim-abolish
|
-- tpope/vim-abolish
|
||||||
m.nnoremap("<leader>sa", ':%S//g<Left><Left>', 'Substitute: free form')
|
m.nnoremap("<leader>sa", ':%S//g<Left><Left>', 'Substitute: free form')
|
||||||
m.nnoremap("<leader>ss", ':%S/\\<<C-r><C-w>\\>//g<Left><Left>', 'Substitute: word under cursor')
|
m.nnoremap("<leader>ss", ':%S/\\<<C-r><C-w>\\>//g<Left><Left>', 'Substitute: word under cursor')
|
||||||
|
|
||||||
-- stevearc/aerial.nvim
|
-- stevearc/aerial.nvim
|
||||||
m.nmap('<F3>', ':AerialToggle!<CR>', 'CTags: toggle')
|
m.nmap('<F3>', ':AerialToggle!<CR>', 'CTags: toggle')
|
||||||
@ -98,10 +98,10 @@ m.nnoremap("<F8>", function() require("conform").format({ async = true, lsp_fall
|
|||||||
m.nnoremap("<F5>", require("renamer").rename, "LSP: rename")
|
m.nnoremap("<F5>", require("renamer").rename, "LSP: rename")
|
||||||
|
|
||||||
-- nvim-telescope/telescope.nvim
|
-- nvim-telescope/telescope.nvim
|
||||||
m.nnoremap("<F4>", ':Telescope find_files<CR>', "Telescope: find files")
|
m.nnoremap("<F4>", ':Telescope find_files<CR>', "Telescope: find files")
|
||||||
|
|
||||||
-- kamykn/spelunker.vim
|
-- kamykn/spelunker.vim
|
||||||
m.nnoremap("<F6>", ':call spelunker#toggle()<CR>', "Spelling: toggle spell check")
|
m.nnoremap("<F6>", ':call spelunker#toggle()<CR>', "Spelling: toggle spell check")
|
||||||
|
|
||||||
-- kevinhwang91/nvim-ufo
|
-- kevinhwang91/nvim-ufo
|
||||||
m.nnoremap("K", function()
|
m.nnoremap("K", function()
|
||||||
|
@ -1,19 +1,12 @@
|
|||||||
return {
|
return {
|
||||||
-- improved refactoring
|
-- improved refactoring
|
||||||
{
|
{
|
||||||
"stevearc/conform.nvim",
|
'stevearc/conform.nvim',
|
||||||
config = function()
|
opts = {
|
||||||
require("conform").setup({
|
formatters_by_ft = {
|
||||||
formatters_by_ft = {
|
python = { "isort", "black" },
|
||||||
python = { "isort", "black" },
|
markdown = { "mdformat" },
|
||||||
markdown = { "mdformat" },
|
|
||||||
tex = { "latexindent" },
|
|
||||||
lua = { "stylua" },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
require("conform").formatters.latexindent = {
|
|
||||||
prepend_args = { "-y=defaultIndent: ' '" },
|
|
||||||
}
|
}
|
||||||
end,
|
}
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,15 +8,11 @@ return {
|
|||||||
config = function()
|
config = function()
|
||||||
require("null-ls").setup({
|
require("null-ls").setup({
|
||||||
sources = {
|
sources = {
|
||||||
-- latex
|
-- python
|
||||||
require("null-ls").builtins.formatting.latexindent,
|
require("null-ls").builtins.formatting.isort,
|
||||||
-- lua
|
require("null-ls").builtins.formatting.black,
|
||||||
require("null-ls").builtins.formatting.stylua,
|
|
||||||
-- markdown
|
-- markdown
|
||||||
require("null-ls").builtins.formatting.mdformat,
|
require("null-ls").builtins.formatting.mdformat,
|
||||||
-- python
|
|
||||||
require("null-ls").builtins.formatting.black,
|
|
||||||
require("null-ls").builtins.formatting.isort,
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
@ -26,11 +22,7 @@ return {
|
|||||||
opts = {
|
opts = {
|
||||||
automatic_installation = true,
|
automatic_installation = true,
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
"black",
|
"isort", "black", "mdformat"
|
||||||
"isort",
|
|
||||||
"latexindent",
|
|
||||||
"mdformat",
|
|
||||||
"stylua",
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
column_width = 100
|
|
||||||
line_endings = "Unix"
|
|
||||||
indent_type = "Spaces"
|
|
||||||
indent_width = 2
|
|
||||||
quote_style = "AutoPreferDouble"
|
|
||||||
call_parentheses = "Always"
|
|
||||||
collapse_simple_statement = "Never"
|
|
||||||
|
|
||||||
[sort_requires]
|
|
||||||
enabled = true
|
|
Loading…
x
Reference in New Issue
Block a user