consoildating plugins by function. updated repeat command shortcut

.gitignore

@@ -1,7 +1 @@
-tags
-test.sh
-.luarc.json
-nvim
-
-spell/
 lazy-lock.json

colors/noctalia.lua

@@ -0,0 +1,7 @@
+return {
+  bg = "#291414",
+  fg = "#f3f2f2",
+  accent = "#e46767",
+  error = "#fd4663",
+  warning = "#cccc66",
+}

colors/testTheme.lua

@@ -0,0 +1,57 @@
+return {
+
+  -- color approach
+
+  red = "#ff3d00",
+  orange = "#e58e44",
+  green = "#77b886",
+  yellow = "#f7cb92",
+  blue = "#7689d9",
+  magenta = "#8f509d",
+  cyan = "#8fb9f4",
+  black = "#000000",
+  bright_red = "#ff6347",
+  bright_orange = "#f6aa6b",
+  bright_green = "#a3d6a5",
+  bright_yellow = "#ffe56e",
+  bright_blue = "#9eabe6",
+  bright_magenta = "#b78fc2",
+  bright_cyan = "#a4c4ff",
+  white = "#ffffff",
+  gutter_fg = "#78808f",
+  nontext = "#d2d6dc",
+  -- element approach
+  bg = "#0f1c2e",
+  fg         = "#e6e8ee",
+  cursorline = "#1c2b3a",
+  selection  = "#2e3c55",
+  linenr     = "#4a5a70",
+  comment    = "#7d88a1",
+
+  -- Syntax
+  keyword    = "#f28fad",
+  Function   = "#89b4fa",
+  string     = "#f9e2af",
+  constant   = "#cdd6f4",
+  type       = "#cba6f7",
+  number     = "#fab387",
+  boolean    = "#f38ba8",
+  operator   = "#94a3b8",
+  variable   = "#e0def4",
+
+  -- UI
+  cursor     = "#f5a97f",
+  visual     = "#2e3c55",
+  search     = "#f5c2e7",
+  statusline = "#1e293b",
+  menu_bg    = "#1a2535",
+  menu_sel   = "#3b4252",
+  fold       = "#3e4a5a",
+  split      = "#334155",
+
+  -- Diagnostics
+  diag_error = "#f38ba8",
+  diag_warn  = "#fab387",
+  diag_info  = "#89dceb",
+  diag_hint  = "#b4befe",
+}

init.lua

@@ -1,161 +1,50 @@
 -- River Rooks nvim config
