diff --git a/nvim/.config/nvim/lua/maps.lua b/nvim/.config/nvim/lua/maps.lua index 0869e73..9db21d3 100644 --- a/nvim/.config/nvim/lua/maps.lua +++ b/nvim/.config/nvim/lua/maps.lua @@ -38,10 +38,12 @@ local function wrap_up() if vim.v.count == 0 then return 'gk' end return 'k' end + local function wrap_down() if vim.v.count == 0 then return 'gj' end return 'j' end + map.n.nore.expr['k'] = wrap_up map.n.nore.expr['j'] = wrap_down @@ -54,7 +56,7 @@ map.i.nore[''] = 'guiw`]a' -- let me save stuff as sudo when I forget to call vim with it map.c.nore['w!!'] = - [[execute 'silent! write !sudo tee % >/dev/null' edit!]] +[[execute 'silent! write !sudo tee % >/dev/null' edit!]] -- yank current filename/filepath to f buffer map.n.nore['yp'] = ':let @p = expand("%")' @@ -123,16 +125,16 @@ map.n.nore['E'] = ':Vifm getcwd()' -- PLUGIN: Telescope GLOBAL FUZZY FINDING -- buffers and files in current workdir map.n.nore['s'] = - [[:lua require 'telescope.builtin'.buffers(require 'telescope.themes'.get_ivy())]] +[[:lua require 'telescope.builtin'.buffers(require 'telescope.themes'.get_ivy())]] -- most recently used / MRU, bound to S since it is essentially a larger -- go-back intention than just buffers map.n.nore['S'] = - [[:lua require 'telescope.builtin'.oldfiles(require 'telescope.themes'.get_ivy())]] +[[:lua require 'telescope.builtin'.oldfiles(require 'telescope.themes'.get_ivy())]] -- fuzzy find files in cwd map.n.nore['f'] = [[:lua require 'telescope.builtin'.find_files()]] -- fuzzy find hidden files in cwd map.n.nore[''] = - [[:lua require 'telescope.builtin'.find_files({hidden=true})]] +[[:lua require 'telescope.builtin'.find_files({hidden=true})]] -- general full-text search in cwd with rg map.n.nore['F'] = [[:lua require 'telescope.builtin'.live_grep()]] @@ -140,25 +142,25 @@ map.n.nore['F'] = [[:lua require 'telescope.builtin'.live_grep()]] map.n.nore['gs'] = [[:lua require 'telescope.builtin'.git_status()]] -- git buffercommits map.n.nore['gb'] = - [[:lua require 'telescope.builtin'.git_bcommits()]] +[[:lua require 'telescope.builtin'.git_bcommits()]] -- git commitlog map.n.nore['gl'] = - [[:lua require 'telescope.builtin'.git_commits()]] +[[:lua require 'telescope.builtin'.git_commits()]] -- helptags map.n.nore[''] = - [[:lua require 'telescope.builtin'.help_tags()]] +[[:lua require 'telescope.builtin'.help_tags()]] -- manpages map.n.nore[''] = - [[:lua require 'telescope.builtin'.man_pages()]] +[[:lua require 'telescope.builtin'.man_pages()]] -- colorschemes map.n.nore[''] = - [[:lua require 'telescope.builtin'.colorscheme(require 'telescope.themes'.get_ivy())]] +[[:lua require 'telescope.builtin'.colorscheme(require 'telescope.themes'.get_ivy())]] -- spell suggestions map.n.nore['z='] = - [[:lua require 'telescope.builtin'.spell_suggest(require 'telescope.themes'.get_ivy())]] +[[:lua require 'telescope.builtin'.spell_suggest(require 'telescope.themes'.get_ivy())]] -- PLUGIN: betterdigraphs -- allow normal digraph insertion on c-k, telescope search on c-k c-k @@ -225,9 +227,9 @@ map.n.nore.silent[''] = "lua require('Navigator').previous()" -- lsp keymaps are set in lsp settings, only for lsp buffers map.i.nore.expr.silent[''] = 'compe#complete()' map.i.expr[''] = - [[vsnip#jumpable(1) ? '(vsnip-jump-next)' : '']] +[[vsnip#jumpable(1) ? '(vsnip-jump-next)' : '']] map.i.expr[''] = - [[vsnip#jumpable(-1) ? '(vsnip-jump-next)' : '']] +[[vsnip#jumpable(-1) ? '(vsnip-jump-next)' : '']] -- PLUGIN: symbols-outline.nvim map.n.nore.silent['o'] = "SymbolsOutline" diff --git a/nvim/.config/nvim/lua/plug/_format.lua b/nvim/.config/nvim/lua/plug/_format.lua index 487b57e..e4cdeac 100644 --- a/nvim/.config/nvim/lua/plug/_format.lua +++ b/nvim/.config/nvim/lua/plug/_format.lua @@ -14,7 +14,7 @@ local prettierfmt = { end } local shfmt = { - function() return {exe = "shfmt", args = {"-i 4"}, stdin = true} end + function() return { exe = "shfmt", args = { "-i 4" }, stdin = true } end } local formatters = { @@ -29,20 +29,19 @@ local formatters = { } end }, - go = {function() return {exe = "goimports", stdin = true} end}, + go = { function() return { exe = "goimports", stdin = true } end }, html = prettierfmt, javascript = prettierfmt, json = prettierfmt, lua = { function() - return - {exe = "lua-format", args = {"--indent-width", 4}, stdin = true} + return { exe = "lua-format", args = { "--indent-width", 4 }, stdin = true } end }, - python = {function() return {exe = "black", args = {"-"}, stdin = true} end}, + python = { function() return { exe = "black", args = { "-" }, stdin = true } end }, rust = { function() - return {exe = "rustfmt", args = {"--emit=stdout"}, stdin = true} + return { exe = "rustfmt", args = { "--emit=stdout" }, stdin = true } end }, sh = shfmt, @@ -50,7 +49,7 @@ local formatters = { zsh = shfmt } -require('formatter').setup({logging = false, filetype = formatters}) +require('formatter').setup({ logging = false, filetype = formatters }) -- Format on save: -- gather filetypes to autocorrect for each activated formatter above