format all files

This commit is contained in:
RingOfStorms (Joshua Bell) 2023-11-03 00:57:32 -05:00
parent 7adc3a8bf9
commit 0a17321086
26 changed files with 331 additions and 331 deletions

View file

@ -26,4 +26,3 @@ require("lazy").setup("plugins", {
vim.cmd("colorscheme material") vim.cmd("colorscheme material")
require("tools") require("tools")
require("autocommands") require("autocommands")

View file

@ -105,7 +105,6 @@ require("util").keymaps({
["<C-r>"] = { '"hy:%s/<C-r>h//g<left><left>', desc = "Replace current selection" }, ["<C-r>"] = { '"hy:%s/<C-r>h//g<left><left>', desc = "Replace current selection" },
[">"] = { "> gv", desc = "Indent selection" }, [">"] = { "> gv", desc = "Indent selection" },
["<"] = { "< gv", desc = "Outdent selection" }, ["<"] = { "< gv", desc = "Outdent selection" },
}, },
i = { i = {
["<C-k>"] = { "<Up>", desc = "Up" }, ["<C-k>"] = { "<Up>", desc = "Up" },

View file

@ -1,4 +1,4 @@
vim.o.sessionoptions="blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
return { return {
"rmagatti/auto-session", "rmagatti/auto-session",

View file

@ -1,5 +1,5 @@
vim.g.NERDCreateDefaultMappings = 0 vim.g.NERDCreateDefaultMappings = 0
vim.g.NERDDefaultAlign = 'both' vim.g.NERDDefaultAlign = "both"
vim.g.NERDSpaceDelims = 1 vim.g.NERDSpaceDelims = 1
vim.cmd("filetype plugin on") vim.cmd("filetype plugin on")

View file

@ -6,9 +6,9 @@ return {
"<leader>xx", "<leader>xx",
"<cmd>:'<,'>FloatermNew --autoclose=2<cr>", "<cmd>:'<,'>FloatermNew --autoclose=2<cr>",
desc = "Run selected as command in float terminal", desc = "Run selected as command in float terminal",
mode = "v" mode = "v",
}, },
{ "<C-x>", "<cmd>FloatermToggle Terminal<cr>", desc = "Toggle float terminal" }, { "<C-x>", "<cmd>FloatermToggle Terminal<cr>", desc = "Toggle float terminal" },
{ "<C-z>", "<cmd>FloatermNew --disposable<cr>", desc = "Toggle disposable float terminal", mode = { "v", "n" }} { "<C-z>", "<cmd>FloatermNew --disposable<cr>", desc = "Toggle disposable float terminal", mode = { "v", "n" } },
}, },
} }

View file

@ -1,4 +1,4 @@
local highlight = require('util').highlight local highlight = require("util").highlight
-- Dull Version -- Dull Version
highlight("GitGutterUntracked", { fg = "#688066", gui = "nocombine" }) highlight("GitGutterUntracked", { fg = "#688066", gui = "nocombine" })
@ -8,7 +8,7 @@ return {
dependencies = { "nvim-lua/plenary.nvim" }, dependencies = { "nvim-lua/plenary.nvim" },
opts = { opts = {
watch_gitdir = { watch_gitdir = {
interval = 100 interval = 100,
}, },
signs = { signs = {
add = { hl = "GitGutterAdd" }, add = { hl = "GitGutterAdd" },
@ -20,7 +20,7 @@ return {
}, },
current_line_blame_opts = { current_line_blame_opts = {
virt_text = true, virt_text = true,
virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
delay = 0, delay = 0,
ignore_whitespace = false, ignore_whitespace = false,
}, },
@ -28,8 +28,8 @@ return {
vim.keymap.set("n", "<leader>gb", function() vim.keymap.set("n", "<leader>gb", function()
package.loaded.gitsigns.toggle_current_line_blame() package.loaded.gitsigns.toggle_current_line_blame()
end, { desc = "Toggle git blame on current line" }) end, { desc = "Toggle git blame on current line" })
end end,
} },
}, },
{ {
"Neogitorg/neogit", "Neogitorg/neogit",
@ -38,17 +38,20 @@ return {
}, },
opts = { opts = {
integrations = { integrations = {
diffview = true diffview = true,
}, },
sections = { sections = {
recent = false recent = false,
} },
}, },
keys = { keys = {
{ "<leader>gs", function() {
require('neogit').open({ kind = "vsplit" }) "<leader>gs",
end } function()
} require("neogit").open({ kind = "vsplit" })
end,
},
},
}, },
{ {
@ -92,7 +95,7 @@ return {
multi_file = { multi_file = {
diff_merges = "first-parent", diff_merges = "first-parent",
}, },
} },
}, },
win_config = { win_config = {
position = "bottom", position = "bottom",
@ -103,5 +106,5 @@ return {
keys = { keys = {
{ "<leader>gd", "<cmd>DiffviewOpen<cr>", desc = "Opens git diff view." }, { "<leader>gd", "<cmd>DiffviewOpen<cr>", desc = "Opens git diff view." },
}, },
} },
} }