-
+-- init.lua
--- [[setup]]
+-- render options, keybinds, lazy and treesitter
-vim.g.mapleader = ' '
+-- processed first
-vim.g.maplocalleader = ' '
--- Set to true if you have a Nerd Font installed and selected in the terminal
-vim.g.have_nerd_font = true
-
-
-vim.g.netrw_liststyle = 3
-vim.g.netrw_banner = 1
-vim.g.netrw_altv = 1 -- Create the split of the Netrw window to the left
-vim.g.netrw_winsize = 30 -- Set the width of the "drawer"
-vim.g.netrw_browse_split = 4 -- Open files in previous window. This emulates the typical "drawer" behaviorkjk
-
--- [[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 = true
-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', '<Esc>', '<cmd>nohlsearch<CR>')
--- Diagnostic keymaps
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
-
-vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
-
-
--- run clear and make in open terminal
-vim.keymap.set('n','<leader>r','<cmd>TermExec cmd="clear && make"<CR>', { desc = '[r]un make in terminal' })
-vim.keymap.set('n','<leader>n', '<cmd>ToggleTerm direction=vertical name=compile size=70<CR>', { desc = 'open a [n]ew terminal' })
-vim.keymap.set('n','<leader>t', '<cmd>ToggleTerm<CR>', {desc = '[T]oggle all terminals'})
-
--- TIP: Disable arrow keys in normal mode
-vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
-vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
-vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
-vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
-
--- Keybinds to make split navigation easier.
---  Use CTRL+<hjkl> to switch between windows
 --
---  See `:help wincmd` for a list of all window commands
+-- render options
-vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
+require('options')
-vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
+-- render keybinds
-vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
+require('keybinds')
-vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
+-- bootstrap lazy.nvim
-
+require("config.lazy")
--- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes
+-- lazy.nvim settings 
-vim.keymap.set("n", "<C-S-h>", "<C-w>H", { desc = "Move window to the left" })
-vim.keymap.set("n", "<C-S-l>", "<C-w>L", { desc = "Move window to the right" })
-vim.keymap.set("n", "<C-S-j>", "<C-w>J", { desc = "Move window to the lower" })
-vim.keymap.set("n", "<C-S-k>", "<C-w>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"
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-  if vim.v.shell_error ~= 0 then
-    vim.api.nvim_echo({
-      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-      { out, "WarningMsg" },
-      { "\nPress any key to exit..." },
-    }, true, {})
-    vim.fn.getchar()
-    os.exit(1)
-  end
-end
-vim.opt.rtp:prepend(lazypath)
-
--- Make sure to setup `mapleader` and `maplocalleader` before
--- loading lazy.nvim so that mappings are correct.
--- This is also a good place to setup other settings (vim.opt)
-vim.g.mapleader = " "
-vim.g.maplocalleader = "\\"
-
--- Setup lazy.nvim
 require("lazy").setup({
   spec = {
-    -- import your plugins
     { import = "plugins" },
+    {
+      'tpope/vim-commentary', -- commenting lines with shortcut 
+      -- 'vimpostor/vim-tpipeline', -- integrate with tmux status-line
+      'kshenoy/vim-signature', -- tag lines
+      'mg979/vim-visual-multi', -- work on multiple lines at once
+      'obsidian-nvim/obsidian.nvim', -- Obsidian lsp plugin
+      '0xm4n/resize.nvim', -- adds commands to resize panes
+      'nvim-tree/nvim-web-devicons', -- nerdfont!
+      'TamaMcGlinn/vim-termhere', --simple terminal QOL
+      "smjonas/inc-rename.nvim", --lsp plugin for renaming variable
+      'basola21/PDFview', -- rendering pdfs in nvim
+      { 'norcalli/nvim-colorizer.lua', config = function() require('colorizer').setup{"*"} end,}, -- preview colors
+      {'NMAC427/guess-indent.nvim', config = function() require('guess-indent').setup {} end,}, -- Detect tabstop and shiftwidth automatically
+      { 'edluffy/hologram.nvim', auto_display = true,}, --image viewer
+      { "denialofsandwich/sudo.nvim", dependencies = { "MunifTanjim/nui.nvim",  },config = true, }, --write restricted files without restart
+      {'akinsho/toggleterm.nvim', version = "*", config = true}, -- terminal toggling and commands
+      { 'nvim-java/nvim-java', config = function() require('java').setup() vim.lsp.enable('jdtls') end, }, --jave QOL
+      { 'RRethy/base16-nvim', config = function() require('matugen').setup() end,}, --colorshceme for noctalia integration
+      { "lervag/vimtex", lazy = false, init = function() vim.g.vimtex_view_method = "zathura" end } -- for latex editing
+    },
   },
   -- Configure any other settings here. See the documentation for more details.
   -- colorscheme that will be used when installing plugins.
-  install = { colorscheme = { "retrobox" } },
+  install = { colorscheme = { "miniautumn" } },
   -- automatically check for plugin updates
   checker = { enabled = true },
-},
-{
-  ui = {
-    -- If you are using a Nerd Font: set icons to an empty table which will use the
-    -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table
-    icons = vim.g.have_nerd_font and {} or {
-      cmd = '⌘',
-      config = '🛠',
-      event = '📅',
-      ft = '📂',
-      init = '⚙',
-      keys = '🗝',
-      plugin = '🔌',
-      runtime = '💻',
-      require = '🌙',
-      source = '📄',
-      start = '🚀',
-      task = '📌',
-      lazy = '💤 ',
-    },
-  },
 })
+-- sync nvim colorscheme with noctalia 
+local theme_ok, matugen = pcall(require, "matugen")
+if theme_ok then
+    matugen.setup()
+end
+
+-- setup lsp
+require("config.lsp")

lazy-lock.json

@@ -0,0 +1,47 @@
+{
+  "PDFview": { "branch": "main", "commit": "972dfcce5c0de578865649940f44bf57a700498d" },
+  "base16-nvim": { "branch": "master", "commit": "190397833e53fdfd5cf400c5baaf1a4e533158e5" },
+  "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "fd": { "branch": "master", "commit": "9d137d358df10c441e51dcacc5899e43a4bee877" },
+  "fzf-lua": { "branch": "main", "commit": "8a79ee54d6216d10b2f153921a12b152be0c1a20" },
+  "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" },
+  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a979821a975897b88493843301950c456a725982" },
+  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "mini.nvim": { "branch": "main", "commit": "439cdcd6992bc9012efd7d8ed7a7b7a0f1fac32a" },
+  "mini.pick": { "branch": "main", "commit": "fe079c2bd894a5ee70b62f23d819620ef40c4949" },
+  "neogit": { "branch": "master", "commit": "d3890fc3cdf0859845a86b2be306bba01458df1a" },
+  "nerdtree-visual-selection": { "branch": "master", "commit": "5214763209629d6652ebf183774a8b94cd2e6df0" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
+  "nvim-dap": { "branch": "master", "commit": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5" },
+  "nvim-java": { "branch": "main", "commit": "602a5f7fa92f9c1d425a2159133ff9de86842f0a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "841c6d4139aedb8a3f2baf30cef5327371385b93" },
+  "nvim-tree.lua": { "branch": "master", "commit": "3d385d3346e4883d60dc37cf642bd47bed78a46e" },
+  "nvim-treesitter": { "branch": "main", "commit": "6620ae1c44dfa8623b22d0cbf873a9e8d073b849" },
+  "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
+  "obsidian.nvim": { "branch": "main", "commit": "6ea8b9d1ce10dd41795f298dd7f4dd3a26887d39" },
+  "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": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
+  "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" },
+  "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-nerdtree-syntax-highlight": { "branch": "master", "commit": "35e70334a2ff6e89b82a145d1ac889e82d1ddb4e" },
+  "vim-signature": { "branch": "master", "commit": "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc" },
+  "vim-termhere": { "branch": "main", "commit": "b66d429dd48b74802f09fd059bc499c253372a1c" },
+  "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
+  "vimtex": { "branch": "master", "commit": "82d2305ff71dfb3bd91602534cc9bb9a195bcb38" },
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
+}

lua/autocommands.lua

@@ -0,0 +1,33 @@
+-- [[dynamically change kitty window opacity when opening and closing]]
+-- Define the target opacities
+local nvim_opacity = "0.85"
+local default_opacity = "0.6"
+-- Function to talk to Kitty
+local function set_kitty_opacity(opacity)
+  -- print("Attempting to set opacity to: " .. opacity)
+  os.execute("kitty @ set-background-opacity " .. opacity)
+end
+-- Set up the autocommands
+local kitty_group = vim.api.nvim_create_augroup("KittyOpacity", { clear = true })
+
+vim.api.nvim_create_autocmd("VimEnter", {
+  group = kitty_group,
+  callback = function()
+    set_kitty_opacity(nvim_opacity)
+  end,
+})
+
+vim.api.nvim_create_autocmd("VimLeave", {
+  group = kitty_group,
+  callback = function()
+    set_kitty_opacity(default_opacity)
+  end,
+})
+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,
+})
+

lua/config/lazy.lua

@@ -15,21 +15,3 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
--- Make sure to setup `mapleader` and `maplocalleader` before
--- loading lazy.nvim so that mappings are correct.
--- This is also a good place to setup other settings (vim.opt)
--- vim.g.mapleader = " "
--- vim.g.maplocalleader = "\\"
-
--- Setup lazy.nvim
-require("lazy").setup({
-  spec = {
-    -- import your plugins
-    { import = "plugins" },
-  },
-  -- Configure any other settings here. See the documentation for more details.
-  -- colorscheme that will be used when installing plugins.
-  install = { colorscheme = { "habamax" } },
-  -- automatically check for plugin updates
-  checker = { enabled = true },
-})

lua/config/lsp.lua

@@ -0,0 +1,47 @@
+-- lsp config
+require('lspconfig')
+local lsp_servers = {
+  'clangd',
+  'pyright',
+  'lua_ls',
+}
+for _, server in ipairs(lsp_servers) do
+  local config = {}
+
+  -- Special settings for Lua
+  if server == 'lua_ls' then
+    config.settings = {
+      Lua = {
+        diagnostics = {
+          -- Tell the language server that 'vim' is a global
+          globals = { 'vim' },
+        },
+        workspace = {
+          -- Make the server aware of Neovim runtime files
+          library = vim.api.nvim_get_runtime_file("", true),
+          checkThirdParty = false,
+        },
+      },
+    }
+  end
+
+  -- Apply the config and enable
+  vim.lsp.config(server, config)
+  vim.lsp.enable(server)
+end
+-- highlight error messages
+vim.diagnostic.config({
+  virtual_text = {
+    prefix = '■',
+    spacing = 4,
+  },
+  -- Show signs in the gutter (left side)
+  signs = true,
+  -- Underline the actual code that has the error
+  underline = true,
+  -- Don't update diagnostics while typing (keeps it less distracting)
+  update_in_insert = true,
+  -- Better looking border for float windows
+  float = { border = "rounded" },
+})
+

lua/keybinds.lua

@@ -0,0 +1,62 @@
+-- move betwwen buffer easier
+vim.keymap.set('n', '<Tab>', ':bnext<CR>')
+vim.keymap.set('n', '<S-Tab>', ':bprev<CR>')
+vim.keymap.set('n', '<leader>x', ':bdelete<CR>')
+
+-- resizing pains with resize.lua shortcut
+vim.keymap.set('n', '<M-Left>', "<cmd>lua require('resize').ResizeLeft()<CR>")
+vim.keymap.set('n', '<M-Right>', "<cmd>lua require('resize').ResizeRight()<CR>")
+vim.keymap.set('n', '<M-Up>', "<cmd>lua require('resize').ResizeUp()<CR>")
+vim.keymap.set('n', '<M-Down>', "<cmd>lua require('resize').ResizeDown()<CR>")
+
+
+
+-- termunal interface shortcuts
+vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
+-- Diagnostic keymaps
+vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
+vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
+-- vim.keymap.set("n", "<leader>a", ":IncRename ", {desc = 'ren[A]me variable under cursor'})
+vim .keymap.set('n','<leader>r','<cmd>TermExec cmd="clear && make"<CR>', { desc = '[r]un make in terminal' })
+vim .keymap .set('n','<leader>n', '<cmd>ToggleTerm direction=vertical name=compile size=70<CR>', { desc = 'open a [n]ew terminal' })
+vim.keymap.set('n','<leader>t', '<cmd>ToggleTerm<CR>', {desc = '[T]oggle all terminals'})
+vim.keymap.set("n", "<leader>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("test_dev.sh\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', '<left>', '<cmd>echo "Use h to move!!"<CR>')
+vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
+vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
+vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
+
+-- Keybinds to make split navigation easier.
+--  Use CTRL+<hjkl> to switch between windows
+--
+--  See `:help wincmd` for a list of all window commands
+vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
+vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
+vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
+vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { 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", "<C-S-h>", "<C-w>H", { desc = "Move window to the left" })
+vim.keymap.set("n", "<C-S-l>", "<C-w>L", { desc = "Move window to the right" })
+vim.keymap.set("n", "<C-S-j>", "<C-w>J", { desc = "Move window to the lower" })
+vim.keymap.set("n", "<C-S-k>", "<C-w>K", { desc = "Move window to the upper" })
+
+vim.keymap.set("n", "<leader>e", "<cmd>NvimTreeToggle<CR>", {desc = 'open [E]xplorer'})

lua/matugen-template.lua

@@ -0,0 +1,37 @@
+ local M = {}
+
+ function M.setup()
+   require('base16-colorscheme').setup {
+     -- Background tones
+     base00 = '{{colors.surface.default.hex}}', -- Default Background
+     base01 = '{{colors.surface_container.default.hex}}', -- Lighter Background (status bars)
+     base02 = '{{colors.surface_container_high.default.hex}}', -- Selection Background
+     base03 = '{{colors.outline.default.hex}}', -- Comments, Invisibles
+     -- Foreground tones
+     base04 = '{{colors.on_surface_variant.default.hex}}', -- Dark Foreground (status bars)
+     base05 = '{{colors.on_surface.default.hex}}', -- Default Foreground
+     base06 = '{{colors.on_surface.default.hex}}', -- Light Foreground
+     base07 = '{{colors.on_background.default.hex}}', -- Lightest Foreground
+     -- Accent colors
+     base08 = '{{colors.error.default.hex}}', -- Variables, XML Tags, Errors
+     base09 = '{{colors.tertiary.default.hex}}', -- Integers, Constants
+     base0A = '{{colors.secondary.default.hex}}', -- Classes, Search Background
+     base0B = '{{colors.primary.default.hex}}', -- Strings, Diff Inserted
+     base0C = '{{colors.tertiary_fixed_dim.default.hex}}', -- Regex, Escape Chars
+     base0D = '{{colors.primary_fixed_dim.default.hex}}', -- Functions, Methods
+     base0E = '{{colors.secondary_fixed_dim.default.hex}}', -- Keywords, Storage
+     base0F = '{{colors.error_container.default.hex}}', -- Deprecated, Embedded Tags
+   }
+ end
+
+ -- Register a signal handler for SIGUSR1 (matugen updates)
+ local signal = vim.uv.new_signal()
+ signal:start(
+   'sigusr1',
+   vim.schedule_wrap(function()
+     package.loaded['matugen'] = nil
+     require('matugen').setup()
+   end)
+ )
+
+ return M

lua/matugen.lua

@@ -0,0 +1,37 @@
+ local M = {}
+
+ function M.setup()
+   require('base16-colorscheme').setup {
+     -- Background tones
+     base00 = '#181212', -- Default Background
+     base01 = '#241e1e', -- Lighter Background (status bars)
+     base02 = '#2f2828', -- Selection Background
+     base03 = '#a08c8b', -- Comments, Invisibles
+     -- Foreground tones
+     base04 = '#d7c1c1', -- Dark Foreground (status bars)
+     base05 = '#ece0df', -- Default Foreground
+     base06 = '#ece0df', -- Light Foreground
+     base07 = '#ece0df', -- Lightest Foreground
+     -- Accent colors
+     base08 = '#ffb4ab', -- Variables, XML Tags, Errors
+     base09 = '#e4c18d', -- Integers, Constants
+     base0A = '#e6bdbb', -- Classes, Search Background
+     base0B = '#ffb3b2', -- Strings, Diff Inserted
+     base0C = '#e4c18d', -- Regex, Escape Chars
+     base0D = '#ffb3b2', -- Functions, Methods
+     base0E = '#e6bdbb', -- Keywords, Storage
+     base0F = '#93000a', -- Deprecated, Embedded Tags
+   }
+ end
+
+ -- Register a signal handler for SIGUSR1 (matugen updates)
+ local signal = vim.uv.new_signal()
+ signal:start(
+   'sigusr1',
+   vim.schedule_wrap(function()
+     package.loaded['matugen'] = nil
+     require('matugen').setup()
+   end)
+ )
+
+ return M

lua/options.lua

@@ -0,0 +1,56 @@
+-- River Rooks nvim config
+
+-- [[setup]]
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
+vim.g.have_nerd_font = true
+
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+
+-- [[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
+
+vim.opt.termguicolors = true -- required for colorizer
+
+--set background color on entering and leaving nvim
+require('autocommands')
+vim.env.PATH = vim.fn.stdpath("data") .. "/mason/bin" .. ":" .. vim.env.PATH
+
+

lua/plugins/lsp.lua

@@ -1,239 +1,30 @@
 return {
-    -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
+  {
-    -- used for completion, annotations and signatures of Neovim apis
+    "neovim/nvim-lspconfig",
-    'folke/lazydev.nvim',
+    dependencies = {
-    ft = 'lua',
+      { "mason-org/mason.nvim", config = true }, -- The "App Store"
-    opts = {
+      { "mason-org/mason-lspconfig.nvim", config = true }, -- The "Bridge"
-      library = {
-        -- Load luvit types when the `vim.uv` word is found
-        { path = '${3rd}/luv/library', words = { 'vim%.uv' } },
     },
   },
   {
-    -- Main LSP Configuration
-    'neovim/nvim-lspconfig',
-    dependencies = {
-      -- Automatically install LSPs and related tools to stdpath for Neovim
-      -- Mason must be loaded before its dependents so we need to set it up here.
-      -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
-      { 'mason-org/mason.nvim', opts = {} },
-      'mason-org/mason-lspconfig.nvim',
-      'WhoIsSethDaniel/mason-tool-installer.nvim',
-
-      -- Useful status updates for LSP.
-      { 'j-hui/fidget.nvim', opts = {} },
-
-      -- Allows extra capabilities provided by blink.cmp
     'saghen/blink.cmp',
+    version = '*', -- Downloads pre-built binaries (fast!)
+    opts = {
+      keymap = {
+      preset = 'none',
+      ['<CR>'] = { 'select_next', 'fallback' },
+      ['<S-CR>'] = { 'select_prev', 'fallback' },
+      ['<Tab>'] = { 'accept', 'fallback' },
+      ['<C-space>'] = { 'show', 'show_documentation', 'hide_documentation' },
       },
-    config = function()
+      sources = {
-      vim.api.nvim_create_autocmd('LspAttach', {
+        default = { 'lsp', 'path', 'snippets', 'buffer' },
-        group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
-        callback = function(event)
-          local map = function(keys, func, desc, mode)
-            mode = mode or 'n'
-            vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
-          end
-
-          -- Rename the variable under your cursor.
-          --  Most Language Servers support renaming across files, etc.
-          map('grn', vim.lsp.buf.rename, '[R]e[n]ame')
-
-          -- Execute a code action, usually your cursor needs to be on top of an error
-          -- or a suggestion from your LSP for this to activate.
-          map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' })
-
-          -- Find references for the word under your cursor.
-          map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-
-          -- Jump to the implementation of the word under your cursor.
-          --  Useful when your language has ways of declaring types without an actual implementation.
-          map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
-
-          -- Jump to the definition of the word under your cursor.
-          --  This is where a variable was first declared, or where a function is defined, etc.
-          --  To jump back, press <C-t>.
-          map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
-
-          -- WARN: This is not Goto Definition, this is Goto Declaration.
-          --  For example, in C this would take you to the header.
-          map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-
-          -- Fuzzy find all the symbols in your current document.
-          --  Symbols are things like variables, functions, types, etc.
-          map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols')
-
-          -- Fuzzy find all the symbols in your current workspace.
-          --  Similar to document symbols, except searches over your entire project.
-          map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols')
-
-          -- Jump to the type of the word under your cursor.
-          --  Useful when you're not sure what type a variable is and you want to see
-          --  the definition of its *type*, not where it was *defined*.
-          map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition')
-
-          -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10)
-          ---@param client vim.lsp.Client
-          ---@param method vim.lsp.protocol.Method
-          ---@param bufnr? integer some lsp support methods only in specific files
-          ---@return boolean
-          local function client_supports_method(client, method, bufnr)
-            if vim.fn.has 'nvim-0.11' == 1 then
-              return client:supports_method(method, bufnr)
-            else
-              return client.supports_method(method, { bufnr = bufnr })
-            end
-          end
-
-          -- The following two autocommands are used to highlight references of the
-          -- word under your cursor when your cursor rests there for a little while.
-          --    See `:help CursorHold` for information about when this is executed
-          --
-          -- When you move your cursor, the highlights will be cleared (the second autocommand).
-          local client = vim.lsp.get_client_by_id(event.data.client_id)
-          if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
-            local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false })
-            vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
-              buffer = event.buf,
-              group = highlight_augroup,
-              callback = vim.lsp.buf.document_highlight,
-            })
-
-            vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
-              buffer = event.buf,
-              group = highlight_augroup,
-              callback = vim.lsp.buf.clear_references,
-            })
-
-            vim.api.nvim_create_autocmd('LspDetach', {
-              group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }),
-              callback = function(event2)
-                vim.lsp.buf.clear_references()
-                vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf }
-              end,
-            })
-          end
-
-          -- The following code creates a keymap to toggle inlay hints in your
-          -- code, if the language server you are using supports them
-          --
-          -- This may be unwanted, since they displace some of your code
-          if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
-            map('<leader>th', function()
-              vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
-            end, '[T]oggle Inlay [H]ints')
-          end
-        end,
-      })
-
-      -- Diagnostic Config
-      -- See :help vim.diagnostic.Opts
-      vim.diagnostic.config {
-        severity_sort = true,
-        float = { border = 'rounded', source = 'if_many' },
-        underline = { severity = vim.diagnostic.severity.ERROR },
-        signs = vim.g.have_nerd_font and {
-          text = {
-            [vim.diagnostic.severity.ERROR] = '󰅚 ',
-            [vim.diagnostic.severity.WARN] = '󰀪 ',
-            [vim.diagnostic.severity.INFO] = '󰋽 ',
-            [vim.diagnostic.severity.HINT] = '󰌶 ',
       },
-        } or {},
+    },
-        virtual_text = {
+  },
-          source = 'if_many',
+  {
-          spacing = 2,
+      'MeanderingProgrammer/render-markdown.nvim',
-          format = function(diagnostic)
+      dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-mini/mini.nvim' },            -- if you use the mini.nvim suite
-            local diagnostic_message = {
+      ---@module 'render-markdown'
-              [vim.diagnostic.severity.ERROR] = diagnostic.message,
-              [vim.diagnostic.severity.WARN] = diagnostic.message,
-              [vim.diagnostic.severity.INFO] = diagnostic.message,
-              [vim.diagnostic.severity.HINT] = diagnostic.message,
-            }
-            return diagnostic_message[diagnostic.severity]
-          end,
-        },
-      }
-
-      -- LSP servers and clients are able to communicate to each other what features they support.
-      --  By default, Neovim doesn't support everything that is in the LSP specification.
-      --  When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
-      --  So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
-      local capabilities = require('blink.cmp').get_lsp_capabilities()
-
-      -- Enable the following language servers
-      --  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
-      --
-      --  Add any additional override configuration in the following tables. Available keys are:
-      --  - cmd (table): Override the default command used to start the server
-      --  - filetypes (table): Override the default list of associated filetypes for the server
-      --  - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
-      --  - settings (table): Override the default settings passed when initializing the server.
-      --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
-      local servers = {
-        clangd = {},
-        -- intelephense = {},
-        -- gopls = {},
-        -- pyright = {},
-        -- rust_analyzer = {},
-        -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
-        --
-        -- Some languages (like typescript) have entire language plugins that can be useful:
-        --    https://github.com/pmizio/typescript-tools.nvim
-        --
-        -- But for many setups, the LSP (`ts_ls`) will work just fine
-        -- ts_ls = {},
-        --
-
-        lua_ls = {
-          -- cmd = { ... },
-          -- filetypes = { ... },
-          -- capabilities = {},
-          settings = {
-            Lua = {
-              completion = {
-                callSnippet = 'Replace',
-              },
-              -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-              -- diagnostics = { disable = { 'missing-fields' } },
-            },
-          },
-        },
-      }
-
-      -- Ensure the servers and tools above are installed
-      --
-      -- To check the current status of installed tools and/or manually install
-      -- other tools, you can run
-      --    :Mason
-      --
-      -- You can press `g?` for help in this menu.
-      --
-      -- `mason` had to be setup earlier: to configure its options see the
-      -- `dependencies` table for `nvim-lspconfig` above.
-      --
-      -- You can add other tools here that you want Mason to install
-      -- for you, so that they are available from within Neovim.
-      local ensure_installed = vim.tbl_keys(servers or {})
-      vim.list_extend(ensure_installed, {
-        'stylua', -- Used to format Lua code
-      })
-      require('mason-tool-installer').setup { ensure_installed = ensure_installed }
-
-      require('mason-lspconfig').setup {
-        ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer)
-        automatic_installation = false,
-        handlers = {
-          function(server_name)
-            local server = servers[server_name] or {}
-            -- This handles overriding only values explicitly passed
-            -- by the server configuration above. Useful when disabling
-            -- certain features of an LSP (for example, turning off formatting for ts_ls)
-            server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
-            require('lspconfig')[server_name].setup(server)
-          end,
-        },
-      }
-    end,
   },
 }

