tedkulp/dotfiles
1
0
Fork 0
mirror of https://github.com/tedkulp/dotfiles synced 2026-04-21 22:24:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Lots of updates

Browse Source
This commit is contained in:
Ted Kulp
2022-07-18 07:40:19 -04:00
parent 149ba67117
commit e31055bc04
11 changed files with 281 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/lvim/config.lua
+213 -73
View File
@@ -12,16 +12,17 @@ an executable
lvim.log.level = "warn"
lvim.format_on_save = true
lvim.colorscheme = "onedarker"
vim.opt.clipboard = "unnamed,unnamedplus"
-- to disable icons and use a minimalist setup, uncomment the following
-- lvim.use_icons = false
-- keymappings [view all the defaults by pressing <leader>Lk]
lvim.leader = "space"
-- add your own keymapping
lvim.keys.normal_mode["<C-s>"] = ":w<cr>"
-- unmap a default keymapping
-- lvim.keys.normal_mode["<C-Up>"] = ""
-- edit a default keymapping
-- lvim.keys.normal_mode["<C-q>"] = ":q<cr>"
-- vim.keymap.del("n", "<C-Up>")
-- override a default keymapping
-- lvim.keys.normal_mode["<C-q>"] = ":q<cr>" -- or vim.keymap.set("n", "<C-q>", ":q<cr>" )
-- Change Telescope navigation to use j and k for navigation and n and p for history in both input and normal mode.
-- we use protected-mode (pcall) just in case the plugin wasn't loaded yet.
@@ -41,21 +42,45 @@ lvim.builtin.telescope.defaults.mappings = {
},
}
lvim.builtin.telescope.on_config_done = function(telescope)
telescope.setup{
extensions = {
project = {
base_dirs = {
-- {path = '~/src', max_depth = 1},
-- {path = '~/src/tmp', max_depth = 1},
-- {path = '~/src/omuras/code', max_depth = 1},
{path = '~/src'},
{path = '~/src/tmp'},
{path = '~/src/omuras/code'},
{path = '~/org'},
},
hidden_files = true,
}
}
}
pcall(telescope.load_extension, "file-browser")
pcall(telescope.load_extension, "project")
end
-- Use which-key to add extra bindings with the leader-key prefix
-- lvim.builtin.which_key.mappings["P"] = { "<cmd>Telescope projects<CR>", "Projects" }
lvim.builtin.which_key.mappings["P"] = { "<cmd>Telescope projects<CR>", "Projects" }
-- lvim.builtin.which_key.mappings["t"] = {
-- name = "+Trouble",
-- r = { "<cmd>Trouble lsp_references<cr>", "References" },
-- f = { "<cmd>Trouble lsp_definitions<cr>", "Definitions" },
-- d = { "<cmd>Trouble lsp_document_diagnostics<cr>", "Diagnostics" },
-- d = { "<cmd>Trouble document_diagnostics<cr>", "Diagnostics" },
-- q = { "<cmd>Trouble quickfix<cr>", "QuickFix" },
-- l = { "<cmd>Trouble loclist<cr>", "LocationList" },
-- w = { "<cmd>Trouble lsp_workspace_diagnostics<cr>", "Diagnostics" },
-- w = { "<cmd>Trouble workspace_diagnostics<cr>", "Wordspace Diagnostics" },
-- }
-- TODO: User Config for predefined plugins
-- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile
lvim.builtin.dashboard.active = true
lvim.builtin.alpha.active = true
lvim.builtin.alpha.mode = "dashboard"
lvim.builtin.notify.active = true
lvim.builtin.terminal.active = true
lvim.builtin.nvimtree.setup.view.side = "left"
lvim.builtin.nvimtree.show_icons.git = 0
@@ -69,33 +94,38 @@ lvim.builtin.treesitter.ensure_installed = {
"lua",
"python",
"typescript",
"tsx",
"css",
"rust",
"java",
"yaml",
"go",
}
lvim.builtin.treesitter.ignore_install = { "haskell" }
lvim.builtin.treesitter.highlight.enabled = true
lvim.builtin.project.active = false
lvim.lsp.automatic_servers_installation = true
lvim.lsp.null_ls.setup.timeout_ms = 30000
-- generic LSP settings
-- ---@usage disable automatic installation of servers
-- lvim.lsp.automatic_servers_installation = false
-- ---@usage Select which servers should be configured manually. Requires `:LvimCacheRest` to take effect.
-- See the full default list `:lua print(vim.inspect(lvim.lsp.override))`
-- vim.list_extend(lvim.lsp.override, { "pyright" })
-- ---@usage setup a server -- see: https://www.lunarvim.org/languages/#overriding-the-default-configuration
-- ---configure a server manually. !!Requires `:LvimCacheReset` to take effect!!
-- ---see the full default list `:lua print(vim.inspect(lvim.lsp.automatic_configuration.skipped_servers))`
-- vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "pyright" })
-- local opts = {} -- check the lspconfig documentation for a list of all possible options
-- require("lvim.lsp.manager").setup("pylsp", opts)
-- require("lvim.lsp.manager").setup("pyright", opts)
-- you can set a custom on_attach function that will be used for all the language servers
-- See <https://github.com/neovim/nvim-lspconfig#keybindings-and-completion>
-- ---remove a server from the skipped list, e.g. eslint, or emmet_ls. !!Requires `:LvimCacheReset` to take effect!!
-- ---`:LvimInfo` lists which server(s) are skiipped for the current filetype
-- vim.tbl_map(function(server)
-- return server ~= "emmet_ls"
-- end, lvim.lsp.automatic_configuration.skipped_servers)
-- -- you can set a custom on_attach function that will be used for all the language servers
-- -- See <https://github.com/neovim/nvim-lspconfig#keybindings-and-completion>
-- lvim.lsp.on_attach_callback = function(client, bufnr)
-- local function buf_set_option(...)
-- vim.api.nvim_buf_set_option(bufnr, ...)
@@ -103,32 +133,18 @@ lvim.lsp.automatic_servers_installation = true
-- --Enable completion triggered by <c-x><c-o>
-- buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
-- end
-- you can overwrite the null_ls setup table (useful for setting the root_dir function)
-- lvim.lsp.null_ls.setup = {
-- root_dir = require("lspconfig").util.root_pattern("Makefile", ".git", "node_modules"),
-- }
-- or if you need something more advanced
-- lvim.lsp.null_ls.setup.root_dir = function(fname)
-- if vim.bo.filetype == "javascript" then
-- return require("lspconfig/util").root_pattern("Makefile", ".git", "node_modules")(fname)
-- or require("lspconfig/util").path.dirname(fname)
-- elseif vim.bo.filetype == "php" then
-- return require("lspconfig/util").root_pattern("Makefile", ".git", "composer.json")(fname) or vim.fn.getcwd()
-- else
-- return require("lspconfig/util").root_pattern("Makefile", ".git")(fname) or require("lspconfig/util").path.dirname(fname)
-- end
-- end
-- -- set a formatter, this will override the language server formatting capabilities (if it exists)
-- local formatters = require "lvim.lsp.null-ls.formatters"
-- formatters.setup {
-- { exe = "black", filetypes = { "python" } },
-- { exe = "isort", filetypes = { "python" } },
-- { command = "black", filetypes = { "python" } },
-- { command = "isort", filetypes = { "python" } },
-- {
-- exe = "prettier",
-- -- each formatter accepts a list of options identical to https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTINS.md#Configuration
-- command = "prettier",
-- ---@usage arguments to pass to the formatter
-- -- these cannot contain whitespaces, options such as `--line-width 80` become either `{'--line-width', '80'}` or `{'--line-width=80'}`
-- args = { "--print-with", "100" },
-- extra_args = { "--print-with", "100" },
-- ---@usage specify which filetypes to enable. By default a providers will attach to all the filetypes it supports.
-- filetypes = { "typescript", "typescriptreact" },
-- },
@@ -137,15 +153,16 @@ lvim.lsp.automatic_servers_installation = true
-- -- set additional linters
-- local linters = require "lvim.lsp.null-ls.linters"
-- linters.setup {
-- { exe = "flake8", filetypes = { "python" } },
-- { command = "flake8", filetypes = { "python" } },
-- {
-- exe = "shellcheck",
-- -- each linter accepts a list of options identical to https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTINS.md#Configuration
-- command = "shellcheck",
-- ---@usage arguments to pass to the formatter
-- -- these cannot contain whitespaces, options such as `--line-width 80` become either `{'--line-width', '80'}` or `{'--line-width=80'}`
-- args = { "--severity", "warning" },
-- extra_args = { "--severity", "warning" },
-- },
-- {
-- exe = "codespell",
-- command = "codespell",
-- ---@usage specify which filetypes to enable. By default a providers will attach to all the filetypes it supports.
-- filetypes = { "javascript", "python" },
-- },
@@ -161,11 +178,22 @@ lvim.lsp.automatic_servers_installation = true
-- }
-- Autocommands (https://neovim.io/doc/user/autocmd.html)
-- lvim.autocommands.custom_groups = {
-- { "BufWinEnter", "*.lua", "setlocal ts=8 sw=8" },
-- }
-- vim.api.nvim_create_autocmd("BufEnter", {
-- pattern = { "*.json", "*.jsonc" },
-- -- enable wrap mode for json files only
-- command = "setlocal wrap",
-- })
-- vim.api.nvim_create_autocmd("FileType", {
-- pattern = "zsh",
-- callback = function()
-- -- let treesitter use bash highlight for zsh files as well
-- require("nvim-treesitter.highlight").attach(0, "bash")
-- end,
lvim.plugins = {
{
"dracula/vim",
},
{
"tpope/vim-surround",
keys = { "c", "d", "y" },
@@ -239,40 +267,140 @@ lvim.plugins = {
"p00f/nvim-ts-rainbow",
},
{ "tpope/vim-repeat" },
{
"monaqa/dial.nvim",
event = "BufRead",
config = function()
local dial = require("dial")
vim.cmd([[
nmap <C-a> <Plug>(dial-increment)
nmap <C-x> <Plug>(dial-decrement)
vmap <C-a> <Plug>(dial-increment)
vmap <C-x> <Plug>(dial-decrement)
vmap g<C-a> <Plug>(dial-increment-additional)
vmap g<C-x> <Plug>(dial-decrement-additional)
]])
-- {
-- "monaqa/dial.nvim",
-- event = "BufRead",
-- config = function()
-- local dial = require("dial")
-- vim.cmd([[
-- nmap <C-a> <Plug>(dial-increment)
-- nmap <C-x> <Plug>(dial-decrement)
-- vmap <C-a> <Plug>(dial-increment)
-- vmap <C-x> <Plug>(dial-decrement)
-- vmap g<C-a> <Plug>(dial-increment-additional)
-- vmap g<C-x> <Plug>(dial-decrement-additional)
-- ]])
dial.augends["custom#boolean"] = dial.common.enum_cyclic({
name = "boolean",
strlist = { "true", "false" },
})
table.insert(dial.config.searchlist.normal, "custom#boolean")
-- dial.augends["custom#boolean"] = dial.common.enum_cyclic({
-- name = "boolean",
-- strlist = { "true", "false" },
-- })
-- table.insert(dial.config.searchlist.normal, "custom#boolean")
-- For Languages which prefer True/False, e.g. python.
dial.augends["custom#Boolean"] = dial.common.enum_cyclic({
name = "Boolean",
strlist = { "True", "False" },
})
table.insert(dial.config.searchlist.normal, "custom#Boolean")
end,
},
-- -- For Languages which prefer True/False, e.g. python.
-- dial.augends["custom#Boolean"] = dial.common.enum_cyclic({
-- name = "Boolean",
-- strlist = { "True", "False" },
-- })
-- table.insert(dial.config.searchlist.normal, "custom#Boolean")
-- end,
-- },
-- {
-- "mrjones2014/dash.nvim",
-- run = "make install",
-- },
{
"mrjones2014/dash.nvim",
run = "make install",
"nvim-orgmode/orgmode",
config = function()
require('orgmode').setup{
org_blank_before_new_entry = {
heading = false,
plain_list_item = false,
}
}
end,
},
-- {
-- "dhruvasagar/vim-table-mode",
-- },
{
"akinsho/org-bullets.nvim",
setup = function()
symbols = { "◉", "○", "✸", "✿" }
end
},
{
"nvim-telescope/telescope-project.nvim",
event = "BufWinEnter",
setup = function()
vim.cmd [[packadd telescope.nvim]]
end,
},
{
"nvim-telescope/telescope-file-browser.nvim",
},
{
"ray-x/lsp_signature.nvim",
event = "BufRead",
config = function()
require "lsp_signature".setup()
end
},
{
"folke/trouble.nvim",
cmd = "TroubleToggle",
},
{
"rmagatti/goto-preview",
config = function()
require('goto-preview').setup {
width = 120; -- Width of the floating window
height = 25; -- Height of the floating window
default_mappings = true; -- Bind default mappings
debug = false; -- Print debug information
opacity = nil; -- 0-100 opacity level of the floating window where 100 is fully transparent.
post_open_hook = nil;-- A function taking two arguments, a buffer and a window to be ran as a hook.
-- You can use "default_mappings = true" setup option
-- Or explicitly set keybindings
vim.cmd("nnoremap gPd <cmd>lua require('goto-preview').goto_preview_definition()<CR>");
vim.cmd("nnoremap gPi <cmd>lua require('goto-preview').goto_preview_implementation()<CR>");
vim.cmd("nnoremap gPc <cmd>lua require('goto-preview').close_all_win()<CR>");
}
end,
},
}
lvim.builtin.which_key.mappings["t"] = {
name = "Diagnostics",
t = { "<cmd>TroubleToggle<cr>", "trouble" },
w = { "<cmd>TroubleToggle workspace_diagnostics<cr>", "workspace" },
d = { "<cmd>TroubleToggle document_diagnostics<cr>", "document" },
q = { "<cmd>TroubleToggle quickfix<cr>", "quickfix" },
l = { "<cmd>TroubleToggle loclist<cr>", "loclist" },
r = { "<cmd>TroubleToggle lsp_references<cr>", "references" },
}
-- org mode
local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
parser_config.org = {
install_info = {
url = 'https://github.com/milisims/tree-sitter-org',
revision = 'f110024d539e676f25b72b7c80b0fd43c34264ef',
files = {'src/parser.c', 'src/scanner.cc'},
},
filetype = 'org',
}
require('orgmode').setup_ts_grammar()
require'nvim-treesitter.configs'.setup {
-- If TS highlights are not enabled at all, or disabled via `disable` prop, highlighting will fallback to default Vim syntax highlighting
highlight = {
enable = true,
disable = {'org'}, -- Remove this to use TS highlighter for some of the highlights (Experimental)
additional_vim_regex_highlighting = {'org'}, -- Required since TS highlighter doesn't support all syntax features (conceal)
},
ensure_installed = {'org'}, -- Or run :TSUpdate org
}
require('orgmode').setup({
org_agenda_files = {'~/org/**/*'},
org_default_notes_file = '~/org/refile.org',
})
-- javascript/typescript
local formatters = require "lvim.lsp.null-ls.formatters"
formatters.setup {
{
@@ -293,7 +421,6 @@ formatters.setup {
},
}
-- set additional linters
local linters = require "lvim.lsp.null-ls.linters"
linters.setup {
{
@@ -301,3 +428,16 @@ linters.setup {
filetypes = { "typescript", "typescriptreact", "javascript", "javascriptreact" },
},
}
lvim.builtin.which_key.mappings["P"] = { "<cmd>lua require'telescope'.extensions.project.project{ display_type = 'full' }<CR>", "Projects" }
lvim.builtin.which_key.mappings['`'] = { ":edit #<CR>", "Last Buffer" }
lvim.builtin.which_key.mappings['lP'] = { "<cmd>lua require('goto-preview').goto_preview_definition()<CR>", "Goto Preview" }
-- lvim.builtin.which_key.mappings["P"] = { "<cmd>Telescope project<CR>", "Projects" }
-- term stuff (there is probably something better)
-- vim.api.nvim_set_keymap("n", "<Leader>t", [[<cmd>vnew term://zsh | vertical resize 87 <CR>]],
-- {silent = true}) -- term over right
-- vertical terminal
-- vim.api.nvim_set_keymap("n", "<Leader>t", [[<cmd> split term://zsh | resize 28 <CR>]],
-- {silent = true}) -- term bottom