Skip to content

Commit

Permalink
2025-02-08 18:08:10
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomashighbaugh committed Feb 9, 2025
1 parent 21670ec commit e786646
Show file tree
Hide file tree
Showing 19 changed files with 407 additions and 584 deletions.
456 changes: 309 additions & 147 deletions .github/README.md

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions .github/workflows/codeberg_mirror.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Pushes the contents of the repo to Codeberg repo for backup/redundancy
name: Mirror Repository to Codeberg
on:
workflow_dispatch: # Run workflow via GitHub website
schedule:
- cron: '30 3 * * *' # Run workflow automatically at 03:30 daily
jobs:
codeberg:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with: { fetch-depth: 0 }
- uses: pixta-dev/repository-mirroring-action@v1
with:
target_repo_url: [email protected]:ThomasHighbaugh/nvim-forge.git
ssh_private_key: ${{ secrets.CODEBERG_SSH }}
1 change: 1 addition & 0 deletions README.md
48 changes: 25 additions & 23 deletions lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,59 +25,61 @@
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dressing.nvim": { "branch": "master", "commit": "56ef6a969a4990d938c5fed40c370f65e125fc97" },
"easytables.nvim": { "branch": "master", "commit": "ae57fdaad25a5f9ac2773ebdb8782c7bbc7d8932" },
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
"flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" },
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" },
"gitsigns.nvim": { "branch": "main", "commit": "4baa13519c2168cc9a7890a3580c50226ed018fb" },
"glance.nvim": { "branch": "master", "commit": "1a08824835d7582457b67acbe23ca33487912a5e" },
"glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
"image_preview.nvim": { "branch": "main", "commit": "3f3f46210ba13bf82b1eb750b2d6d90eb211ee24" },
"inc-rename.nvim": { "branch": "main", "commit": "f9b9e5b9a75074810f40881b7e254b5bbeaf122e" },
"indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
"lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
"lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
"llm.nvim": { "branch": "main", "commit": "ce69731ba3f8d3ea8bc4c8f58c74c2f9ea0b33de" },
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
"luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"markdown-table-mode.nvim": { "branch": "main", "commit": "870d0449c1c78c673faa9637a63036f9537b4caa" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
"markdown-table-mode.nvim": { "branch": "main", "commit": "fe207ea7cef615ccaf2c0f1257c58ffa0a50a9f5" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.align": { "branch": "main", "commit": "e715137aece7d05734403d793b8b6b64486bc812" },
"mini.indentscope": { "branch": "main", "commit": "613df2830d7faeae7483ba2e736683154b95921e" },
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
"mini.align": { "branch": "main", "commit": "3bdf6f0b91b31db5300a7b04f53f296a7fb150c1" },
"mini.indentscope": { "branch": "main", "commit": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d" },
"mini.surround": { "branch": "main", "commit": "f40be56134835421061bf32c3702de9a29fb789c" },
"monokai-pro.nvim": { "branch": "master", "commit": "6c15e36834a624a32f46c6db8f9fc063995b24b6" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "5d172e8315444dbc32867d1c7b04d8e7e68ec4e1" },
"neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" },
"noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" },
"noice.nvim": { "branch": "main", "commit": "dbfc5fbab19ff1c3e29a3268ffa5eda4c09c72ce" },
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-alt-substitute": { "branch": "main", "commit": "f0e6ef3a656187108d695a0115c09eda62474971" },
"nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" },
"nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
"nvim-dap": { "branch": "master", "commit": "1c96e487dd4180edc5a3c075ea1f03b6b751ef4f" },
"nvim-comment-frame": { "branch": "main", "commit": "3dbdfc89c5d1f7e00ea824e4ef6c8b746cb277a5" },
"nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" },
"nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
"nvim-devdocs": { "branch": "master", "commit": "1ab982d3e069d191d9157b897c8b70cf48b7f77a" },
"nvim-highlight-colors": { "branch": "main", "commit": "68a4df620cf58e2c7336e53738e8cf3a522ad694" },
"nvim-jdtls": { "branch": "master", "commit": "3efcd0700a293efea9dada58f79c32a64850eb24" },
"nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" },
"nvim-lspconfig": { "branch": "master", "commit": "b4d65bce97795438ab6e1974b3672c17a4865e3c" },
"nvim-jdtls": { "branch": "master", "commit": "3cdd09f336ab7169476b936c0825213d86d32e41" },
"nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
"nvim-lspconfig": { "branch": "master", "commit": "5dca9e1480ebe39f3f96f98a8196f8ee18fad207" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" },
"nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
"nvim-toggler": { "branch": "main", "commit": "467808600882fd6c9e33b9dbc4889b1b80cfd917" },
"nvim-treehopper": { "branch": "master", "commit": "e87002968983ed23836dfad53bcf023e609db42d" },
"nvim-treesitter": { "branch": "master", "commit": "f3d7c0dafcbc86c4d63f765649c884a03bc1360a" },
"nvim-treesitter-context": { "branch": "master", "commit": "bece284c5322ddf6946fa4bdc383a2bc033269d7" },
"nvim-treesitter": { "branch": "master", "commit": "3973f53d7a8c4b87151dc3fd0e3d654aaa036c31" },
"nvim-treesitter-context": { "branch": "master", "commit": "03f382ef224c27a8508cdab2d0b463dcb8ca12a6" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
"nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
"nvim-web-devicons": { "branch": "master", "commit": "37334adf4517fecfd97c0b44e1d4718e377e9e52" },
"oil.nvim": { "branch": "master", "commit": "a3fc6623fa9a3c49ed94b5dbe9f181fbd2e93e64" },
"nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" },
"oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" },
"ollama.nvim": { "branch": "main", "commit": "45e58779fecde7ac5b8f62800bbe7180d4b48507" },
"outline.nvim": { "branch": "main", "commit": "d5c29ee3ff3b7d1bdd454b37698316e67808c36e" },
"outline.nvim": { "branch": "main", "commit": "f01eae624e6170656b6fadd6d7b8717636078bd6" },
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "85b80abaa09cbbc039e3095b2f515b3cf8cadd11" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "cf0da2516b0684596b09c51dbc93c609cdc2f455" },
"rest.nvim": { "branch": "main", "commit": "62606c3599bd304227457d6e20580965939b191e" },
"snipe.nvim": { "branch": "main", "commit": "0d0a482ac713370196e4fc0025d5aaac5030104d" },
"sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" },
"statuscol.nvim": { "branch": "main", "commit": "a2a0e3ed55ba0f636ce0b2ccf61bca4050edd288" },
Expand All @@ -87,14 +89,14 @@
"telescope-heading.nvim": { "branch": "main", "commit": "e85c0f69cb64048f56e76548dcb2f10277576df9" },
"telescope-import.nvim": { "branch": "main", "commit": "6fd69447679a99b463025e7f2f787e8b185dd740" },
"telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
"telescope-undo.nvim": { "branch": "main", "commit": "2971cc9f193ec09e0c5de3563f99cbea16b63f10" },
"telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" },
"telescope-zoxide": { "branch": "main", "commit": "54bfe630bad08dc9891ec78c7cf8db38dd725c97" },
"telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
"trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" },
"trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" },
"ts-node-action": { "branch": "master", "commit": "bfaa787cc85d753af3c19245b4142ed727a534b5" },
"wezterm-types": { "branch": "main", "commit": "1518752906ba3fac0060d9efab6e4d3ec15d4b5a" },
"which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" },
"which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" },
"yanky.nvim": { "branch": "main", "commit": "d2696b30e389dced94d5acab728f524a25f308d2" }
}
4 changes: 3 additions & 1 deletion lua/code_action_utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ function M.code_action_listener()
local context = { diagnostics = vim.lsp.diagnostic.get_line_diagnostics() }
local params = lsp_util.make_range_params()
params.context = context
vim.lsp.buf_request(0, 'textDocument/codeAction', params, function(err, result, ctx, config) end)
-- Produces the most annoying error preventing one from working on lines 1-8
-- need to either replace with some plugin or turn off the message
-- vim.lsp.buf_request(0, 'textDocument/codeAction', params, function(err, result, ctx, config) end)
end

