diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 005b535..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -tags -test.sh -.luarc.json -nvim - -spell/ -lazy-lock.json diff --git a/init.lua b/init.lua index 9e387dc..bd61aaf 100644 --- a/init.lua +++ b/init.lua @@ -1,137 +1,9 @@ --- River Rooks nvim config +-- render options +require('options') --- [[setup]] -vim.g.mapleader = ' ' -vim.g.maplocalleader = ' ' --- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = true +-- render keybinds +require('keybinds') - -vim.g.netrw_liststyle = 3 --tree view -vim.g.netrw_banner = 1 -vim.g.netrw_winsize = 70 -- Set the width of the "drawer" -vim.g.netrw_browse_split = 4 -- Open files in previous window. This emulates the typical "drawer" behavior -vim.g.netrw_preview = 1 -- opens in vertical if no open buffer -vim.g.netrw_altv = 1 -- Create the split of the Netrw window to the left - -vim.keymap.set('n', '', ':bnext') -vim.keymap.set('n', '', ':bprev') -vim.keymap.set('n', 'x', ':bdelete') - --- [[Setting options]] --- See `:help vim.o` --- NOTE: You can change these options as you wish! --- For more options, you can see `:help option-list` --- Make line numbers default -vim.o.number = true --- You can also add relative line numbers, to help with jumping. --- Experiment for yourself to see if you like it! -vim.o.relativenumber = true --- Don't show the mode, since it's already in the status line -vim.o.showmode = false --- Sync clipboard between OS and Neovim. --- Schedule the setting after `UiEnter` because it can increase startup-time. --- Remove this option if you want your OS clipboard to remain independent. --- See `:help 'clipboard'` -vim.schedule(function() - vim.o.clipboard = 'unnamedplus' -end) --- Enable break indent --- Save undo history -vim.o.undofile = true --- Case-insensitive searching UNLESS \C or one or more capital letters in the search term -vim.o.ignorecase = true -vim.o.smartcase = true --- Keep signcolumn on by default -vim.o.signcolumn = 'yes' --- Decrease update time -vim.o.updatetime = 250 --- Decrease mapped sequence wait time -vim.o.timeoutlen = 300 --- Configure how new splits should be opened --- vim.o.splitright = false --- vim.o.splitbelow = true -vim.o.list = true -vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } --- Preview substitutions live, as you type! -vim.o.inccommand = 'split' --- Show which line your cursor is on -vim.o.cursorline = true --- Minimal number of screen lines to keep above and below the cursor. -vim.o.scrolloff = 25 --- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`), --- instead raise a dialog asking if you wish to save the current file(s) --- See `:help 'confirm'` -vim.o.confirm = true --- [[Keybinds]] --- See `:help vim.keymap.set()` --- See `:help hlsearch` -vim.keymap.set('n', '', 'nohlsearch') --- Diagnostic keymaps -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) - -vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) - -vim.keymap.set("n", "a", ":IncRename ", {desc = 'ren[a]me variable under cursor'}) - --- run clear and make in open terminal -vim -.keymap.set('n','r','TermExec cmd="clear && make"', { desc = '[r]un make in terminal' }) -vim -.keymap -.set('n','n', 'ToggleTerm direction=vertical name=compile size=70', { desc = 'open a [n]ew terminal' }) -vim.keymap.set('n','t', 'ToggleTerm', {desc = '[T]oggle all terminals'}) - -vim.keymap.set("n", "l", function() - -- Get terminal ID 1 - -- Save position and buffer context - - - local term = require("toggleterm.terminal").get(1) - if term then - local original_window = vim.api.nvim_get_current_win() - local saved_view = vim.fn.winsaveview() - -- Using \r (carriage return) or \n\n often bypasses shell interceptors - term:send("clear\r") - term:send("!-2\r") - vim.api.nvim_set_current_win(original_window) - vim.fn.winrestview(saved_view) - else - vim.notify("Terminal 1 is not open yet!", vim.log.levels.WARN) - end - -- Return logic -end, { desc = "Run [L]ast command in terminal 1" }) - - --- TIP: Disable arrow keys in normal mode -vim.keymap.set('n', '', 'echo "Use h to move!!"') -vim.keymap.set('n', '', 'echo "Use l to move!!"') -vim.keymap.set('n', '', 'echo "Use k to move!!"') -vim.keymap.set('n', '', 'echo "Use j to move!!"') - --- Keybinds to make split navigation easier. --- Use CTRL+ to switch between windows --- --- See `:help wincmd` for a list of all window commands -vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) - --- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes -vim.keymap.set("n", "", "H", { desc = "Move window to the left" }) -vim.keymap.set("n", "", "L", { desc = "Move window to the right" }) -vim.keymap.set("n", "", "J", { desc = "Move window to the lower" }) -vim.keymap.set("n", "", "K", { desc = "Move window to the upper" }) - --- [[ Basic Autocommands ]] -vim.api.nvim_create_autocmd('TextYankPost', { - desc = 'Highlight when yanking (copying) text', - group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), - callback = function() - vim.hl.on_yank() - end, -}) -- [[scripts]] -- Bootstrap lazy.nvim local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" @@ -168,56 +40,3 @@ require("lazy").setup({ -- automatically check for plugin updates checker = { enabled = true }, }) - -require('render-markdown').setup({ - file_types = { 'markdown', 'quarto' }, - render_modes = {'n','c','t'}, - link = { - enabled = true, - render_modes = false, - footnote = { - enabled = true, - icon = '󰯔 ', - body = function(ctx) - return ctx.text - end, - superscript = true, - prefix = '', - suffix = '', - }, - image = '󰥶 ', - email = '󰀓 ', - hyperlink = '󰌹 ', - highlight = 'RenderMarkdownLink', - highlight_title = 'RenderMarkdownLinkTitle', - wiki = { - enabled = true, - icon = '󱗖 ', - body = function() - return nil - end, - highlight = 'RenderMarkdownWikiLink', - scope_highlight = nil, - }, - custom = { - web = { pattern = '^http', icon = '󰖟 ' }, - apple = { pattern = 'apple%.com', icon = ' ' }, - discord = { pattern = 'discord%.com', icon = '󰙯 ' }, - github = { pattern = 'github%.com', icon = '󰊤 ' }, - gitlab = { pattern = 'gitlab%.com', icon = '󰮠 ' }, - google = { pattern = 'google%.com', icon = '󰊭 ' }, - hackernews = { pattern = 'ycombinator%.com', icon = ' ' }, - linkedin = { pattern = 'linkedin%.com', icon = '󰌻 ' }, - microsoft = { pattern = 'microsoft%.com', icon = ' ' }, - neovim = { pattern = 'neovim%.io', icon = ' ' }, - reddit = { pattern = 'reddit%.com', icon = '󰑍 ' }, - slack = { pattern = 'slack%.com', icon = '󰒱 ' }, - stackoverflow = { pattern = 'stackoverflow%.com', icon = '󰓌 ' }, - steam = { pattern = 'steampowered%.com', icon = ' ' }, - twitter = { pattern = 'x%.com', icon = ' ' }, - wikipedia = { pattern = 'wikipedia%.org', icon = '󰖬 ' }, - youtube = { pattern = 'youtube[^.]*%.com', icon = '󰗃 ' }, - youtube_short = { pattern = 'youtu%.be', icon = '󰗃 ' }, - }, - }, -}) diff --git a/keybinds.lua b/keybinds.lua new file mode 100644 index 0000000..6ec0abf --- /dev/null +++ b/keybinds.lua @@ -0,0 +1,56 @@ +vim.keymap.set('n', '', ':bnext') +vim.keymap.set('n', '', ':bprev') +vim.keymap.set('n', 'x', ':bdelete') + +-- termunal interface shortcuts +vim.keymap.set('n', '', 'nohlsearch') +-- Diagnostic keymaps +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) + +vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) + +vim.keymap.set("n", "a", ":IncRename ", {desc = 'ren[a]me variable under cursor'}) + +vim .keymap.set('n','r','TermExec cmd="clear && make"', { desc = '[r]un make in terminal' }) +vim .keymap .set('n','n', 'ToggleTerm direction=vertical name=compile size=70', { desc = 'open a [n]ew terminal' }) +vim.keymap.set('n','t', 'ToggleTerm', {desc = '[T]oggle all terminals'}) +vim.keymap.set("n", "l", function() + -- Get terminal ID 1 + -- Save position and buffer context + local term = require("toggleterm.terminal").get(1) + if term then + local original_window = vim.api.nvim_get_current_win() + local saved_view = vim.fn.winsaveview() + -- Using \r (carriage return) or \n\n often bypasses shell interceptors + term:send("clear\r") + term:send("!-2\r") + vim.api.nvim_set_current_win(original_window) + vim.fn.winrestview(saved_view) + else + vim.notify("Terminal 1 is not open yet!", vim.log.levels.WARN) + end + -- Return logic +end, { desc = "Run [L]ast command in terminal 1" }) + +-- more keybinds +-- TIP: Disable arrow keys in normal mode +vim.keymap.set('n', '', 'echo "Use h to move!!"') +vim.keymap.set('n', '', 'echo "Use l to move!!"') +vim.keymap.set('n', '', 'echo "Use k to move!!"') +vim.keymap.set('n', '', 'echo "Use j to move!!"') + +-- Keybinds to make split navigation easier. +-- Use CTRL+ to switch between windows +-- +-- See `:help wincmd` for a list of all window commands +vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) + +-- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes +vim.keymap.set("n", "", "H", { desc = "Move window to the left" }) +vim.keymap.set("n", "", "L", { desc = "Move window to the right" }) +vim.keymap.set("n", "", "J", { desc = "Move window to the lower" }) +vim.keymap.set("n", "", "K", { desc = "Move window to the upper" }) + diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..77220c4 --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,52 @@ +{ + "PDFview": { "branch": "main", "commit": "972dfcce5c0de578865649940f44bf57a700498d" }, + "base16-nvim": { "branch": "master", "commit": "190397833e53fdfd5cf400c5baaf1a4e533158e5" }, + "blink.cmp": { "branch": "main", "commit": "e3523b949badd35ac8553bb975698f8d47b6debd" }, + "catppuccin": { "branch": "main", "commit": "12c004cde3f36cb1d57242f1e6aac46b09a0e5b4" }, + "cord.nvim": { "branch": "master", "commit": "283e4a5bdafd0d6187f28e5b739cccab6b4c9c64" }, + "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, + "fd": { "branch": "master", "commit": "cb3fad48bb2d366080efa421d8499ec968f60a6c" }, + "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, + "fzf-lua": { "branch": "main", "commit": "d9508cc1d05ffcdc91a32dfd38fc1013a56b20da" }, + "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, + "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, + "hologram.nvim": { "branch": "main", "commit": "f5194f71ec1578d91b2e3119ff08e574e2eab542" }, + "inc-rename.nvim": { "branch": "main", "commit": "0074b551a17338ccdcd299bd86687cc651bcb33d" }, + "iris.vim": { "branch": "master", "commit": "a950760b956574c275c2060cb4267affbfe41b30" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, + "lush.nvim": { "branch": "main", "commit": "9c60ec2279d62487d942ce095e49006af28eed6e" }, + "markview.nvim": { "branch": "main", "commit": "239feb70ed1cfc26e2c91b32590fd63f7b015599" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a324581a3c83fdacdb9804b79de1cbe00ce18550" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, + "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, + "mini.nvim": { "branch": "main", "commit": "9d359222b3643f1fccbd8f3180445842e1cae00b" }, + "mini.pick": { "branch": "main", "commit": "8521fe21df86e08d9e4b3c3f3a7d50e47954e1af" }, + "neogit": { "branch": "master", "commit": "8fd90675caf8b847280ca56f464b66030adad876" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-dap": { "branch": "master", "commit": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5" }, + "nvim-java": { "branch": "main", "commit": "602a5f7fa92f9c1d425a2159133ff9de86842f0a" }, + "nvim-lspconfig": { "branch": "master", "commit": "d8bf4c47385340ab2029402201d4d7c9f99f437a" }, + "nvim-treesitter": { "branch": "main", "commit": "5cb05e1b0fa3c469958a2b26f36b3fe930af221c" }, + "nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" }, + "obsidian.nvim": { "branch": "main", "commit": "350586c9e873143c3f65e3c2667bd0324964e89c" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, + "render-markdown.nvim": { "branch": "main", "commit": "e3c18ddd27a853f85a6f513a864cf4f2982b9f26" }, + "resize.nvim": { "branch": "main", "commit": "0b8943ef2ce54e65b9e56974e94dee593b28e7b5" }, + "ripgrep": { "branch": "master", "commit": "4519153e5e461527f4bca45b042fff45c4ec6fb9" }, + "snacks.nvim": { "branch": "main", "commit": "9912042fc8bca2209105526ac7534e9a0c2071b2" }, + "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" }, + "sqlua.nvim": { "branch": "master", "commit": "e4db0e1e16741e1ea42c620d0b8ce3347cc02c51" }, + "store.nvim": { "branch": "main", "commit": "c74aa484cc3fe799f11f4dec62b1c438035599b5" }, + "sudo.nvim": { "branch": "main", "commit": "eed34f8636f0dd1bac89c81f6f96a86ca513f5f2" }, + "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" }, + "themery.nvim": { "branch": "main", "commit": "bfa58f4b279d21cb515b28023e1b68ec908584b2" }, + "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, + "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" }, + "vim-signature": { "branch": "master", "commit": "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc" }, + "vim-termhere": { "branch": "main", "commit": "b66d429dd48b74802f09fd059bc499c253372a1c" }, + "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } +} diff --git a/options.lua b/options.lua new file mode 100644 index 0000000..f75eb2f --- /dev/null +++ b/options.lua @@ -0,0 +1,67 @@ +-- River Rooks nvim config + +-- [[setup]] +vim.g.mapleader = ' ' +vim.g.maplocalleader = ' ' +vim.g.have_nerd_font = true + +-- netrw +vim.g.netrw_liststyle = 3 --tree view +vim.g.netrw_banner = 1 +vim.g.netrw_winsize = 70 -- Set the width of the "drawer" +vim.g.netrw_browse_split = 4 -- Open files in previous window. This emulates the typical "drawer" behavior +vim.g.netrw_preview = 1 -- opens in vertical if no open buffer +vim.g.netrw_altv = 1 -- Create the split of the Netrw window to the left + + +-- [[Setting options]] +vim.o.number = true -- Make line numbers default +vim.o.relativenumber = true +vim.o.showmode = false +-- Sync clipboard between OS and Neovim. +-- Schedule the setting after `UiEnter` because it can increase startup-time. +-- Remove this option if you want your OS clipboard to remain independent. +-- See `:help 'clipboard'` +vim.schedule(function() + vim.o.clipboard = 'unnamedplus' +end) +-- Enable break indent +-- Save undo history +vim.o.undofile = true +-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term +vim.o.ignorecase = true +vim.o.smartcase = true +-- Keep signcolumn on by default +vim.o.signcolumn = 'yes' +-- Decrease update time +vim.o.updatetime = 250 +-- Decrease mapped sequence wait time +vim.o.timeoutlen = 300 +-- Configure how new splits should be opened +-- vim.o.splitright = false +-- vim.o.splitbelow = true +vim.o.list = true +vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } +-- Preview substitutions live, as you type! +vim.o.inccommand = 'split' +-- Show which line your cursor is on +vim.o.cursorline = true +-- Minimal number of screen lines to keep above and below the cursor. +vim.o.scrolloff = 25 +-- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`), +-- instead raise a dialog asking if you wish to save the current file(s) +-- See `:help 'confirm'` +vim.o.confirm = true +-- [[Keybinds]] +-- See `:help vim.keymap.set()` +-- See `:help hlsearch` + +-- [[ Basic Autocommands ]] +vim.api.nvim_create_autocmd('TextYankPost', { + desc = 'Highlight when yanking (copying) text', + group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), + callback = function() + vim.hl.on_yank() + end, +}) + diff --git a/plugins.lua b/plugins.lua deleted file mode 120000 index c760c6f..0000000 --- a/plugins.lua +++ /dev/null @@ -1 +0,0 @@ -lua/plugins/simple.lua \ No newline at end of file diff --git a/sc b/sc deleted file mode 100644 index 50f110d..0000000 --- a/sc +++ /dev/null @@ -1,7 +0,0 @@ -admin user list -non admin user lsit -remove non-admin - -sssd -ldap -AD