blob42
/
my-nvim-lua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stable update

Browse Source
main
spike 2 years ago
parent f0e1a9c2d8
commit b9f3bf063e
8 changed files with 120 additions and 54 deletions
Show Stats Download Patch File Download Diff File

24
after/plugin/theme.lua
Unescape Escape View File

@ -0,0 +1,24 @@
local c = require("base46.colors")
local g = vim.g
local M = {}
local colors = require("base46").get_theme_tb "base_30"
local theme = require("base46").get_theme_tb "base_16"
local ts_context_hl = c.change_hex_saturation(colors["yellow"], -20)
local ts_context_hl = c.change_hex_lightness(ts_context_hl, -55)
local highlights = {
TreesitterContext = {
bg = ts_context_hl,
},
}
function set_hl()
for hl, col in pairs(highlights) do
vim.api.nvim_set_hl(0, hl, col)
end
end
-- setup section
set_hl()

68
lua/core/mappings.lua
Unescape Escape View File

@ -541,36 +541,36 @@ M.fzf_lua = { --{{{
n = {
-- find
-- ["<C-p>"] = { "<cmd> FzfLua files <CR>", "FzfLua find files" },
["<C-p>"] = { function ()
local ignored_bufs = {
"qf",
}
for _, ignored in ipairs(ignored_bufs) do
if vim.bo.filetype == ignored then
local default_keyseq = termcodes("<C-p>")
vim.api.nvim_feedkeys(default_keyseq, 'n', false)
return
end
end
vim.cmd "FzfLua files"
end, "FzfLua find files" },
-- ["<C-p>"] = { function ()
-- local ignored_bufs = {
-- "qf",
-- }
-- for _, ignored in ipairs(ignored_bufs) do
-- if vim.bo.filetype == ignored then
-- local default_keyseq = termcodes("<C-p>")
-- vim.api.nvim_feedkeys(default_keyseq, 'n', false)
-- return
-- end
-- end
-- vim.cmd "FzfLua files"
-- end, "FzfLua find files" },
["<leader>fl"] = { "<cmd> FzfLua lines <CR>", "FzfLua grep open buffer lines" },
-- grep
["<leader>fw"] = { "<cmd> FzfLua grep_cword <CR>", "FzfLua grep cword" },
["<leader>f."] = { "<cmd> FzfLua live_grep_native <CR>", "FzfLua grep live native" },
["<leader>ff"] = { "<cmd> FzfLua grep_project <CR>", "FzfLua grep live project" },
-- ["<leader>fw"] = { "<cmd> FzfLua grep_cword <CR>", "FzfLua grep cword" },
-- ["<leader>f."] = { "<cmd> FzfLua live_grep_native <CR>", "FzfLua grep live native" },
-- ["<leader>ff"] = { "<cmd> FzfLua grep_project <CR>", "FzfLua grep live project" },
["<leader>f*"] = { "<cmd> FzfLua live_grep_glob <CR>", "FzfLua grep with glob (SPACE-- globs)" },
-- continue
["<leader>fr"] = { "<cmd> FzfLua resume <CR>", "FzfLua resume last search" },
-- ["<leader>fr"] = { "<cmd> FzfLua resume <CR>", "FzfLua resume last search" },
-- ["<leader>;"] = { "<cmd> FzfLua buffers <CR>", "FzfLua find buffers" },
-- ["<leader>fb"] = { "<cmd> FzfLua builtin <CR>", "FzfLua builtins" },
-- ["<leader>fh"] = { "<cmd> FzfLua help_tags <CR>", "FzfLua find help pages" },
-- ["<leader>fm"] = { "<cmd> FzfLua marks <CR>", "FzfLua marks" },
["<leader>fo"] = { "<cmd> FzfLua oldfiles <CR>", "FzfLua find oldfiles" },
-- ["<leader>fo"] = { "<cmd> FzfLua oldfiles <CR>", "FzfLua find oldfiles" },
-- ["<leader>tk"] = { "<cmd> FzfLua keymaps <CR>", "FzfLua show keymaps" },
}
@ -584,21 +584,37 @@ M.telescope = { --{{{
-- ["<leader>ff"] = { "<cmd> Telescope find_files <CR>", "find files" },
-- ["<C-p>"] = { "<cmd> Telescope find_files <CR>", "find files" },
--
-- ["<leader>fa"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "find all" },
-- ["<leader>f*"] = { "<cmd> Telescope live_grep <CR>", "live grep" },
["<leader>;"] = { "<cmd> Telescope buffers <CR>", "Telescope find buffers" },
["<leader>fb"] = { "<cmd> Telescope builtin <CR>", "Telescope builtins" },
["<leader>fB"] = { "<cmd> Telescope vim_bookmarks <CR>", "Telescope bookmarks" },
["<leader>fa"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "find all" },
["<C-p>"] = { function ()
local ignored_bufs = {
"qf",
}
for _, ignored in ipairs(ignored_bufs) do
if vim.bo.filetype == ignored then
local default_keyseq = termcodes("<C-p>")
vim.api.nvim_feedkeys(default_keyseq, 'n', false)
return
end
end
vim.cmd "Telescope find_files"
end, "FzfLua find files" },
["<leader>f."] = { "<cmd> Telescope live_grep <CR>", "telescope live grep" },
["<leader>fw"] = { "<cmd> Telescope grep_string <CR>", "telescope grep cword" },
["<leader>;"] = { "<cmd> Telescope buffers <CR>", "telescope find buffers" },
["<leader>fb"] = { "<cmd> Telescope builtin <CR>", "telescope builtins" },
["<leader>fB"] = { "<cmd> Telescope vim_bookmarks <CR>", "telescope bookmarks" },
["<leader>fh"] = { "<cmd> Telescope help_tags <CR>", "help page" },
-- ["<leader>fo"] = { "<cmd> Telescope oldfiles <CR>", "find oldfiles" },
["<leader>fo"] = { "<cmd> Telescope oldfiles <CR>", "telescope find oldfiles" },
["<leader>fm"] = { "<cmd> Telescope marks <CR>", "Telescope marks" },
["<leader>fM"] = { "<cmd> Telescope man_pages <CR>", "Telescope marks" },
["<leader>tk"] = { "<cmd> Telescope keymaps <CR>", "Telescope show keys" },
["<leader>fr"] = { "<cmd> Telescope resume <CR>", "telescope resume last search" },
-- git
["<leader>fg"] = { " ", "telescope git commands" },
["<leader>fgc"] = { "<cmd> Telescope git_commits <CR>", "git commits" },
["<leader>fgs"] = { "<cmd> Telescope git_status <CR>", "git status" },
["<leader>fgc"] = { "<cmd> Telescope git_commits <CR>", "teles git commits" },
["<leader>fgs"] = { "<cmd> Telescope git_status <CR>", "teles git status" },
["<leader>fgf"] = { "<cmd> Telescope git_files <CR>", "teles git files" },
-- pick a hidden term
-- ["<leader>pt"] = { "<cmd> Telescope terms <CR>", "pick hidden term" },

7
lua/custom/chadrc.lua
Unescape Escape View File

@ -4,6 +4,9 @@ local M = {}
-- make sure you maintain the structure of `core/default_config.lua` here,
-- example of changing theme:
--
-- local custom_theme = require("sp4ke.theme")
-- vim.tbl_deep_extend("force", M.ui.hl_add, custom_theme)
M.ui = {
theme = "monekai",
@ -14,7 +17,7 @@ M.ui = {
italic = true,
},
St_LspWarning = {
fg = "yello"
fg = "yellow"
},
DiagnosticHint = {
fg = "purple",
@ -32,7 +35,7 @@ M.ui = {
},
hl_add = {
Visual = {
bg = "yellow",
bg = "blue",
fg = "black",
},
BookmarkSign = {

20
lua/custom/plugins/configs/gonvim.lua
Unescape Escape View File

@ -0,0 +1,20 @@
local M = {}
local config = {
-- verbose = true,
run_in_floaterm = true,
icons = false,
-- icons = { breakpoint = "🧘", currentpos = "🏃" }, -- set to false to disable
lsp_cfg = false, -- handled handled instead by navigator
lsp_keymaps = false, -- use navigator
-- lsp_diag_signs = false,
lsp_codelens = false, -- use navigator
textobjects = true,
dap_debug_keymap = false,
}
function M.setup()
require("go").setup(config)
end
return M

21
lua/custom/plugins/configs/navigator.lua
Unescape Escape View File

@ -10,7 +10,7 @@ local config = {
debug = false,
transparency = 5,
lsp_signature_help = false, -- needs plugin lsp_signature
default_mapping = true,
default_mapping = false,
keymaps = {
{ key = 'gr', func = require('navigator.reference').async_ref, desc = 'lsp async_ref' },
{ key = '<Leader>gr', func = require('navigator.reference').reference, desc = 'lsp reference' }, -- reference deprecated
@ -31,9 +31,9 @@ local config = {
{ key = '<Leader>gT', func = require('navigator.treesitter').bufs_ts, desc = 'lsp bufs_ts' },
{ key = '<Leader>ct', func = require('navigator.ctags').ctags, desc = 'lsp ctags' },
{ key = 'K', func = vim.lsp.buf.hover, desc = 'lsp hover' },
{ key = '<Space>ca', mode = 'n', func = require('navigator.codeAction').code_action, desc = 'lsp code_action' },
{ key = '<C-a>', mode = 'n', func = require('navigator.codeAction').code_action, desc = 'lsp code_action' },
{
key = '<Space>ca',
key = '<C-a>',
mode = 'v',
func = require('navigator.codeAction').range_code_action,
desc = 'lsp range_code_action',
@ -63,13 +63,14 @@ local config = {
desc = 'lsp lsp remove_workspace_folder',
},
{ key = '<Space>ff', func = vim.lsp.buf.format, mode = 'n', desc = 'lsp format' },
{ key = '<Space>ff', func = vim.lsp.buf.range_formatting, mode = 'v', desc = 'lsp range format' },
{
key = '<Space>gm',
func = require('navigator.formatting').range_format,
mode = 'n',
desc = 'lsp range format operator e.g gmip',
},
-- { key = '<Space>ff', func = vim.lsp.buf.range_formatting, mode = 'v', desc = 'lsp range format' },
-- DEPRECATED
-- {
-- key = '<Space>gm',
-- func = require('navigator.formatting').range_format,
-- mode = 'n',
-- desc = 'lsp range format operator e.g gmip',
-- },
{ key = '<Space>wl', func = require('navigator.workspace').list_workspace_folders, desc = 'lsp list_workspace_folders' },
{ key = '<Space>la', mode = 'n', func = require('navigator.codelens').run_action, desc = 'lsp run code lens action' },
},

22
lua/custom/plugins/init.lua
Unescape Escape View File

@ -121,7 +121,8 @@ return {
},
["nvim-telescope/telescope.nvim"] = {
lock = true,
-- lock = true,
tag = "*",
disable = false,
},
["tom-anders/telescope-vim-bookmarks.nvim"] = {
@ -136,6 +137,12 @@ return {
require("telescope").load_extension("vim_bookmarks")
end
},
["nvim-telescope/telescope-fzf-native.nvim"] = {
opt = true,
module = "telescope",
after = {"telescope.nvim"},
run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build',
},
["ibhagwan/fzf-lua"] = {
lock = true,
after = "ui",
@ -377,18 +384,7 @@ return {
ft = {"go"},
opt = true,
config = function()
require("go").setup({
run_in_floaterm = true,
icons = false,
-- icons = { breakpoint = "🧘", currentpos = "🏃" }, -- set to false to disable
lsp_cfg = false, -- handled by navigator
-- lsp_keymaps = false, -- use navigator
-- lsp_diag_signs = false,
lsp_codelens = false, -- use navigator
textobjects = true,
dap_debug_keymap = false,
})
require("custom.plugins.configs.gonvim").setup()
end
}
}

6
lua/plugins/configs/telescope.lua
Unescape Escape View File

@ -35,8 +35,8 @@ local options = {
vertical = {
mirror = false,
},
width = 0.87,
height = 0.80,
width = 0.99,
height = 0.99,
preview_cutoff = 120,
},
file_sorter = require("telescope.sorters").get_fuzzy_file,
@ -58,7 +58,7 @@ local options = {
},
},
extensions_list = { "themes", "terms" },
extensions_list = { "themes", "terms", "fzf" },
}
-- check for any override

6
lua/sp4ke/utils.lua
Unescape Escape View File

@ -19,4 +19,10 @@ M.list_loaded_modules = function ()
end
M.reload_theme = function()
require("plenary.reload").reload_module("base46")
require("plenary.reload").reload_module("custom.chadrc")
require("base46").load_theme()
end
return M

Write Preview
Loading…
Cancel
Save