Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@wrapperup
wrapperup committed Jan 24, 2025
1 parent b7a1eea commit 7c4b0cb
Show file tree
Hide file tree
Showing 3 changed files with 140 additions and 88 deletions.
41 changes: 37 additions & 4 deletions lua/wrap/lazy.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ require('lazy').setup({

-- fuzzy finder
{
'nvim-telescope/telescope.nvim',
tag = '0.1.5',
dependencies = { 'nvim-lua/plenary.nvim' }
"nvim-telescope/telescope.nvim",
tag = "0.1.8",
dependencies = { "nvim-lua/plenary.nvim" }
},

{ 'stevearc/oil.nvim' },
Expand Down Expand Up @@ -105,13 +105,46 @@ require('lazy').setup({
{
"folke/trouble.nvim",
dependencies = "nvim-tree/nvim-web-devicons",
cmd = "Trouble",
config = function()
require("trouble").setup {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
}
end
end,
keys = {
{
"<leader>xx",
"<cmd>Trouble diagnostics toggle<cr>",
desc = "Diagnostics (Trouble)",
},
{
"<leader>xX",
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
desc = "Buffer Diagnostics (Trouble)",
},
{
"<leader>cs",
"<cmd>Trouble symbols toggle focus=false<cr>",
desc = "Symbols (Trouble)",
},
{
"<leader>cl",
"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
desc = "LSP Definitions / references / ... (Trouble)",
},
{
"<leader>xL",
"<cmd>Trouble loclist toggle<cr>",
desc = "Location List (Trouble)",
},
{
"<leader>xQ",
"<cmd>Trouble qflist toggle<cr>",
desc = "Quickfix List (Trouble)",
},
},
},

-- status line
Expand Down
158 changes: 83 additions & 75 deletions lua/wrap/remaps.lua
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
----------------------------------------------------------------------------
-- Vanilla remaps
----------------------------------------------------------------------------

vim.g.mapleader = " "

local cfg = vim.fn.stdpath("config")
Expand All @@ -10,37 +14,37 @@ vim.keymap.set("n", "<leader>cr", function() vim.cmd.e(cfg_core .. "/remaps.lua"
vim.keymap.set("n", "<leader>cl", function() vim.cmd.e(cfg_core .. "/lazy.lua") end)
vim.keymap.set("n", "<leader>ck", function() vim.cmd.e(cfg_core .. "/lsp.lua") end)

-- harpoon
vim.keymap.set("n", "<C-e>", function() require("harpoon.ui").toggle_quick_menu() end)
vim.keymap.set("n", "<C-a>", function() require("harpoon.mark").add_file() end)

vim.keymap.set("n", "<C-h>", function() require("harpoon.ui").nav_file(1) end)
vim.keymap.set("n", "<C-j>", function() require("harpoon.ui").nav_file(2) end)
vim.keymap.set("n", "<C-k>", function() require("harpoon.ui").nav_file(3) end)
vim.keymap.set("n", "<C-l>", function() require("harpoon.ui").nav_file(4) end)

vim.keymap.set("n", "Q", "@@")

vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")

vim.keymap.set("v", "<S-Down>", ":m '>+1<CR>gv=gv")
vim.keymap.set("v", "<S-Down>", ":m '>+1<CR>gv=gv")
vim.keymap.set("v", "<S-Up>", ":m '<-2<CR>gv=gv")
vim.keymap.set("v", "<S-Left>", "<gv")
vim.keymap.set("v", "<S-Left>", "<gv")
vim.keymap.set("v", "<S-Right>", ">gv")

vim.keymap.set("n", "<M-o>", function() vim.cmd("ClangdSwitchSourceHeader") end)
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_next() end)
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_prev() end)

vim.keymap.set("n", "<F3>", function() require("conform").format({
lsp_fallback = true,
async = true,
}) end)
vim.keymap.set("n", "<C-]>", "<cmd>cnext<CR>zz")
vim.keymap.set("n", "<C-[>", "<cmd>cprev<CR>zz")

-- remaps
vim.keymap.set('n', '<C-Down>', function() vim.cmd.wincmd('j') end)
vim.keymap.set('n', '<C-Up>', function() vim.cmd.wincmd('k') end)
vim.keymap.set('n', '<C-Left>', function() vim.cmd.wincmd('h') end)
vim.keymap.set('n', '<C-Right>', function() vim.cmd.wincmd('l') end)

vim.keymap.set('n', '<C-S-Down>', ':resize +20<CR>', { noremap = true, silent = true })
vim.keymap.set('n', '<C-S-Up>', ':resize -20<CR>', { noremap = true, silent = true })
vim.keymap.set('n', '<C-S-Left>', ':vertical resize +20<CR>', { noremap = true, silent = true })
vim.keymap.set('n', '<C-S-Right>', ':vertical resize -20<CR>', { noremap = true, silent = true })

-- Center on page scrolling
vim.keymap.set("n", "<C-d>", "<C-d>zz")
vim.keymap.set("n", "<C-u>", "<C-u>zz")

-- bullshit bullshit bullshit
-- idk sometimes I just hit shift and it's annoying
vim.api.nvim_create_user_command("W", "w", { desc = "Write" })
vim.api.nvim_create_user_command("Wq", "wq", { desc = "Write quit" })
vim.api.nvim_create_user_command("Wqa", "wqa", { desc = "Write quit all" })
Expand All @@ -53,9 +57,21 @@ vim.keymap.set("x", "<leader>p", [["_dP]])
vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
vim.keymap.set("n", "<leader>Y", [["+Y]])

-- fuzzy finder / telescope
local telescope = require("telescope")
local builtin = require("telescope.builtin")
----------------------------------------------------------------------------
-- harpoon
----------------------------------------------------------------------------

vim.keymap.set("n", "<C-e>", function() require("harpoon.ui").toggle_quick_menu() end)
vim.keymap.set("n", "<C-a>", function() require("harpoon.mark").add_file() end)

vim.keymap.set("n", "<C-h>", function() require("harpoon.ui").nav_file(1) end)
vim.keymap.set("n", "<C-j>", function() require("harpoon.ui").nav_file(2) end)
vim.keymap.set("n", "<C-k>", function() require("harpoon.ui").nav_file(3) end)
vim.keymap.set("n", "<C-l>", function() require("harpoon.ui").nav_file(4) end)

----------------------------------------------------------------------------
-- oil.nvim
----------------------------------------------------------------------------

local oil = require("oil")
if oil then
Expand All @@ -65,8 +81,11 @@ else
end
vim.keymap.set("n", "<leader>pv", function() require("oil").open() end)


----------------------------------------------------------------------------
-- telescope
----------------------------------------------------------------------------

local builtin = require('telescope.builtin')

local filetype_to_std_lib = {
jai = "C:/Repos/jai/jai",
Expand All @@ -89,62 +108,51 @@ local live_grep_in_std = function()
end
end

vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
vim.keymap.set("n", "<leader>F", find_file_in_std, {})
vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
vim.keymap.set("n", "<leader>G", live_grep_in_std, {})
vim.keymap.set("n", "<leader>fcf", function() builtin.find_files { cwd = cfg } end, {})
vim.keymap.set("n", "<leader>fcg", function() builtin.live_grep { cwd = cfg } end, {})
vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
vim.keymap.set("n", "<leader>fr", builtin.resume, {})
vim.keymap.set("n", "<leader>fq", builtin.quickfix, {})
vim.keymap.set("n", "gu", function() builtin.lsp_references({ include_declaration = false }) end, {})
vim.keymap.set("n", "gd", function() builtin.lsp_definitions({}) end, {})
if builtin then
vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
vim.keymap.set("n", "<leader>F", find_file_in_std, {})
vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
vim.keymap.set("n", "<leader>G", live_grep_in_std, {})
vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
vim.keymap.set("n", "<leader>fr", builtin.resume, {})
vim.keymap.set("n", "<leader>fq", builtin.quickfix, {})
vim.keymap.set("n", "gu", function() builtin.lsp_references({}) end, {})
vim.keymap.set("n", "gd", function() builtin.lsp_definitions({}) end, {})
end

vim.keymap.set("n", "<leader>h", function() require("replacer").run() end, {})
----------------------------------------------------------------------------
-- Overseer.nvim
----------------------------------------------------------------------------

local overseer = require('overseer')

if overseer then
vim.api.nvim_create_user_command("OverseerRestartLast", function()
local tasks = overseer.list_tasks({ recent_first = true })
if vim.tbl_isempty(tasks) then
-- no tasks to restart, let the user pick
overseer.run_template()
else
overseer.run_action(tasks[1], "restart")
end
end, {})

vim.keymap.set("n", "<F5>", function() vim.cmd "OverseerRestartLast" end)
vim.keymap.set("n", "<S-F5>", function() vim.cmd "OverseerRun" end)
end

vim.keymap.set({ "n", "v" }, "<leader>xe", require("nvim-emmet").wrap_with_abbreviation)
----------------------------------------------------------------------------
-- Formatting / Code Completion /Misc
----------------------------------------------------------------------------

require("leap").add_default_mappings()
require("Comment").setup()
vim.keymap.set('i', '<C-cr>', function() require("cmp").complete() end)

vim.api.nvim_create_user_command("OverseerRestartLast", function()
local overseer = require("overseer")
local tasks = overseer.list_tasks({ recent_first = true })
if vim.tbl_isempty(tasks) then
-- no tasks to restart, let the user pick
overseer.run_template()
else
overseer.run_action(tasks[1], "restart")
end
end, {})

-- trouble
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_next() end, opts)
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_prev() end, opts)

vim.keymap.set("n", "<F5>", function() vim.cmd "OverseerRestartLast" end)
vim.keymap.set("n", "<S-F5>", function() vim.cmd "OverseerRun" end)

-- vim.keymap.set('n', '<A-Down>', function() vim.cmd.wincmd('j') end)
-- vim.keymap.set('n', '<A-Up>', function() vim.cmd.wincmd('k') end)
-- vim.keymap.set('n', '<A-Left>', function() vim.cmd.wincmd('h') end)
-- vim.keymap.set('n', '<A-Right>', function() vim.cmd.wincmd('l') end)
--
-- vim.keymap.set('n', '<A-S-Down>', ':resize +20<CR>', { noremap = true, silent = true })
-- vim.keymap.set('n', '<A-S-Up>', ':resize -20<CR>', { noremap = true, silent = true })
-- vim.keymap.set('n', '<A-S-Left>', ':vertical resize +20<CR>', { noremap = true, silent = true })
-- vim.keymap.set('n', '<A-S-Right>', ':vertical resize -20<CR>', { noremap = true, silent = true })
--
vim.keymap.set('n', '<C-Down>', function() vim.cmd.wincmd('j') end)
vim.keymap.set('n', '<C-Up>', function() vim.cmd.wincmd('k') end)
vim.keymap.set('n', '<C-Left>', function() vim.cmd.wincmd('h') end)
vim.keymap.set('n', '<C-Right>', function() vim.cmd.wincmd('l') end)
require("Comment").setup()

vim.keymap.set('n', '<C-S-Down>', ':resize +20<CR>', { noremap = true, silent = true })
vim.keymap.set('n', '<C-S-Up>', ':resize -20<CR>', { noremap = true, silent = true })
vim.keymap.set('n', '<C-S-Left>', ':vertical resize +20<CR>', { noremap = true, silent = true })
vim.keymap.set('n', '<C-S-Right>', ':vertical resize -20<CR>', { noremap = true, silent = true })
vim.keymap.set("n", "<M-o>", function() vim.cmd("ClangdSwitchSourceHeader") end)

vim.keymap.set('i', '<C-cr>', function() require("cmp").complete() end)
vim.keymap.set("n", "<F3>", function() require("conform").format({
lsp_fallback = true,
async = true,
}) end)
29 changes: 20 additions & 9 deletions lua/wrap/setup.lua
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
require('telescope').setup {
extensions = {
file_browser = {
-- disables netrw and use telescope-file-browser in its place
hijack_netrw = false,
},
},
}

require('oil').setup({
view_options = {
show_hidden = true,
Expand All @@ -19,3 +10,23 @@ require('oil').setup({
require('nvim-surround').setup()

require('overseer').setup()

vim.api.nvim_create_user_command("Make", function(params)
-- Insert args at the '$*' in the makeprg
local cmd, num_subs = vim.o.makeprg:gsub("%$%*", params.args)
if num_subs == 0 then
cmd = cmd .. " " .. params.args
end
local task = require("overseer").new_task({
cmd = vim.fn.expandcmd(cmd),
components = {
{ "on_output_quickfix", open = not params.bang, open_height = 8 },
"default",
},
})
task:start()
end, {
desc = "Run your makeprg as an Overseer task",
nargs = "*",
bang = true,
})

0 comments on commit 7c4b0cb

Please sign in to comment.