View file

@ -1,10 +1,10 @@
vim.opt.list = true vim.opt.list = true
-- vim.opt.listchars = '' -- vim.opt.listchars = ''
-- vim.opt.listchars:append "space:⋅" -- vim.opt.listchars:append "space:⋅"
vim.opt.listchars:append "eol:↴" vim.opt.listchars:append("eol:↴")
vim.opt.listchars:append "tab: >" vim.opt.listchars:append("tab: >")
local highlight = require('util').highlight local highlight = require("util").highlight
highlight("NonText", { fg = "#303030", gui = "nocombine" }) highlight("NonText", { fg = "#303030", gui = "nocombine" })
return { return {
@ -31,10 +31,10 @@ return {
"IndentBlanklineScope3", "IndentBlanklineScope3",
"IndentBlanklineScope4", "IndentBlanklineScope4",
"IndentBlanklineScope5", "IndentBlanklineScope5",
} },
}, },
indent = { indent = {
char = '', char = "",
highlight = { highlight = {
"IndentBlanklineIndent1", "IndentBlanklineIndent1",
"IndentBlanklineIndent2", "IndentBlanklineIndent2",
@ -42,10 +42,10 @@ return {
"IndentBlanklineIndent4", "IndentBlanklineIndent4",
"IndentBlanklineIndent5", "IndentBlanklineIndent5",
}, },
} },
}, },
config = function(_, opts) config = function(_, opts)
local hooks = require "ibl.hooks" local hooks = require("ibl.hooks")
hooks.register(hooks.type.HIGHLIGHT_SETUP, function() hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
vim.api.nvim_set_hl(0, "IndentBlanklineIndent1", { fg = "#915053" }) vim.api.nvim_set_hl(0, "IndentBlanklineIndent1", { fg = "#915053" })
vim.api.nvim_set_hl(0, "IndentBlanklineIndent2", { fg = "#A27F3E" }) vim.api.nvim_set_hl(0, "IndentBlanklineIndent2", { fg = "#A27F3E" })
@ -60,6 +60,6 @@ return {
vim.api.nvim_set_hl(0, "IndentBlanklineScope5", { fg = "#917DC0" }) vim.api.nvim_set_hl(0, "IndentBlanklineScope5", { fg = "#917DC0" })
end) end)
require('ibl').setup(opts) require("ibl").setup(opts)
end end,
} }

View file

@ -15,7 +15,7 @@ local function langs()
if client.name == "pyright" then if client.name == "pyright" then
out = vim.fn.system({ "python", "-V" }) out = vim.fn.system({ "python", "-V" })
elseif client.name == "tsserver" then elseif client.name == "tsserver" then
out = 'node ' .. vim.fn.system({ "node", "--version" }) out = "node " .. vim.fn.system({ "node", "--version" })
end end
if out ~= nil and out ~= "" then if out ~= nil and out ~= "" then
langs[#langs + 1] = vim.trim(out) langs[#langs + 1] = vim.trim(out)
@ -58,8 +58,8 @@ return {
}, },
}, },
lualine_b = { lualine_b = {
"mode" "mode",
} },
}, },
inactive_winbar = { inactive_winbar = {
lualine_a = { lualine_a = {

View file

@ -7,6 +7,6 @@ return {
require("telescope").load_extension("textcase") require("telescope").load_extension("textcase")
end, end,
keys = { keys = {
{ "<leader>,c", "<cmd>TextCaseOpenTelescope<cr>", desc = "Change case of selection", mode = {"n", "v"} }, { "<leader>,c", "<cmd>TextCaseOpenTelescope<cr>", desc = "Change case of selection", mode = { "n", "v" } },
}, },
} }

View file

@ -10,6 +10,6 @@ return {
vim.notify = require("notify") vim.notify = require("notify")
end, end,
keys = { keys = {
{ "<leader>fn", "<cmd>Telescope notify<cr>", desc = "Telescope search notifications", mode ={"n", "v", "x"} }, { "<leader>fn", "<cmd>Telescope notify<cr>", desc = "Telescope search notifications", mode = { "n", "v", "x" } },
}, },
} }

View file

@ -18,7 +18,6 @@ function M.keymaps(mappings)
end end
end end
end end
end end
function M.spread(template) function M.spread(template)