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

@ -1,18 +1,18 @@
return {
"Pocco81/auto-save.nvim",
event = "BufEnter",
opts = {
trigger_events = { "InsertLeave", "TextChanged", "TextChangedI", "BufLeave" },
condition = function(buf)
local disallowed_filetypes = { "TelescopePrompt" }
local utils = require("auto-save.utils.data")
if
vim.fn.getbufvar(buf, "&modifiable") == 1
and utils.not_in(vim.fn.getbufvar(buf, "&filetype"), disallowed_filetypes)
then
return true
end
return false
end,
},
"Pocco81/auto-save.nvim",
event = "BufEnter",
opts = {
trigger_events = { "InsertLeave", "TextChanged", "TextChangedI", "BufLeave" },
condition = function(buf)
local disallowed_filetypes = { "TelescopePrompt" }
local utils = require("auto-save.utils.data")
if
vim.fn.getbufvar(buf, "&modifiable") == 1
and utils.not_in(vim.fn.getbufvar(buf, "&filetype"), disallowed_filetypes)
then
return true
end
return false
end,
},
}

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 {
"rmagatti/auto-session",

View file

@ -1,7 +1,7 @@
return {
"uga-rosa/ccc.nvim",
event = "BufRead",
keys = {
{ "<leader>,cp", ":CccPick <CR>", desc = "Color Picker" },
},
"uga-rosa/ccc.nvim",
event = "BufRead",
keys = {
{ "<leader>,cp", ":CccPick <CR>", desc = "Color Picker" },
},
}

View file

@ -1,17 +1,17 @@
vim.g.NERDCreateDefaultMappings = 0
vim.g.NERDDefaultAlign = 'both'
vim.g.NERDDefaultAlign = "both"
vim.g.NERDSpaceDelims = 1
vim.cmd("filetype plugin on")
return {
"preservim/nerdcommenter",
keys = {
{ "<leader>/", ':call nerdcommenter#Comment(0, "toggle")<CR>', desc = "Toggle comments on selection" },
{
"<leader>/",
':call nerdcommenter#Comment(0, "toggle")<CR>',
desc = "Toggle comments on selection",
mode = "v",
},
},
"preservim/nerdcommenter",
keys = {
{ "<leader>/", ':call nerdcommenter#Comment(0, "toggle")<CR>', desc = "Toggle comments on selection" },
{
"<leader>/",
':call nerdcommenter#Comment(0, "toggle")<CR>',
desc = "Toggle comments on selection",
mode = "v",
},
},
}

View file

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

View file

@ -1,17 +1,17 @@
return {
"rest-nvim/rest.nvim",
event = "BufEnter *.http",
dependencies = { "nvim-lua/plenary.nvim" },
"rest-nvim/rest.nvim",
event = "BufEnter *.http",
dependencies = { "nvim-lua/plenary.nvim" },
opts = {
encode_url = false,
},
keys = {
{
"<leader>r",
function()
require("rest-nvim").run()
end,
desc = "Send selected http request",
},
},
keys = {
{
"<leader>r",
function()
require("rest-nvim").run()
end,
desc = "Send selected http request",
},
},
}

View file

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

View file

@ -1,30 +1,30 @@
local function prereqs()
local output = vim.fn.system({
"which",
"lazygit",
})
if output == nil or output == "" then
print("Installing lazygit with rtx")
-- if v:shell_error != 0 then
vim.fn.system({
"rtx",
"global",
"lazygit@latest",
})
vim.fn.system({
"rtx",
"install",
})
end
local output = vim.fn.system({
"which",
"lazygit",
})
if output == nil or output == "" then
print("Installing lazygit with rtx")
-- if v:shell_error != 0 then
vim.fn.system({
"rtx",
"global",
"lazygit@latest",
})
vim.fn.system({
"rtx",
"install",
})
end
end
return {
"kdheepak/lazygit.nvim",
dependencies = {
"nvim-lua/plenary.nvim",
},
build = prereqs,
keys = {
{ "<leader>gg", "<cmd>LazyGit<cr>", desc = "Open lazy git ui" },
},
"kdheepak/lazygit.nvim",
dependencies = {
"nvim-lua/plenary.nvim",
},
build = prereqs,
keys = {
{ "<leader>gg", "<cmd>LazyGit<cr>", desc = "Open lazy git ui" },
},
}

View file

@ -184,7 +184,7 @@ return {
build = ":MasonUpdate",
opts = {},
},
{ "folke/neodev.nvim", opts = {} }, -- lua stuff
{ "folke/neodev.nvim", opts = {} }, -- lua stuff
{
"williamboman/mason-lspconfig.nvim",
},
@ -276,8 +276,8 @@ return {
end,
},
{ name = "nvim_lsp", priority = 9 },
{ nane = "buffer", priority = 7 },
{ name = "luasnip", priority = 6 },
{ nane = "buffer", priority = 7 },
{ name = "luasnip", priority = 6 },
{ name = "path" },
{ name = "crates" },
},

