commit 8ef21b881e189113da94c8d14f2955c1dd7fbb73
parent dc720c1c8da97af54622ec6b0064f326170a5dda
Author: AndrewLockVI <andrew@laack.co>
Date: Tue, 25 Feb 2025 23:54:29 -0600
Updated quite a few bindings
Diffstat:
3 files changed, 127 insertions(+), 58 deletions(-)
diff --git a/lazy-lock.json b/lazy-lock.json
@@ -0,0 +1,3 @@
+{
+ "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }
+}
diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua
@@ -1,5 +1,6 @@
vim.opt.spelllang = { "en_us" }
+
-- General config
vim.opt.conceallevel = 0
vim.opt.number = true
@@ -16,21 +17,33 @@ vim.keymap.set("n", "<C-u>", "<C-u>zz", {desc = "Center cursor after moving down
-- Telescope (<leader>f)
local builtin = require("telescope.builtin")
-vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Telescope find files" })
-vim.keymap.set("n", "<leader>ft", builtin.live_grep, { desc = "Telescope live grep" })
-vim.keymap.set("n", "<leader>fb", builtin.buffers, { desc = "Telescope buffers" })
-vim.keymap.set("n", "<leader>fm", builtin.marks, { desc = "Telescope marks" })
-vim.keymap.set("n", "<leader>fk", builtin.keymaps, { desc = "Telescope keymaps" })
-vim.keymap.set("n", "<leader>fd", require('telescope').extensions.zoxide.list, { desc = "Telescope directories" })
+-- vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Find File" })
+-- vim.keymap.set("n", "<leader>ft", builtin.live_grep, { desc = "Grep Files" })
+-- vim.keymap.set("n", "<leader>fb", builtin.buffers, { desc = "Buffers" })
+-- vim.keymap.set("n", "<leader>fm", builtin.marks, { desc = "Marks" })
+-- vim.keymap.set("n", "<leader>fk", builtin.keymaps, { desc = "Keymaps" })
+-- vim.keymap.set("n", "<leader>fc", require('telescope').extensions.zoxide.list, { desc = "Dir" })
+
+-- saucy bindings
+vim.keymap.set('n', '<C-f>', builtin.find_files, { desc = "Find File" })
+vim.keymap.set("n", "<C-k>", builtin.keymaps, { desc = "Keymaps" })
+vim.keymap.set("n", "<C-b>", builtin.buffers, { desc = "Buffers" })
+vim.keymap.set("n", "<C-l>", builtin.live_grep, { desc = "Live Grep" })
+
+-- vim.keymap.set("n", "<C-a>", ':lua require("harpoon.mark").add_file()<CR>', { silent = true, desc = "Add File To Harpoon" })
+-- vim.keymap.set("n", "<C-h>", ':lua require("harpoon.ui").toggle_quick_menu()<CR>', { silent = true, desc = "View files" })
+
+-- vim.keymap.set("n", "<C-p>", builtin.marks, { desc = "Points" })
+
-- Open terminal
-vim.api.nvim_set_keymap(
- "n",
- "<leader>t",
- ":let $VIM_DIR=expand('%:p:h')<CR>:terminal<CR>cd $VIM_DIR<CR>",
- { silent = true }
-)
+--vim.api.nvim_set_keymap(
+-- "n",
+-- "<leader>t",
+-- ":let $VIM_DIR=expand('%:p:h')<CR>:terminal<CR>cd $VIM_DIR<CR>",
+-- { silent = true }
+--)
vim.cmd("autocmd TermOpen * startinsert")
-- Exit out of terminal mode
@@ -60,6 +73,7 @@ vim.opt.swapfile = false
vim.keymap.set("n", "<leader>b<Right>", ":bn<CR>", { noremap = true, silent = true }) -- b + Right Arrow for next buffer
vim.keymap.set("n", "<leader>b<Left>", ":bp<CR>", { noremap = true, silent = true }) -- b + Left Arrow for previous buffer
+vim.keymap.set("n", "<leader>bx", ":bwipeout<CR>", { noremap = true, silent = true }) -- b + Left Arrow for previous buffer
-- close all buffers except current
vim.keymap.set("n", "<leader>bc", ":%bd|e#<CR>", { noremap = true, silent = true })
@@ -78,24 +92,27 @@ smap <silent><expr> <C-p> luasnip#jumpable(-1) ? '<Plug>luasnip-jump-prev' : '<S
]]
-- pounce config
--- vim.keymap.set("n", "s", ":Pounce <CR>", { noremap = true, silent = true }) -- b + Left Arrow for previous buffer
+vim.keymap.set("n", "s", ":Pounce <CR>", { noremap = true, silent = true })
+vim.keymap.set("x", "s", function() require'pounce'.pounce { } end)
+-- vim.keymap.set("o", "s", function() require'pounce'.pounce { } end)
--- Fix highlight colors
+-- Fix highlight colors
+
-- Set custom highlight groups
--- Set custom highlight groups for Pounce
--- local highlights = {
--- PounceGap = { bold = true, fg = "#cdd6f4", bg = "#45475a" }, -- this is the space intra line selections
--- PounceAcceptBest = { bold = true, fg = "#000000", bg = "#89dceb" }, -- standard selection cap letter
--- PounceAccept = { bold = true, fg = "#000000", bg = "#7287fd" }, -- standard selection cap letter
--- PounceMatch = { bold = true, fg = "#cdd6f4", bg = "#585b70" }, -- matching text
--- }
+ local highlights = {
+ PounceGap = { bold = true, fg = "#ffffff", bg = "#2e2a3b" }, -- soft light gray text on a deep purple background
+ PounceAcceptBest = { bold = true, fg = "#ffffff", bg = "#ff6f61" }, -- vibrant coral red for best match selection
+ PounceAccept = { bold = true, fg = "#ffffff", bg = "#ffcc00" }, -- bright yellow-orange for standard selection
+ PounceMatch = { bold = true, fg = "#ffffff", bg = "#4b6a8f" }, -- light gray text on a vibrant blue-gray background
+
+ }
--- for group, opts in pairs(highlights) do
--- vim.api.nvim_set_hl(0, group, opts)
--- end
+for group, opts in pairs(highlights) do
+ vim.api.nvim_set_hl(0, group, opts)
+end
-- Map C-Right to w
vim.api.nvim_set_keymap('n', '<C-Right>', 'w', { noremap = true, silent = true })
@@ -147,5 +164,38 @@ vim.api.nvim_set_keymap('n', '<C-w>x', ':close<CR>', { noremap = true, silent =
vim.o.shortmess = vim.o.shortmess .. "I"
+vim.keymap.set({"n", "v"}, "<leader>d", "\"_d")
+vim.api.nvim_set_keymap('i', '<C-e>', '<Esc>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('x', '<C-e>', '<Esc>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('o', '<C-e>', '<Esc>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('c', '<C-e>', '<Esc>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<C-e>', '<Esc>', { noremap = true, silent = true })
+
+vim.api.nvim_set_keymap('n', 'b', ':bnext<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', 'B', ':bprevious<CR>', { noremap = true, silent = true })
+
+-- vim.api.nvim_set_keymap("n", "B", ":lua require('bufjump').backward()<cr>", opts)
+-- vim.api.nvim_set_keymap("n", "b", ":lua require('bufjump').forward()<cr>", opts)
+
+
+vim.cmd [[
+
+ highlight markdownH1Delimiter ctermfg=cyan guifg=#00FFFF
+ highlight markdownH2Delimiter ctermfg=green guifg=#00FF00
+ highlight markdownH3Delimiter ctermfg=yellow guifg=#FFFF00
+ highlight markdownH4Delimiter ctermfg=red guifg=#FF0000
+ highlight markdownH5Delimiter ctermfg=magenta guifg=#FF00FF
+ highlight markdownH6Delimiter ctermfg=white guifg=#FFAAFF
+ highlight markdownH1 ctermfg=cyan guifg=#00FFFF
+ highlight markdownH2 ctermfg=green guifg=#00FF00
+ highlight markdownH3 ctermfg=yellow guifg=#FFFF00
+ highlight markdownH4 ctermfg=red guifg=#FF0000
+ highlight markdownH5 ctermfg=magenta guifg=#FF00FF
+ highlight markdownH6 ctermfg=white guifg=#FFAAFF
+
+ highlight markdownUrl ctermfg=blue guifg=#00aaFF
+ highlight markdownItalic ctermbg=black guibg=#000000
+ highlight markdownLinkText ctermfg=magenta guifg=#FF00FF gui=underline
+]]
diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua
@@ -36,6 +36,21 @@ require("luasnip").config.set_config({ -- Setting LuaSnip config
-- vim.g.vimtex_view_method = 'general'
-- vim.g.vimtex_view_general_viewer = 'zathura '
+
+-- use({
+-- "kwkarlwang/bufjump.nvim",
+-- config = function()
+-- require("bufjump").setup({
+-- forward_key = "b",
+-- backward_key = "B",
+-- on_success = nil
+-- })
+-- end,
+-- })
+
+
+
+
-- autopairs of {[()]}
use("windwp/nvim-autopairs")
local npairs = require("nvim-autopairs")
@@ -67,34 +82,15 @@ require("luasnip").config.set_config({ -- Setting LuaSnip config
})
- use('jvgrootveld/telescope-zoxide')
-
- local z_utils = require("telescope._extensions.zoxide.utils")
- require('telescope').setup{
- -- (other Telescope configuration...)
- extensions = {
- zoxide = {
- prompt_title = "[ zoxide ]",
- mappings = {
- --default = {
- -- after_action = function(selection)
- -- print("Update to (" .. selection.z_score .. ") " .. selection.path)
- -- end
- --},
- --["<C-s>"] = {
- -- before_action = function(selection) print("before C-s") end,
- -- action = function(selection)
- -- vim.cmd.edit(selection.path)
- -- end
- --},
- --["<C-q>"] = { action = z_utils.create_basic_command("split") },
- },
- }
- }
+ require('telescope').setup {
+ defaults = {
+ mappings = {
+ n = { ["<C-e>"] = require('telescope.actions').close },
+ i = { ["<C-e>"] = require('telescope.actions').close },
+ },
+ },
}
- require("telescope").load_extension('zoxide')
-
-- needed for icons for telescope
-- use("nvim-tree/nvim-web-devicons")
@@ -105,12 +101,30 @@ require("luasnip").config.set_config({ -- Setting LuaSnip config
-- Tree sitter (syntax highlighting)
use("nvim-treesitter/nvim-treesitter")
+ require'nvim-treesitter.configs'.setup {
+ ensure_installed = { "java", "lua", "python", "javascript", "html", "markdown" , "latex"},
+
+ ignore_install = {"latex"}, -- Disables latex tree-sitter
+
+ auto_install = true,
+ highlight = {
+ enable = true, -- Enable highlighting
+ additional_vim_regex_highlighting = { 'ruby', 'markdown' },
+ },
+ indent = {
+ enable = true, -- Enable indentation
+ },
+ }
+
--use("scottmckendry/cyberdream.nvim")
+
use('kwakzalver/duckytype.nvim')
require('duckytype').setup{}
+ -- use('https://github.com/ThePrimeagen/harpoon')
+ -- require("telescope").load_extension('harpoon')
--require("cyberdream").setup({
@@ -121,15 +135,15 @@ require("luasnip").config.set_config({ -- Setting LuaSnip config
--})
- -- this is freaking awesome - the novelty has since worn off.
- -- use('rlane/pounce.nvim')
+ use('rlane/pounce.nvim')
+
+ require'pounce'.setup{
+ accept_keys = "TNSERIOADHFUYWPLMVXZCGBJKQ",
+ accept_best_key = "<enter>",
+ multi_window = true,
+ debug = false,
+ }
- -- require'pounce'.setup{
- -- accept_keys = "TNSERIOADHFUYWPMVXZCGBJKLQ",
- -- accept_best_key = "<enter>",
- -- multi_window = true,
- -- debug = false,
- -- }
use({
"kylechui/nvim-surround",
@@ -139,6 +153,8 @@ require("luasnip").config.set_config({ -- Setting LuaSnip config
end,
})
+ vim.keymap.set("o", "s", function() require'pounce'.pounce { } end)
+
if packer_bootstrap then
require("packer").sync()
end