return M
48 changes: 19 additions & 29 deletions lua/core/keymaps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ local Utils = require('core.utils')
-- Exit from insert mode
vim.keymap.set('i', 'kj', '<esc>', { desc = 'Exit insert mode' })

-- Save
vim.keymap.set('n', '<leader>w', '<cmd>w!<CR>', { desc = 'Save' })

-- Create Splits
vim.keymap.set('n', '<Space>\\', ':vsplit<CR>', { desc = 'Split Window Vertically' })
vim.keymap.set('n', '<Space>/', ':split<CR>', { desc = 'Split Window Horizontally' })

-- Better up/down
vim.keymap.set({ 'n', 'x' }, 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
vim.keymap.set({ 'n', 'x' }, 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
Expand All @@ -26,22 +33,21 @@ vim.keymap.set(
vim.keymap.set('x', '<leader>r', [[:s/\%V]], { desc = 'Search and replace in visual selection' })

-- Select all
vim.keymap.set('n', '<C-a>', 'gg<S-v>G', { desc = 'Select all' })

-- norm! command
vim.keymap.set('x', '<leader>n', [[:norm! ]], { desc = 'norm!' })
vim.keymap.set({ 'n', 'x' }, '<C-a>', 'gg<S-v>G', { desc = 'Select all' })

-- For correcting a word in insert mode
vim.keymap.set('i', '<c-l>', '<c-g>u<Esc>[s1z=`]a<c-g>u')

-- Buffers
vim.keymap.set('n', '<Space>bd', '<cmd>bd<cr>', { desc = 'Delete Buffer' })

-- Move to window (split) using <space> hlkj keys
vim.keymap.set('n', '<Space>h', '<c-w>h', { desc = 'Split Left' })
vim.keymap.set('n', '<Space>l', '<c-w>l', { desc = 'Split Right' })
vim.keymap.set('n', '<Space>k', '<c-w>k', { desc = 'Split Up' })
vim.keymap.set('n', '<Space>j', '<c-w>j', { desc = 'Split Down' })
-- Move to split panes using <space> hlkj keys
vim.keymap.set('n', '<Space>h', '<c-w>h', { desc = 'Move Split Pane Left' })
vim.keymap.set('n', '<Space>l', '<c-w>l', { desc = 'Move Split Pane Right' })
vim.keymap.set('n', '<Space>k', '<c-w>k', { desc = 'Move Split Pane Up' })
vim.keymap.set('n', '<Space>j', '<c-w>j', { desc = 'Move Split Pane Down' })

-- Equalize split panes
vim.keymap.set('n', '<Space>m', function()
Utils.max_or_equal()
end, { desc = 'Max or Equal Split' })
Expand Down Expand Up @@ -74,7 +80,7 @@ vim.keymap.set({ 'n', 'v' }, 'c', '"_c')
vim.keymap.set('n', 'C', '"_C')
-- vim.keymap.set('n', 'x', '"_x')

-- Jump to BoL and EoL without living instert mode
-- Jump to BoL and EoL without leaving insert mode
vim.keymap.set('i', '<M-i>', '<Esc>I', { desc = 'Jump to Beginn of Line in insert mode' })
vim.keymap.set('i', '<M-a>', '<Esc>A', { desc = 'Jump to End of Line in insert mode' })

Expand All @@ -92,24 +98,9 @@ vim.keymap.set({ 'o', 'x' }, 'a"', '2i"', { desc = 'Around Double Quotes' })
vim.keymap.set({ 'o', 'x' }, 'ir', 'i[', { desc = 'Inner Brackets' })
vim.keymap.set({ 'o', 'x' }, 'ar', 'a[', { desc = 'Inner Brackets' })

-- Add blank line without leaving normal mode
vim.keymap.set(
'n',
'<Space><UP>',
"<cmd>call append(line('.') - 1, repeat([''], v:count1))<cr>",
{ desc = 'Add blank line below' }
)
vim.keymap.set(
'n',
'<Space><DOWN>',
"<cmd>call append(line('.'), repeat([''], v:count1))<cr>",
{ desc = 'Add blank line below' }
)

-- Add komma
-- Add comma
-- vim.keymap.set("n", ",,", [[f'a]])
vim.keymap.set('i', '<C-,>', '<esc>la,', { silent = true, desc = 'Add komma after character' })
vim.keymap.set('i', '<C-b>', '{},<esc>hha', { silent = true, desc = 'Add curly with komma {},' })
vim.keymap.set('i', '<C-b>', '{},<esc>hha', { silent = true, desc = 'Add curly with comma {},' })

-- Go to last change
vim.keymap.set('n', 'g,', 'g;', { desc = 'Go to newest change' })
Expand Down Expand Up @@ -145,7 +136,7 @@ vim.keymap.set('n', 'z=', function()
end, { desc = 'Spelling suggestions' })

-- Messages
vim.keymap.set('n', '<leader>mm', '<cmd>messages<cr>', { desc = 'Messages' })
vim.keymap.set('n', '<leader>mm', '<cmd>messages<cr>', { desc = 'File Changes (Messages)' })

-- Don't yank emty lines with dd
vim.keymap.set('n', 'dd', function()
Expand Down Expand Up @@ -177,7 +168,6 @@ vim.keymap.set('n', '<space>b7', '<cmd>BufferLineGoToBuffer 7<cr>', { desc = 'Go
vim.keymap.set('n', '<space>b8', '<cmd>BufferLineGoToBuffer 8<cr>', { desc = 'Go to Buffer 8' })
vim.keymap.set('n', '<space>b9', '<cmd>BufferLineGoToBuffer 9<cr>', { desc = 'Go to Buffer 9' })

-- nvim-treehopper (vm<motion> or ym<motion>)
vim.keymap.set('o', 'm', [[:<c-u>lua require 'tsht'.nodes()<cr>]], { silent = true, remap = true })
vim.keymap.set('x', 'm', [[:<c-u>lua require 'tsht'.nodes()<cr>]], { silent = true })

Expand Down
4 changes: 2 additions & 2 deletions lua/plugins/aisync.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ return {
build = ':Copilot auth',
dependencies = { 'zbirenbaum/copilot-cmp' },
opts = {
suggestion = { enabled = false },
panel = { enabled = false },
suggestion = { enabled = true },
panel = { enabled = true },
filetypes = {
['*'] = true, -- disable for all other filetypes and ignore default `filetypes`
},
Expand Down
22 changes: 9 additions & 13 deletions lua/plugins/cmp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ return {
enabled = true,
event = { 'InsertEnter', 'CmdlineEnter' },
dependencies = {
'hrsh7th/cmp-nvim-lsp',
'zbirenbaum/copilot-cmp',
'hrsh7th/cmp-cmdline',
'hrsh7th/cmp-buffer',
'saadparwaiz1/cmp_luasnip',
'ray-x/cmp-treesitter',
'hrsh7th/cmp-cmdline',
'hrsh7th/cmp-nvim-lsp',
'hrsh7th/cmp-nvim-lsp-signature-help',
'hrsh7th/cmp-nvim-lua',
'hrsh7th/cmp-path',
'mfussenegger/nvim-jdtls',
'octaltree/cmp-look',
'ray-x/cmp-treesitter',
'saadparwaiz1/cmp_luasnip',
'zbirenbaum/copilot-cmp',

-- 'chrisgrieser/cmp_yanky',
},
config = function()
Expand Down Expand Up @@ -192,8 +194,8 @@ return {
vim_item.abbr = trim(vim_item.abbr)
-- Source
vim_item.menu = ({
codeium = 'Codeium',
copilot = 'Copilot',
codeium = '( Codeium )',
copilot = '( Copilot )',
nvim_lsp = '( LSP )',
nvim_lsp_signature_help = '( Signature )',
luasnip = '( LuaSnip )',
Expand Down Expand Up @@ -240,12 +242,6 @@ return {
-- ╰───────────────────╯
cmp.setup.cmdline(':', {
mapping = cmp.mapping.preset.cmdline(),
-- sources = cmp.config.sources({
-- { name = 'path' },
-- }, {
-- { name = 'cmdline' },
-- }),
-- Same as above
sources = cmp.config.sources({
{ name = 'path', group_index = 1 },
{ name = 'cmdline', group_index = 2 },
Expand Down
2 changes: 1 addition & 1 deletion lua/plugins/comments.lua
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ return {
-- ╰─────────────────────────────────────────────────────────╯
{
's1n7ax/nvim-comment-frame',
enabled = false,
enabled = true,
keys = {
{ '<leader>cf', desc = 'Single Comment Frame' },
{ '<leader>cm', desc = 'Multi Comment Frame' },
Expand Down
62 changes: 0 additions & 62 deletions lua/plugins/focus.lua

This file was deleted.

Loading

0 comments on commit e786646

Please sign in to comment.