View file

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

View file

@ -1,12 +1,12 @@
return {
"lnc3l0t/glow.nvim",
branch = "advanced_window",
opts = {
default_type = "keep",
},
cmd = "Glow",
keys = {
{ "<leader>m", "<Nop>", desc = " Markdown" },
{ "<leader>mp", ":Glow <CR>", desc = "Markdown preview" },
},
"lnc3l0t/glow.nvim",
branch = "advanced_window",
opts = {
default_type = "keep",
},
cmd = "Glow",
keys = {
{ "<leader>m", "<Nop>", desc = " Markdown" },
{ "<leader>mp", ":Glow <CR>", desc = "Markdown preview" },
},
}

View file

@ -1,51 +1,51 @@
return {
"nvim-neo-tree/neo-tree.nvim",
dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
cmd = "Neotree",
init = function()
vim.g.neo_tree_remove_legacy_commands = true
end,
pin = true,
tag = "2.56",
opts = {
"nvim-neo-tree/neo-tree.nvim",
dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
cmd = "Neotree",
init = function()
vim.g.neo_tree_remove_legacy_commands = true
end,
pin = true,
tag = "2.56",
opts = {
window = {
position = "float",
},
auto_clean_after_session_restore = true,
close_if_last_window = true,
sources = { "filesystem" },
filesystem = {
follow_current_file = false,
group_empty_dirs = true,
filtered_items = {
visible = true,
hide_dotfiles = false,
hide_gitignored = false,
never_show = {
".DS_Store",
},
},
},
use_libuv_file_watcher = true,
nesting_rules = {
["ts"] = { ".cjs", ".cjs.map", ".d.ts", ".d.ts.map", ".js", ".js.map", ".mjs", ".mjs.map", ".test.ts" },
["js"] = { ".cjs", ".cjs.map", ".d.js", ".d.js.map", ".js", ".js.map", ".mjs", ".mjs.map", ".test.js" },
["tsx"] = { ".d.ts", ".d.ts.map", ".js;", ".js.map;", ".jsx;", ".jsx.map;", ".module.scss;", ".svg" },
["scss"] = { ".css", ".css.map" },
},
},
keys = {
{ "<leader>e", "<cmd>Neotree toggle<CR>", desc = "Toggle Explorer" },
{
"<leader>o",
function()
if vim.bo.filetype == "neo-tree" then
vim.cmd.wincmd("p")
else
vim.cmd.Neotree("reveal")
end
end,
desc = "Toggle Explorer Focus",
},
},
auto_clean_after_session_restore = true,
close_if_last_window = true,
sources = { "filesystem" },
filesystem = {
follow_current_file = false,
group_empty_dirs = true,
filtered_items = {
visible = true,
hide_dotfiles = false,
hide_gitignored = false,
never_show = {
".DS_Store",
},
},
},
use_libuv_file_watcher = true,
nesting_rules = {
["ts"] = { ".cjs", ".cjs.map", ".d.ts", ".d.ts.map", ".js", ".js.map", ".mjs", ".mjs.map", ".test.ts" },
["js"] = { ".cjs", ".cjs.map", ".d.js", ".d.js.map", ".js", ".js.map", ".mjs", ".mjs.map", ".test.js" },
["tsx"] = { ".d.ts", ".d.ts.map", ".js;", ".js.map;", ".jsx;", ".jsx.map;", ".module.scss;", ".svg" },
["scss"] = { ".css", ".css.map" },
},
},
keys = {
{ "<leader>e", "<cmd>Neotree toggle<CR>", desc = "Toggle Explorer" },
{
"<leader>o",
function()
if vim.bo.filetype == "neo-tree" then
vim.cmd.wincmd("p")
else
vim.cmd.Neotree("reveal")
end
end,
desc = "Toggle Explorer Focus",
},
},
}

