ryanc/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix crap lua formatting

Browse Source
This commit is contained in:
Ryan Cavicchioni
2025-05-23 20:02:23 -05:00
parent 16c2a7fa30
commit 99e5c0b13e
9 changed files with 149 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
.config/nvim/lua/config/lazy.lua
View File

@ -1,17 +1,17 @@
-- Bootstrap lazy.nvim -- Bootstrap lazy.nvim
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then if not (vim.uv or vim.loop).fs_stat(lazypath) then
local lazyrepo = "https://github.com/folke/lazy.nvim.git" local lazyrepo = "https://github.com/folke/lazy.nvim.git"
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
if vim.v.shell_error ~= 0 then if vim.v.shell_error ~= 0 then
vim.api.nvim_echo({ vim.api.nvim_echo({
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" }, { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
{ out, "WarningMsg" }, { out, "WarningMsg" },
{ "\nPress any key to exit..." }, { "\nPress any key to exit..." },
}, true, {}) }, true, {})
vim.fn.getchar() vim.fn.getchar()
os.exit(1) os.exit(1)
end end
end end
vim.opt.rtp:prepend(lazypath) vim.opt.rtp:prepend(lazypath)
@ -23,13 +23,13 @@ vim.g.maplocalleader = "\\"
-- Setup lazy.nvim -- Setup lazy.nvim
require("lazy").setup({ require("lazy").setup({
spec = { spec = {
-- import your plugins -- import your plugins
{ import = "plugins" }, { import = "plugins" },
}, },
-- Configure any other settings here. See the documentation for more details. -- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins. -- colorscheme that will be used when installing plugins.
install = { colorscheme = { "habamax" } }, install = { colorscheme = { "habamax" } },
-- automatically check for plugin updates -- automatically check for plugin updates
checker = { enabled = true }, checker = { enabled = true },
}) })

6
.config/nvim/lua/plugins/catppuccin.lua
View File

@ -1,5 +1,5 @@
return { return {
"catppuccin/nvim", "catppuccin/nvim",
name = "catppuccin", name = "catppuccin",
priority = 1000, priority = 1000,
} }

72
.config/nvim/lua/plugins/harpoon.lua
View File

@ -1,13 +1,13 @@
return { return {
"ThePrimeagen/harpoon", "ThePrimeagen/harpoon",
branch = "harpoon2", branch = "harpoon2",
dependencies = { "nvim-lua/plenary.nvim" }, dependencies = { "nvim-lua/plenary.nvim" },
config = function() config = function()
local harpoon = require("harpoon") local harpoon = require("harpoon")
-- REQUIRED -- REQUIRED
harpoon:setup() harpoon:setup()
-- REQUIRED -- REQUIRED
-- basic telescope configuration -- basic telescope configuration
local conf = require("telescope.config").values local conf = require("telescope.config").values
@ -17,27 +17,45 @@ return {
table.insert(file_paths, item.value) table.insert(file_paths, item.value)
end end
require("telescope.pickers").new({}, { require("telescope.pickers")
prompt_title = "Harpoon", .new({}, {
finder = require("telescope.finders").new_table({ prompt_title = "Harpoon",
results = file_paths, finder = require("telescope.finders").new_table({
}), results = file_paths,
previewer = conf.file_previewer({}), }),
sorter = conf.generic_sorter({}), previewer = conf.file_previewer({}),
}):find() sorter = conf.generic_sorter({}),
})
:find()
end end
vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end) vim.keymap.set("n", "<leader>a", function()
-- vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) harpoon:list():add()
vim.keymap.set("n", "<C-e>", function() toggle_telescope(harpoon:list()) end, { desc = "Open harpoon window" }) end)
-- vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
vim.keymap.set("n", "<C-e>", function()
toggle_telescope(harpoon:list())
end, { desc = "Open harpoon window" })
vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end) vim.keymap.set("n", "<C-h>", function()
vim.keymap.set("n", "<C-t>", function() harpoon:list():select(2) end) harpoon:list():select(1)
vim.keymap.set("n", "<C-n>", function() harpoon:list():select(3) end) end)
vim.keymap.set("n", "<C-s>", function() harpoon:list():select(4) end) vim.keymap.set("n", "<C-t>", function()
harpoon:list():select(2)
end)
vim.keymap.set("n", "<C-n>", function()
harpoon:list():select(3)
end)
vim.keymap.set("n", "<C-s>", function()
harpoon:list():select(4)
end)
-- Toggle previous & next buffers stored within Harpoon list -- Toggle previous & next buffers stored within Harpoon list
vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end) vim.keymap.set("n", "<C-S-P>", function()
vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end) harpoon:list():prev()
end, end)
vim.keymap.set("n", "<C-S-N>", function()
harpoon:list():next()
end)
end,
} }

3
.config/nvim/lua/plugins/indent-blankline.lua
View File

@ -1,6 +1,5 @@
return { return {
"lukas-reineke/indent-blankline.nvim", "lukas-reineke/indent-blankline.nvim",
main = "ibl", main = "ibl",
opts = { opts = {},
},
} }

