ringofstorms/nvim
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

formatting

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2023-07-05 10:06:18 -05:00
parent 3c84ec54bf
commit 452abf2029
25 changed files with 635 additions and 536 deletions
Download patch file Download diff file Expand all files Collapse all files

15
init.lua
View file

@ -1,5 +1,5 @@
require "options"
require "keymaps"
require("options")
require("keymaps")
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not vim.loop.fs_stat(lazypath) then
@ -11,7 +11,7 @@ if not vim.loop.fs_stat(lazypath) then
"--branch=stable", -- latest stable release
lazypath,
})
if vim.api.nvim_get_vvar "shell_error" ~= 0 then
if vim.api.nvim_get_vvar("shell_error") ~= 0 then
vim.api.nvim_err_writeln("Error cloning lazy.nvim repository...\n\n" .. output)
end
end
@ -20,10 +20,9 @@ vim.opt.rtp:prepend(lazypath)
require("lazy").setup("plugins", {
change_detection = {
enabled = false,
}
},
})
vim.cmd 'colorscheme material'
require "tools"
require "autocommands"
vim.cmd("colorscheme material")
require("tools")
require("autocommands")

16
lua/autocommands.lua
View file

@ -1,5 +1,7 @@
function isEmpty()
return vim.api.nvim_buf_get_name(0) == "" or vim.fn.filereadable(vim.api.nvim_buf_get_name(0)) == 0 or vim.fn.line('$') == 1 and vim.fn.col('$') == 1
return vim.api.nvim_buf_get_name(0) == ""
or vim.fn.filereadable(vim.api.nvim_buf_get_name(0)) == 0
or vim.fn.line("$") == 1 and vim.fn.col("$") == 1
end
--vim.api.nvim_create_autocmd({ "VimEnter" }, {
@ -10,19 +12,19 @@ end
-- end
--})
vim.api.nvim_create_autocmd('BufRead', {
vim.api.nvim_create_autocmd("BufRead", {
pattern = ".env*",
command = "set filetype=sh"
command = "set filetype=sh",
})
vim.api.nvim_create_autocmd('BufRead', {
vim.api.nvim_create_autocmd("BufRead", {
pattern = ".*rc",
command = "set filetype=sh"
command = "set filetype=sh",
})
vim.api.nvim_create_autocmd('BufRead', {
vim.api.nvim_create_autocmd("BufRead", {
pattern = "Dockerfile.*",
command = "set filetype=dockerfile"
command = "set filetype=dockerfile",
})
vim.api.nvim_create_autocmd("BufRead", {

35
lua/keymaps.lua
View file

@ -11,15 +11,17 @@ vim.g.maplocalleader = " "
-- term_mode = "t",
-- command_mode = "c",
require('util').keymaps({
require("util").keymaps({
n = {
[";"] = { ":", desc = "No shift command mode" },
["n"] = { "nzzzv", desc = "Next search result centered" },
["N"] = { "Nzzzv", desc = "Previous search result centered" },
["<esc>"] = { ":noh<CR><esc>", desc = "Clear search on escape" },
["<return>"] = {":noh<CR><return>", desc = "Clear search on return" },
["<return>"] = { ":noh<CR><return>", desc = "Clear search on return" },
["<leader>a"] = { "ggVG", desc = "Select all" },
["<leader>w"] = { "<cmd>w<cr>", desc = "Save" },
["<leader>q"] = { "<cmd>confirm q<cr>", desc = "Quit" },
["<leader>cq"] = { "<cmd>bd<cr>", desc = "Close current buffer" },
["|"] = { "<cmd>vsplit<cr>", desc = "Vertical Split" },
["\\"] = { "<cmd>split<cr>", desc = "Horizontal Split" },
["<C-d>"] = { "<C-d>zz", desc = "Vertical half page down and center cursor" },
@ -34,16 +36,31 @@ require('util').keymaps({
["<C-k>"] = { "<C-w>k", desc = "Move window above current" },
["<C-l>"] = { "<C-w>l", desc = "Move window right current" },
-- reformat LSP
["<leader>lf"] = { function() vim.lsp.buf.format() end, desc = "Reformat file" },
["<leader>ld"] = { function() vim.diagnostic.open_float() end, desc = "Show diagnostic message"},
["<leader>ll"] = { function() vim.diagnostic.setloclist() end, desc = "Show diagnostic list"},
["<leader>lf"] = {
function()
vim.lsp.buf.format()
end,
desc = "Reformat file",
},
["<leader>ld"] = {
function()
vim.diagnostic.open_float()
end,
desc = "Show diagnostic message",
},
["<leader>ll"] = {
function()
vim.diagnostic.setloclist()
end,
desc = "Show diagnostic list",
},
["<leader>lz"] = { ":LspRestart<CR>", desc = "Restart LSP Server" },
},
v = {
["y"] = { '"*y', desc = "Copy to system clipboard" },
["p"] = { '"*p', desc = "Paste from system clipboard" },
["J"] = { ":m '>+1<CR>gv=gv", desc = "Visually move block down"},
["K"] = { ":m '<-2<CR>gv=gv", desc = "Visually move block up"},
["J"] = { ":m '>+1<CR>gv=gv", desc = "Visually move block down" },
["K"] = { ":m '<-2<CR>gv=gv", desc = "Visually move block up" },
},
i = {
["<C-k>"] = { "<Up>", desc = "Up" },
@ -63,11 +80,9 @@ require('util').keymaps({
},
x = {
["<leader>p"] = { '"_dP', desc = "Paste w/o copying replaced content" },
["<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" },
},
t = {
["<Esc>"] = { "<C-\\><C-n>", desc = "Escape the terminal" },
},
})

6
lua/options.lua
View file

@ -43,6 +43,6 @@ vim.opt.splitright = true
-- Set completeopt to have a better completion experience
vim.o.completeopt = "menuone,noselect"
vim.diagnostic.config{
float={border="single"}
}
vim.diagnostic.config({
float = { border = "single" },
})

2
lua/plugins/README.md
View file

@ -1,4 +1,5 @@
# Plugins to look into
- https://github.com/lvimuser/lsp-inlayhints.nvim/tree/anticonceal
- https://github.com/theHamsta/nvim-dap-virtual-text/tree/inline-text
- https://github.com/andythigpen/nvim-coverage
@ -21,4 +22,3 @@
- https://github.com/numToStr/Comment.nvim
- https://github.com/windwp/nvim-autopairs
- https://github.com/lukas-reineke/indent-blankline.nvim

15
lua/plugins/auto-save.lua
View file

@ -3,13 +3,16 @@ return {
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
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
}
end,
},
}

2
lua/plugins/colorpicker_ccc.lua
View file

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

9
lua/plugins/comments.lua
View file

@ -1,10 +1,15 @@
vim.g.NERDCreateDefaultMappings = 0
vim.cmd('filetype plugin on')
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" },
{
"<leader>/",
':call nerdcommenter#Comment(0, "toggle")<CR>',
desc = "Toggle comments on selection",
mode = "v",
},
},
}

10
lua/plugins/http_rest.lua
View file

@ -3,6 +3,12 @@ return {
event = "BufEnter *.http",
requires = { "nvim-lua/plenary.nvim" },
keys = {
{ "<leader>r", function() require("rest-nvim").run() end, desc = "Send selected http request" }
}
{
"<leader>r",
function()
require("rest-nvim").run()
end,
desc = "Send selected http request",
},
},
}

4
lua/plugins/markdown_glow.lua
View file

@ -6,7 +6,7 @@ return {
},
cmd = "Glow",
keys = {
{ "<leader>m","<Nop>", desc = " Markdown" },
{ "<leader>mp",":Glow <CR>", desc = "Markdown preview" },
{ "<leader>m", "<Nop>", desc = " Markdown" },
{ "<leader>mp", ":Glow <CR>", desc = "Markdown preview" },
},
}

19
lua/plugins/neo-tree.lua
View file

@ -2,9 +2,11 @@ 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,
init = function()
vim.g.neo_tree_remove_legacy_commands = true
end,
pin = true,
tag = '2.56',
tag = "2.56",
opts = {
auto_clean_after_session_restore = true,
close_if_last_window = true,
@ -30,13 +32,16 @@ return {
},
keys = {
{ "<leader>e", "<cmd>Neotree toggle<CR>", desc = "Toggle Explorer" },
{ "<leader>o",function()
{
"<leader>o",
function()
if vim.bo.filetype == "neo-tree" then
vim.cmd.wincmd "p"
vim.cmd.wincmd("p")
else
vim.cmd.Neotree "focus"
vim.cmd.Neotree("focus")
end
end , desc = "Toggle Explorer Focus" },
end,
desc = "Toggle Explorer Focus",
},
},
}

7
lua/plugins/null-ls.lua
View file

@ -19,7 +19,6 @@ return {
"jose-elias-alvarez/null-ls.nvim",
after = { "williamboman/mason.nvim" },
opts = function(_, config)
-- config variable is the default definitions table for the setup function call
local null_ls = require("null-ls")
@ -54,7 +53,7 @@ return {
{
"jay-babu/mason-null-ls.nvim",
opts = {
ensure_installed = { "rustfmt", "stylelua", "prettier", "black" }
}
}
ensure_installed = { "rustfmt", "stylelua", "prettier", "black" },
},
},
}

2
lua/plugins/open-github.lua
View file

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

56
lua/plugins/telescope.lua
View file

@ -1,19 +1,55 @@
return {
"nvim-telescope/telescope.nvim",
tag = '0.1.1',
tag = "0.1.1",
dependencies = {
{ "nvim-lua/plenary.nvim" },
{ "nvim-telescope/telescope-fzf-native.nvim", enabled = vim.fn.executable "make" == 1, build = "make" },
{ "nvim-telescope/telescope-fzf-native.nvim", enabled = vim.fn.executable("make") == 1, build = "make" },
},
cmd = "Telescope",
keys = {
{ "<leader>f", "<Nop>", desc = "Find ..." },
{ "<leader>ff", function() require('telescope.builtin').find_files() end, desc = "Find Files" },
{ "<leader>fg", function() require('telescope.builtin').git_files() end, desc = "Find Git only Files" },
{ "<leader>fw", function() require('telescope.builtin').live_grep() end, desc = "Find Words" },
{ "<leader>fc", function() require('telescope.builtin').commands() end, desc = "Find Commands" },
{ "<leader>fk", function() require('telescope.builtin').keymaps() end, desc = "Find Commands" },
{ "<leader>fb", function() require('telescope.builtin').buffers() end, desc = "Find Commands" },
{
"<leader>ff",
function()
require("telescope.builtin").find_files()
end,
desc = "Find Files",
},
{
"<leader>fg",
function()
require("telescope.builtin").git_files()
end,
desc = "Find Git only Files",
},
{
"<leader>fw",
function()
require("telescope.builtin").live_grep()
end,
desc = "Find Words",
},
{
"<leader>fc",
function()
require("telescope.builtin").commands()
end,
desc = "Find Commands",
},
{
"<leader>fk",
function()
require("telescope.builtin").keymaps()
end,
desc = "Find Commands",
},
{
"<leader>fb",
function()
require("telescope.builtin").buffers()
end,
desc = "Find Commands",
},
},
opts = {
defaults = {
@ -26,7 +62,7 @@ return {
"--line-number",
"--column",
"--smart-case",
}
}
},
},
},
}

10
lua/plugins/theme_material.lua
View file

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

1
lua/plugins/undotree.lua
View file

@ -5,4 +5,3 @@ return {
{ "<leader>u", vim.cmd.UndotreeToggle, desc = "Undo Tree Toggle" },
},
}

1
lua/plugins/util_plenary.lua
View file

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

6
lua/plugins_disabled/cmp.lua
View file

@ -35,11 +35,9 @@ return {
{ "hrsh7th/cmp-nvim-lsp" },
},
config = function()
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic message" })
vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { desc = "Go to next diagnostic message" })
local cmp = require("cmp")
local snip_status_ok, luasnip = pcall(require, "luasnip")
local lspkind_status_ok, lspkind = pcall(require, "lspkind")
@ -133,6 +131,6 @@ return {
},
{
"folke/neodev.nvim",
opts = {}
}
opts = {},
},
}

29
lua/plugins_disabled/lsp-zero.lua
View file

@ -61,7 +61,6 @@ return {
local config = require("lspconfig")
local util = require("lspconfig/util")
local capabilities = require("cmp_nvim_lsp").default_capabilities()
capabilities = vim.tbl_deep_extend("keep", capabilities, vim.lsp.protocol.make_client_capabilities())
capabilities.textDocument.completion.completionItem = {
@ -89,7 +88,9 @@ return {
lsp.default_keymaps({ buffer = bufnr })
local opts = { buffer = bufnr }
local bind = function(map, cmd, mode) vim.keymap.set('n', map, cmd, opts) end
local bind = function(map, cmd, mode)
vim.keymap.set("n", map, cmd, opts)
end
-- diagnostics
bind("<leader>ld", "<cmd>lua vim.diagnostic.open_float()<CR>")
@ -122,27 +123,27 @@ return {
}
lsp.ensure_installed(servers)
local default = require('util').spread {
local default = require("util").spread({
on_attach = on_attach,
capabilities = capabilities,
}
})
config.lua_ls.setup(lsp.nvim_lua_ls())
config.rust_analyzer.setup(default {})
config.rust_analyzer.setup(default({}))
config.tsserver.setup(default {
config.tsserver.setup(default({
root_dir = util.root_pattern("tsconfig.json", ".git"),
})
config.html.setup(default {})
config.eslint.setup(default {})
config.cssls.setup(default {})
config.cssmodules_ls.setup(default {})
}))
config.html.setup(default({}))
config.eslint.setup(default({}))
config.cssls.setup(default({}))
config.cssmodules_ls.setup(default({}))
config.pyright.setup(default {})
config.pyright.setup(default({}))
config.dockerls.setup(default {})
config.docker_compose_language_service.setup(default {})
config.dockerls.setup(default({}))
config.docker_compose_language_service.setup(default({}))
lsp.setup()

2
lua/plugins_disabled/tabstops_sleuth.lua
View file

@ -1,3 +1,3 @@
return {
'tpope/vim-sleuth',
"tpope/vim-sleuth",
}

5
lua/tools/init.lua
View file

@ -1,8 +1,7 @@
-- Autoload all files in this tools dir, minus this init again
for _, file in ipairs(vim.fn.readdir(vim.fn.stdpath('config')..'/lua/tools', [[v:val =~ '\.lua$']])) do
for _, file in ipairs(vim.fn.readdir(vim.fn.stdpath("config") .. "/lua/tools", [[v:val =~ '\.lua$']])) do
if file ~= "init.lua" then
local tool = string.sub(file, 0, -5)
require('tools.' .. tool)
require("tools." .. tool)
end
end

66
lua/tools/scratch-files.lua
View file

@ -1,37 +1,71 @@
-- Scratch files
local scratch = function(extension)
os.execute "mkdir -p ~/dev/scratches/"
local date = os.date "%Y-%m-%dT%H:%M:%S"
os.execute("mkdir -p ~/dev/scratches/")
local date = os.date("%Y-%m-%dT%H:%M:%S")
local filepath = "~/dev/scratches/scratch_" .. date .. extension
vim.cmd("execute 'edit " .. filepath .. "'")
end
require('util').keymaps({
require("util").keymaps({
n = {
["<leader>fsw"] = {
function()
require("telescope.builtin").live_grep {
require("telescope.builtin").live_grep({
search_dirs = { "~/dev/scratches/" },
}
})
end,
desc = "Find Words in Scratches",
},
["<leader>fsf"] = {
function()
require("telescope.builtin").find_files{
require("telescope.builtin").find_files({
search_dirs = { "~/dev/scratches/" },
}
})
end,
desc = "Find Scratches",
},
["<leader>s"] = { "<Nop>", desc = "Scratch File" },
["<leader>ss"] = { function() scratch ".txt" end, desc = "New text scratch file" },
["<leader>sn"] = { function() scratch ".json" end, desc = "New json scratch file" },
["<leader>sm"] = { function() scratch ".md" end, desc = "New markdown scratch file" },
["<leader>sq"] = { function() scratch ".sql" end, desc = "New sql scratch file" },
["<leader>st"] = { function() scratch ".ts" end, desc = "New ts scratch file" },
["<leader>sb"] = { function() scratch ".sh" end, desc = "New shell scratch file" },
["<leader>sj"] = { function() scratch ".js" end, desc = "New js scratch file" },
}
["<leader>ss"] = {
function()
scratch(".txt")
end,
desc = "New text scratch file",
},
["<leader>sn"] = {
function()
scratch(".json")
end,
desc = "New json scratch file",
},
["<leader>sm"] = {
function()
scratch(".md")
end,
desc = "New markdown scratch file",
},
["<leader>sq"] = {
function()
scratch(".sql")
end,
desc = "New sql scratch file",
},
["<leader>st"] = {
function()
scratch(".ts")
end,
desc = "New ts scratch file",
},
["<leader>sb"] = {
function()
scratch(".sh")
end,
desc = "New shell scratch file",
},
["<leader>sj"] = {
function()
scratch(".js")
end,
desc = "New js scratch file",
},
},
})

3
lua/util.lua
View file

@ -1,4 +1,4 @@
local M = {};
local M = {}
function M.keymaps(mappings)
for mode, maps in pairs(mappings) do
@ -35,4 +35,3 @@ function M.spread(template)
end
return M