lua/plugins/mini.lua

@@ -29,8 +29,5 @@ return {
 
       require('mini.clue').setup()
 
-      require('mini.pairs').setup()
-
-
     end,
 }

lua/plugins/nerdtree.lua

@@ -0,0 +1,20 @@
+return {
+  'nvim-tree/nvim-tree.lua',
+  dependencies = {
+    'nvim-tree/nvim-web-devicons',
+},
+  config = function()
+    require("nvim-tree").setup({
+      view = {
+        side = "left",
+        width = 30,
+      },
+      actions = {
+        open_file = {
+          -- This is the "open in adjacent pane" equivalent
+          window_picker = { enable = true },
+        },
+      },
+    })
+  end,
+}

lua/plugins/simple.lua

@@ -1,17 +0,0 @@
-return {
-	'soywod/iris.vim', -- unsure
-	'tpope/vim-commentary', -- commenting lines with shortcut 
-	-- 'vimpostor/vim-tpipeline', -- integrate with tmux status-line
-	'kshenoy/vim-signature', -- tag lines
-	'mg979/vim-visual-multi', -- work on multiple lines at once
-	 {'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically
-	  config = function() require('guess-indent').setup {} end,},
-	'obsidian-nvim/obsidian.nvim', -- work with obsidian
-	{ 'edluffy/hologram.nvim', auto_display = true,}, --image viewer
-	'nvim-tree/nvim-web-devicons', -- nerdfont!
- 	'nvim-lualine/lualine.nvim', -- lualine
-	'TamaMcGlinn/vim-termhere', --simple terminal QOL
-	"rktjmp/lush.nvim", -- better theme editing
-	{ "denialofsandwich/sudo.nvim", dependencies = { "MunifTanjim/nui.nvim",  },config = true, }, --write restricted files without restart
-	{'akinsho/toggleterm.nvim', version = "*", config = true} -- terminal toggling and commands
-}

