Compare commits
No commits in common. "078578b1737806a91ae15b7e683ffc5fa27aa105" and "4b93568831160a654c702adbe65506b2fba709f4" have entirely different histories.
078578b173
...
4b93568831
5 changed files with 41 additions and 33 deletions
|
@ -4,9 +4,6 @@
|
||||||
signingkey = 73BA40D5AFAF49C9
|
signingkey = 73BA40D5AFAF49C9
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
[sendemail]
|
|
||||||
smtpserver = "/usr/bin/msmtp"
|
|
||||||
annotate = yes
|
|
||||||
[alias]
|
[alias]
|
||||||
ignore = "!gitignore -f"
|
ignore = "!gitignore -f"
|
||||||
pushmerge = "push -o merge_request.merge_when_pipeline_succeeds" # see https://docs.gitlab.com/ce/user/project/push_options.html # merge-when-pipeline-succeeds-alias
|
pushmerge = "push -o merge_request.merge_when_pipeline_succeeds" # see https://docs.gitlab.com/ce/user/project/push_options.html # merge-when-pipeline-succeeds-alias
|
||||||
|
|
|
@ -38,12 +38,10 @@ local function wrap_up()
|
||||||
if vim.v.count == 0 then return 'gk' end
|
if vim.v.count == 0 then return 'gk' end
|
||||||
return 'k'
|
return 'k'
|
||||||
end
|
end
|
||||||
|
|
||||||
local function wrap_down()
|
local function wrap_down()
|
||||||
if vim.v.count == 0 then return 'gj' end
|
if vim.v.count == 0 then return 'gj' end
|
||||||
return 'j'
|
return 'j'
|
||||||
end
|
end
|
||||||
|
|
||||||
map.n.nore.expr['k'] = wrap_up
|
map.n.nore.expr['k'] = wrap_up
|
||||||
map.n.nore.expr['j'] = wrap_down
|
map.n.nore.expr['j'] = wrap_down
|
||||||
|
|
||||||
|
@ -185,7 +183,8 @@ map.x.nore.silent['<localleader>q'] = 'gq'
|
||||||
map.n.nore.silent['<localleader>Q'] = 'vapJgqap'
|
map.n.nore.silent['<localleader>Q'] = 'vapJgqap'
|
||||||
|
|
||||||
-- Enter distraction free prose mode with F11
|
-- Enter distraction free prose mode with F11
|
||||||
map.n.nore.silent['<F11>'] = ':ZenMode<cr>'
|
map.n.nore.silent['<F11>'] = ':TZAtaraxis<cr>'
|
||||||
|
map.n.nore.silent['<F10>'] = ':TZMinimalist<cr>'
|
||||||
|
|
||||||
-- PLUGIN: fzf-bibtex
|
-- PLUGIN: fzf-bibtex
|
||||||
-- map @@ to automatically insert citation reference at cursor
|
-- map @@ to automatically insert citation reference at cursor
|
||||||
|
@ -217,11 +216,11 @@ map.x['ga'] = '<Plug>(EasyAlign)'
|
||||||
map.n['ga'] = '<Plug>(EasyAlign)'
|
map.n['ga'] = '<Plug>(EasyAlign)'
|
||||||
|
|
||||||
-- PLUGIN: Navigator.nvim
|
-- PLUGIN: Navigator.nvim
|
||||||
map.n.nore.silent['<c-w>h'] = "<CMD>lua require('Navigator').left()<CR>"
|
map.n.nore.silent['<c-h>'] = "<CMD>lua require('Navigator').left()<CR>"
|
||||||
map.n.nore.silent['<c-w>k'] = "<CMD>lua require('Navigator').up()<CR>"
|
map.n.nore.silent['<c-k>'] = "<CMD>lua require('Navigator').up()<CR>"
|
||||||
map.n.nore.silent['<c-w>l'] = "<CMD>lua require('Navigator').right()<CR>"
|
map.n.nore.silent['<c-l>'] = "<CMD>lua require('Navigator').right()<CR>"
|
||||||
map.n.nore.silent['<c-w>j'] = "<CMD>lua require('Navigator').down()<CR>"
|
map.n.nore.silent['<c-j>'] = "<CMD>lua require('Navigator').down()<CR>"
|
||||||
map.n.nore.silent['<c-w>p'] = "<CMD>lua require('Navigator').previous()<CR>"
|
map.n.nore.silent['<c-p>'] = "<CMD>lua require('Navigator').previous()<CR>"
|
||||||
|
|
||||||
-- PLUGIN: compe.nvim
|
-- PLUGIN: compe.nvim
|
||||||
-- lsp keymaps are set in lsp settings, only for lsp buffers
|
-- lsp keymaps are set in lsp settings, only for lsp buffers
|
||||||
|
|
|
@ -35,7 +35,8 @@ local formatters = {
|
||||||
json = prettierfmt,
|
json = prettierfmt,
|
||||||
lua = {
|
lua = {
|
||||||
function()
|
function()
|
||||||
return { exe = "lua-format", args = { "--indent-width", 4 }, stdin = true }
|
return
|
||||||
|
{exe = "lua-format", args = {"--indent-width", 4}, stdin = true}
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
python = {function() return {exe = "black", args = {"-"}, stdin = true} end},
|
python = {function() return {exe = "black", args = {"-"}, stdin = true} end},
|
||||||
|
|
|
@ -102,8 +102,20 @@ require("packer").startup(function()
|
||||||
ft = { "quarto" }
|
ft = { "quarto" }
|
||||||
}
|
}
|
||||||
use 'micarmst/vim-spellsync' -- personal dict improvements for git sync
|
use 'micarmst/vim-spellsync' -- personal dict improvements for git sync
|
||||||
use { 'folke/zen-mode.nvim', config = require('zen-mode').setup() } -- provide distraction free writing
|
use { -- provide distraction free writing
|
||||||
use 'folke/twilight.nvim' -- provide even distraction free-er writing (lowlight paragraphs)
|
'Pocco81/TrueZen.nvim',
|
||||||
|
config = function()
|
||||||
|
require("true-zen").setup({
|
||||||
|
integrations = {
|
||||||
|
gitsigns = true,
|
||||||
|
lualine = true,
|
||||||
|
tmux = { global = false },
|
||||||
|
limelight = true
|
||||||
|
}
|
||||||
|
})
|
||||||
|
end
|
||||||
|
}
|
||||||
|
use { 'junegunn/limelight.vim', event = 'BufRead' } -- provide even distraction free-er writing (lowlight paragraphs)
|
||||||
use 'alok/notational-fzf-vim' -- quickly search through the wiki
|
use 'alok/notational-fzf-vim' -- quickly search through the wiki
|
||||||
|
|
||||||
-- languages
|
-- languages
|
||||||
|
|
|
@ -8,7 +8,6 @@ c.url.searchengines = {
|
||||||
"aur": "https://aur.archlinux.org/packages/?K={}",
|
"aur": "https://aur.archlinux.org/packages/?K={}",
|
||||||
"d": "https://www.dict.cc/?s={}",
|
"d": "https://www.dict.cc/?s={}",
|
||||||
"ddg": "https://duckduckgo.com/?q={}",
|
"ddg": "https://duckduckgo.com/?q={}",
|
||||||
"docker": "https://hub.docker.com/search?q={}",
|
|
||||||
"dt": "https://www.deepl.com/translator#en/de/{}",
|
"dt": "https://www.deepl.com/translator#en/de/{}",
|
||||||
"g": "https://www.google.com/search?q={}",
|
"g": "https://www.google.com/search?q={}",
|
||||||
"gh": "https://github.com/search?q={}",
|
"gh": "https://github.com/search?q={}",
|
||||||
|
|
Loading…
Reference in a new issue