View file

@ -74,7 +74,7 @@ return {
null_ls.builtins.formatting.prettier, -- typescript/javascript
null_ls.builtins.formatting.stylua.with({
extra_args = { "--indent-type", "spaces", "--indent-width", "2" },
}), -- lua
}), -- lua
--null_ls.builtins.formatting.rustfmt, -- rust
rust_formatter_genemichaels, -- order matters, run genemichaels first then rustfmt
rust_formatter_rustfmt,

View file

@ -2,7 +2,7 @@ return {
"Almo7aya/openingh.nvim",
event = "BufEnter",
keys = {
{ "<leader>gf", "<cmd>OpenInGHFile<CR>", desc = "Open in git" },
{ "<leader>gf", "<cmd>OpenInGHFile<CR>", desc = "Open in git" },
{ "<leader>gf", "<cmd>OpenInGHFileLines<CR>", desc = "Open in git", mode = { "v" } },
},
}

View file

@ -7,6 +7,6 @@ return {
require("telescope").load_extension("textcase")
end,
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

@ -1,18 +1,18 @@
return {
"marko-cerovac/material.nvim",
config = function()
vim.g.material_style = "darker"
require("material").setup({
plugins = {
"dashboard",
"gitsigns",
"telescope",
"nvim-tree",
"which-key",
},
high_visibility = {
darker = true,
},
})
end,
"marko-cerovac/material.nvim",
config = function()
vim.g.material_style = "darker"
require("material").setup({
plugins = {
"dashboard",
"gitsigns",
"telescope",
"nvim-tree",
"which-key",
},
high_visibility = {
darker = true,
},
})
end,
}

View file

@ -1,7 +1,7 @@
return {
"mbbill/undotree",
event = "BufEnter",
keys = {
{ "<leader>u", vim.cmd.UndotreeToggle, desc = "Undo Tree Toggle" },
},
"mbbill/undotree",
event = "BufEnter",
keys = {
{ "<leader>u", vim.cmd.UndotreeToggle, desc = "Undo Tree Toggle" },
},
}

View file

@ -1,3 +1,3 @@
return {
"nvim-lua/plenary.nvim",
"nvim-lua/plenary.nvim",
}

View file

@ -1,15 +1,15 @@
return {
"rcarriga/nvim-notify",
"rcarriga/nvim-notify",
event = "VeryLazy",
opts = {
top_down = false,
},
config = function(_, opts)
require("notify").setup(opts)
opts = {
top_down = false,
},
config = function(_, opts)
require("notify").setup(opts)
vim.notify = require("notify")
end,
keys = {
{ "<leader>fn", "<cmd>Telescope notify<cr>", desc = "Telescope search notifications", mode ={"n", "v", "x"} },
},
vim.notify = require("notify")
end,
keys = {
{ "<leader>fn", "<cmd>Telescope notify<cr>", desc = "Telescope search notifications", mode = { "n", "v", "x" } },
},
}