diff --git a/roles/neovim/files/after/plugin/git.lua b/roles/neovim/files/after/plugin/git.lua index e9ad4db..b2572e5 100644 --- a/roles/neovim/files/after/plugin/git.lua +++ b/roles/neovim/files/after/plugin/git.lua @@ -7,9 +7,24 @@ neogit.setup { disable_commit_confirmation = true, } -local nmap = require('opdavies.keymap').nmap +local nmap = require("opdavies.keymap").nmap -nmap { "gc", function() neogit.open { "commit" } end } -nmap { "gl", function() neogit.open { "log" } end } -nmap { "gp", function() neogit.open { "push" } end } +nmap { + "gc", + function() + neogit.open { "commit" } + end, +} +nmap { + "gl", + function() + neogit.open { "log" } + end, +} +nmap { + "gp", + function() + neogit.open { "push" } + end, +} nmap { "gs", neogit.open } diff --git a/roles/neovim/files/after/plugin/lir.lua b/roles/neovim/files/after/plugin/lir.lua index b779a3d..ec15d55 100644 --- a/roles/neovim/files/after/plugin/lir.lua +++ b/roles/neovim/files/after/plugin/lir.lua @@ -3,9 +3,9 @@ if not has_lir then return end -local actions = require'lir.actions' -local clipboard_actions = require'lir.clipboard.actions' -local mark_actions = require 'lir.mark.actions' +local actions = require "lir.actions" +local clipboard_actions = require "lir.clipboard.actions" +local mark_actions = require "lir.mark.actions" lir.setup { hide_cursor = true, @@ -13,37 +13,37 @@ lir.setup { -- devicons_enable = true, mappings = { - ['l'] = actions.edit, - [''] = actions.split, - [''] = actions.vsplit, - [''] = actions.tabedit, + ["l"] = actions.edit, + [""] = actions.split, + [""] = actions.vsplit, + [""] = actions.tabedit, - ['h'] = actions.up, - ['q'] = actions.quit, + ["h"] = actions.up, + ["q"] = actions.quit, - ['K'] = actions.mkdir, - ['N'] = actions.newfile, - ['R'] = actions.rename, - ['@'] = actions.cd, - ['Y'] = actions.yank_path, - ['.'] = actions.toggle_show_hidden, - ['D'] = actions.delete, + ["K"] = actions.mkdir, + ["N"] = actions.newfile, + ["R"] = actions.rename, + ["@"] = actions.cd, + ["Y"] = actions.yank_path, + ["."] = actions.toggle_show_hidden, + ["D"] = actions.delete, - ['J'] = function() + ["J"] = function() mark_actions.toggle_mark() - vim.cmd('normal! j') + vim.cmd "normal! j" end, - ['C'] = clipboard_actions.copy, - ['X'] = clipboard_actions.cut, - ['P'] = clipboard_actions.paste, + ["C"] = clipboard_actions.copy, + ["X"] = clipboard_actions.cut, + ["P"] = clipboard_actions.paste, }, float = { winblend = 0, curdir_window = { enable = false, - highlight_dirname = false + highlight_dirname = false, }, }, @@ -58,7 +58,6 @@ lir.setup { ) -- echo cwd - vim.api.nvim_echo({ { vim.fn.expand("%:p"), "Normal" } }, false, {}) + vim.api.nvim_echo({ { vim.fn.expand "%:p", "Normal" } }, false, {}) end, } - diff --git a/roles/neovim/files/lua/opdavies/lsp/init.lua b/roles/neovim/files/lua/opdavies/lsp/init.lua index 9ccd9e6..a38a042 100644 --- a/roles/neovim/files/lua/opdavies/lsp/init.lua +++ b/roles/neovim/files/lua/opdavies/lsp/init.lua @@ -8,7 +8,7 @@ local nvim_status = require "lsp-status" local imap = require("opdavies.keymap").imap local nmap = require("opdavies.keymap").nmap -local telescope_mapper = require("opdavies.telescope.mappings") +local telescope_mapper = require "opdavies.telescope.mappings" local buf_nnoremap = function(opts) opts.buffer = 0 diff --git a/roles/neovim/files/lua/opdavies/lsp/null-ls.lua b/roles/neovim/files/lua/opdavies/lsp/null-ls.lua index 9f7e59e..810aa53 100644 --- a/roles/neovim/files/lua/opdavies/lsp/null-ls.lua +++ b/roles/neovim/files/lua/opdavies/lsp/null-ls.lua @@ -19,5 +19,5 @@ null_ls.setup { diagnostics.phpstan, completion.spell, - } + }, } diff --git a/roles/neovim/files/lua/opdavies/options.lua b/roles/neovim/files/lua/opdavies/options.lua index 5e05e9e..7e7f4f5 100644 --- a/roles/neovim/files/lua/opdavies/options.lua +++ b/roles/neovim/files/lua/opdavies/options.lua @@ -102,7 +102,7 @@ local function set_vim_o() end vim.opt.clipboard:append "unnamedplus" - vim.opt.completeopt = {"menu", "menuone", "noselect"} + vim.opt.completeopt = { "menu", "menuone", "noselect" } end M.setup = function() diff --git a/roles/neovim/files/lua/opdavies/telescope/init.lua b/roles/neovim/files/lua/opdavies/telescope/init.lua index fbed8e0..23c7dcd 100644 --- a/roles/neovim/files/lua/opdavies/telescope/init.lua +++ b/roles/neovim/files/lua/opdavies/telescope/init.lua @@ -51,7 +51,7 @@ end function M.live_grep() require("telescope.builtin").live_grep { - sorting_strategy = "ascending" + sorting_strategy = "ascending", } end