2
.config/nvim/lua/plugins/lint.lua
View File

@ -14,7 +14,7 @@ return {
-- ruby = { "rubocop", "standardrb" }, -- ruby = { "rubocop", "standardrb" },
ruby = { "standardrb" }, ruby = { "standardrb" },
go = { "golangcilint" }, go = { "golangcilint" },
} }
vim.api.nvim_create_autocmd({ "BufWritePost" }, { vim.api.nvim_create_autocmd({ "BufWritePost" }, {
callback = function() callback = function()

124
.config/nvim/lua/plugins/lspconfig.lua
View File

@ -1,65 +1,65 @@
return { return {
{ {
"williamboman/mason.nvim", "williamboman/mason.nvim",
config = function() config = function()
require("mason").setup() require("mason").setup()
end, end,
}, },
{ {
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
dependencies = { "williamboman/mason.nvim" }, dependencies = { "williamboman/mason.nvim" },
config = function() config = function()
require("mason-lspconfig").setup({ require("mason-lspconfig").setup({
ensure_installed = { ensure_installed = {
"lua_ls", "lua_ls",
"ruby_lsp", "ruby_lsp",
-- "standardrb", -- "standardrb",
"terraformls", "terraformls",
"yamlls", "yamlls",
"pyright", "pyright",
"zls", "zls",
"gopls", "gopls",
"bashls", "bashls",
}, },
}) })
end, end,
}, },
{ {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
dependencies = { "williamboman/mason-lspconfig.nvim" }, dependencies = { "williamboman/mason-lspconfig.nvim" },
config = function() config = function()
local lspconfig = require("lspconfig") local lspconfig = require("lspconfig")
lspconfig.zls.setup({}) lspconfig.zls.setup({})
lspconfig.ruby_lsp.setup({ lspconfig.ruby_lsp.setup({
init_options = { init_options = {
formatter = "standard", formatter = "standard",
linters = { "standard" }, linters = { "standard" },
} },
}) })
-- lspconfig.standardrb.setup({}) -- lspconfig.standardrb.setup({})
lspconfig.bashls.setup({}) lspconfig.bashls.setup({})
lspconfig.yamlls.setup({}) lspconfig.yamlls.setup({})
lspconfig.terraformls.setup({}) lspconfig.terraformls.setup({})
lspconfig.lua_ls.setup({ lspconfig.lua_ls.setup({
settings = { settings = {
Lua = { Lua = {
diagnostics = { diagnostics = {
globals = { "vim" }, globals = { "vim" },
}, },
format = { format = {
defaultConfig = { defaultConfig = {
indent_style = "tabs", indent_style = "tabs",
indent_size = "4", indent_size = "4",
}, },
enable = true, enable = true,
}, },
}, },
}, },
}) })
lspconfig.pyright.setup({}) lspconfig.pyright.setup({})
lspconfig.gopls.setup({}) lspconfig.gopls.setup({})
lspconfig.zls.setup({}) lspconfig.zls.setup({})
end, end,
}, },
} }

8
.config/nvim/lua/plugins/nvim-tree.lua
View File

@ -1,6 +1,6 @@
return { return {
"nvim-tree/nvim-tree.lua", "nvim-tree/nvim-tree.lua",
config = function() config = function()
require("nvim-tree").setup() require("nvim-tree").setup()
end end,
} }

24
.config/nvim/lua/plugins/zenbones.lua
View File

@ -1,14 +1,14 @@
return { return {
"zenbones-theme/zenbones.nvim", "zenbones-theme/zenbones.nvim",
-- Optionally install Lush. Allows for more configuration or extending the colorscheme -- Optionally install Lush. Allows for more configuration or extending the colorscheme
-- If you don't want to install lush, make sure to set g:zenbones_compat = 1 -- If you don't want to install lush, make sure to set g:zenbones_compat = 1
-- In Vim, compat mode is turned on as Lush only works in Neovim. -- In Vim, compat mode is turned on as Lush only works in Neovim.
dependencies = "rktjmp/lush.nvim", dependencies = "rktjmp/lush.nvim",
lazy = false, lazy = false,
priority = 1000, priority = 1000,
-- you can set set configuration options here -- you can set set configuration options here
-- config = function() -- config = function()
-- vim.g.zenbones_darken_comments = 45 -- vim.g.zenbones_darken_comments = 45
-- vim.cmd.colorscheme('zenbones') -- vim.cmd.colorscheme('zenbones')
-- end -- end
} }

2
.config/nvim/lua/vim-options.lua
View File

@ -5,6 +5,6 @@ vim.cmd("set shiftwidth=4")
vim.cmd("set smartindent") vim.cmd("set smartindent")
vim.wo.number = true vim.wo.number = true
vim.cmd.colorscheme "tokyonight" vim.cmd.colorscheme("tokyonight")
vim.opt.termguicolors = true vim.opt.termguicolors = true