lua/plugins/sql.lua

@@ -1,6 +0,0 @@
-return     {
-    'xemptuous/sqlua.nvim',
-    lazy = true,
-    cmd = 'SQLua',
-    config = function() require('sqlua').setup() end
-}

lua/plugins/store.lua

@@ -1,5 +0,0 @@
-return { 'alex-popov-tech/store.nvim',
-		dependencies = { 'OXY2DEV/markview.nvim' },
-		opts = {},
-		cmd = 'Store',
-	}

lua/plugins/themery.nvim.lua

@@ -7,15 +7,20 @@ return {
   config = function()
     require('themery').setup {
       themes = {
+        'catppuccin-latte',
+				'catppuccin-frappe',
+				'catppuccin-macchiato',
+				'catppuccin-mocha',
+        'noctalia',
         'zellner',
         'zaibatsu',
         'wildcharm',
         'vim',
         'unokai',
         'torte',
-        'tokyonight-storm',
+        -- 'tokyonight-storm',
-        'tokyonight-night',
+        -- 'tokyonight-night',
-        'tokyonight-day',
+        -- 'tokyonight-day',
         'sorbet',
         'slate',
         'shine',

lua/plugins/treesitter.lua

@@ -1,25 +1,34 @@
-return { -- Highlight, edit, and navigate code
+return {
-    'nvim-treesitter/nvim-treesitter',
+  "nvim-treesitter/nvim-treesitter",
-    build = ':TSUpdate',
+  opts = {
-    -- main = 'nvim-treesitter.configs', -- Sets main module to use for opts
+  indent = { enable = true },
-    -- -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
+  highlight = { enable = true },
-    -- opts = {
+  folds = { enable = true },
-    --   ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
+  ensure_installed = {
-    --   -- Autoinstall languages that are not installed
+    "bash",
-    --   auto_install = true,
+    "c",
-    --   highlight = {
+    "diff",
-    --     enable = true,
+    "html",
-    --     -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
+    "javascript",
-    --     --  If you are experiencing weird indenting issues, add the language to
+    "jsdoc",
-    --     --  the list of additional_vim_regex_highlighting and disabled languages for indent.
+    "json",
-    --     additional_vim_regex_highlighting = { 'ruby' },
+    "lua",
-    --   },
+    "luadoc",
-    --   indent = { enable = true, disable = { 'ruby' } },
+    "luap",
-    -- },
+    "markdown",
-    -- -- There are additional nvim-treesitter modules that you can use to interact
+    "markdown_inline",
-    -- -- with nvim-treesitter. You should go explore a few and see what interests you:
+    "printf",
-    -- --
+    "python",
-    -- --    - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod`
+    "query",
-    -- --    - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
+    "regex",
-    -- --    - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
+    "toml",
+    "tsx",
+    "typescript",
+    "vim",
+    "vimdoc",
+    "xml",
+    "yaml",
+  },
 }
+}
+

plugins.lua

@@ -1 +0,0 @@
-lua/plugins/simple.lua