commit 8882e17db3f66773170a57a3daa9cee79253752a
parent 4b1999d7f8273c746fd2e0a4e56af009985faff3
Author: Andrew <andrewlaack1@gmail.com>
Date: Sat, 23 Nov 2024 21:14:51 -0600
Final... please
Diffstat:
3 files changed, 146 insertions(+), 146 deletions(-)
diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua
@@ -1,4 +1,4 @@
-vim.opt.spelllang = { 'en_us' }
+vim.opt.spelllang = { "en_us" }
-- here you can setup the language servers
-- vim.cmd.colorscheme "catppuccin"
@@ -7,119 +7,127 @@ vim.opt.conceallevel = 1 -- or 2
vim.opt.number = true
vim.opt.shiftwidth = 0
vim.opt.linebreak = true
-vim.opt.clipboard = 'unnamedplus'
-vim.g.mapleader = ' '
+vim.opt.clipboard = "unnamedplus"
+vim.g.mapleader = " "
-- Telescope STUFF
-local builtin = require('telescope.builtin')
-vim.keymap.set('n', '<leader>f', builtin.find_files, { desc = 'Telescope find files' })
-vim.keymap.set('n', '<leader>F', builtin.live_grep, { desc = 'Telescope live grep' })
-vim.keymap.set('n', '<leader>b', builtin.buffers, { desc = 'Telescope buffers' })
+local builtin = require("telescope.builtin")
+vim.keymap.set("n", "<leader>f", builtin.find_files, { desc = "Telescope find files" })
+vim.keymap.set("n", "<leader>F", builtin.live_grep, { desc = "Telescope live grep" })
+vim.keymap.set("n", "<leader>b", builtin.buffers, { desc = "Telescope buffers" })
+vim.keymap.set("n", "<leader>m", builtin.marks, { desc = "Telescope marks" })
--
-
-vim.api.nvim_set_keymap('n', '<leader>v', ':split<CR>', { silent = true })
-vim.api.nvim_set_keymap('n', '<leader>h', ':vsplit<CR>', { silent = true })
-vim.api.nvim_set_keymap('n', '<leader><left>', '<C-w>h', { silent = true })
-vim.api.nvim_set_keymap('n', '<leader><up>', '<C-w>k', { silent = true })
-vim.api.nvim_set_keymap('n', '<leader><down>', '<C-w>j', { silent = true })
-vim.api.nvim_set_keymap('n', '<leader><right>', '<C-w>l', { 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')
+vim.api.nvim_set_keymap("n", "<leader>v", ":split<CR>", { silent = true })
+vim.api.nvim_set_keymap("n", "<leader>h", ":vsplit<CR>", { silent = true })
+vim.api.nvim_set_keymap("n", "<leader><left>", "<C-w>h", { silent = true })
+vim.api.nvim_set_keymap("n", "<leader><up>", "<C-w>k", { silent = true })
+vim.api.nvim_set_keymap("n", "<leader><down>", "<C-w>j", { silent = true })
+vim.api.nvim_set_keymap("n", "<leader><right>", "<C-w>l", { 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")
vim.opt.tabstop = 4
-
-
-vim.api.nvim_set_keymap('n', '<leader>n', ':Explore<CR>', {noremap = true, silent = true})
-
+vim.api.nvim_set_keymap("n", "<leader>n", ":Explore<CR>", { noremap = true, silent = true })
-- Normal mode and visual mode mappings
-vim.api.nvim_set_keymap('n', '<C-Down>', '5j', {noremap = true, silent = true})
-vim.api.nvim_set_keymap('n', '<C-Up>', '5k', {noremap = true, silent = true})
-vim.api.nvim_set_keymap('v', '<C-Down>', '5j', {noremap = true, silent = true})
-vim.api.nvim_set_keymap('v', '<C-Up>', '5k', {noremap = true, silent = true})
+vim.api.nvim_set_keymap("n", "<C-Down>", "5j", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<C-Up>", "5k", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("v", "<C-Down>", "5j", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("v", "<C-Up>", "5k", { noremap = true, silent = true })
-- Insert mode mappings
-vim.api.nvim_set_keymap('i', '<C-Down>', '<C-O>5j', {noremap = true})
-vim.api.nvim_set_keymap('i', '<C-Up>', '<C-O>5k', {noremap = true})
+vim.api.nvim_set_keymap("i", "<C-Down>", "<C-O>5j", { noremap = true })
+vim.api.nvim_set_keymap("i", "<C-Up>", "<C-O>5k", { noremap = true })
-- Operator-pending mode mappings
-vim.api.nvim_set_keymap('o', '<C-Down>', ':<C-U>5j<CR>', {noremap = true, silent = true})
-vim.api.nvim_set_keymap('o', '<C-Up>', ':<C-U>5k<CR>', {noremap = true, silent = true})
-
-
-
-vim.api.nvim_set_keymap('i', '<C-e>', '<Esc>', {noremap = true})
-vim.api.nvim_set_keymap('x', '<C-e>', ':normal! j<CR>', {noremap = true})
-
-
-vim.api.nvim_set_keymap('n', '<C-Right>', '<S-Right>', { noremap = true })
-vim.api.nvim_set_keymap('i', '<C-Right>', '<S-Right>', { noremap = true })
-vim.api.nvim_set_keymap('c', '<C-Right>', '<S-Right>', { noremap = true })
-vim.api.nvim_set_keymap('v', '<C-Right>', '<S-Right>', { noremap = true })
-
-vim.api.nvim_set_keymap('n', '<C-Left>', '<S-Left>', { noremap = true })
-vim.api.nvim_set_keymap('i', '<C-Left>', '<S-Left>', { noremap = true })
-vim.api.nvim_set_keymap('c', '<C-Left>', '<S-Left>', { noremap = true })
-vim.api.nvim_set_keymap('v', '<C-Left>', '<S-Left>', { noremap = true })
-
-vim.api.nvim_set_keymap('n', '<Leader>s', ':set spell<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', '<Leader>S', ':set nospell<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap("o", "<C-Down>", ":<C-U>5j<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("o", "<C-Up>", ":<C-U>5k<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("i", "<C-e>", "<Esc>", { noremap = true })
+vim.api.nvim_set_keymap("x", "<C-e>", ":normal! j<CR>", { noremap = true })
-vim.api.nvim_set_keymap('n', 'rf', '<C-^>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<C-Right>", "<S-Right>", { noremap = true })
+vim.api.nvim_set_keymap("i", "<C-Right>", "<S-Right>", { noremap = true })
+vim.api.nvim_set_keymap("c", "<C-Right>", "<S-Right>", { noremap = true })
+vim.api.nvim_set_keymap("v", "<C-Right>", "<S-Right>", { noremap = true })
-vim.api.nvim_set_keymap('n', 'gf', ':e <cfile><CR>', {noremap = true, silent = true})
+vim.api.nvim_set_keymap("n", "<C-Left>", "<S-Left>", { noremap = true })
+vim.api.nvim_set_keymap("i", "<C-Left>", "<S-Left>", { noremap = true })
+vim.api.nvim_set_keymap("c", "<C-Left>", "<S-Left>", { noremap = true })
+vim.api.nvim_set_keymap("v", "<C-Left>", "<S-Left>", { noremap = true })
-vim.api.nvim_set_keymap('n', 'b<Right>', ':bn<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'b<Left>', ':bp<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<Leader>s", ":set spell<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<Leader>S", ":set nospell<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "rf", "<C-^>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "gf", ":e <cfile><CR>", { noremap = true, silent = true })
-- Insert latex for markdown
-vim.api.nvim_set_keymap('i', '<C-l>', '$<left>$', { noremap = true })
+vim.api.nvim_set_keymap("i", "<C-l>", "$<left>$", { noremap = true })
--Bold for markdown
-vim.api.nvim_set_keymap('i', '<C-b>', '**<left><left>**', { noremap = true })
-
-
-vim.cmd("let g:wiki_root = '~/gitRepos/notes'")
-
-
+vim.api.nvim_set_keymap("i", "<C-b>", "**<left><left>**", { noremap = true })
+-- vim.cmd("let g:wiki_root = '~/gitRepos/notes'")
-- LSP Config
-
-
-- LSP Config for Tab navigation
-- LSP Config for Tab navigation
-vim.api.nvim_set_keymap('i', '<TAB>', 'pumvisible() ? "\\<C-n>" : "\\<TAB>"', { expr = true, noremap = true, silent = true })
-vim.api.nvim_set_keymap('i', '<S-TAB>', 'pumvisible() ? "\\<C-p>" : "\\<S-TAB>"', { expr = true, noremap = true, silent = true })
+vim.api.nvim_set_keymap(
+ "i",
+ "<TAB>",
+ 'pumvisible() ? "\\<C-n>" : "\\<TAB>"',
+ { expr = true, noremap = true, silent = true }
+)
+vim.api.nvim_set_keymap(
+ "i",
+ "<S-TAB>",
+ 'pumvisible() ? "\\<C-p>" : "\\<S-TAB>"',
+ { expr = true, noremap = true, silent = true }
+)
-- Prevent Up/Down arrows from interacting with LSP completion menu
-vim.api.nvim_set_keymap('i', '<Up>', 'pumvisible() ? "\\<C-e>\\<Up>" : "\\<Up>"', { expr = true, noremap = true, silent = true })
-vim.api.nvim_set_keymap('i', '<Down>', 'pumvisible() ? "\\<C-e>\\<Down>" : "\\<Down>"', { expr = true, noremap = true, silent = true })
-
+vim.api.nvim_set_keymap(
+ "i",
+ "<Up>",
+ 'pumvisible() ? "\\<C-e>\\<Up>" : "\\<Up>"',
+ { expr = true, noremap = true, silent = true }
+)
+vim.api.nvim_set_keymap(
+ "i",
+ "<Down>",
+ 'pumvisible() ? "\\<C-e>\\<Down>" : "\\<Down>"',
+ { expr = true, noremap = true, silent = true }
+)
+
+-- TABS
-- new tab
-vim.keymap.set('n', '<C-t>', ':tabnew<CR>', { noremap = true, silent = true })
-
--- Map Ctrl-Tab to go to the next tab
-vim.keymap.set('n', '<Tab>', ':tabnext<CR>', { noremap = true, silent = true })
-
--- Map Ctrl-Shift-Tab to go to the previous tab
-vim.keymap.set('n', '<S-Tab>', ':tabprevious<CR>', { noremap = true, silent = true })
+vim.keymap.set("n", "<C-t>", ":tabnew<CR>", { noremap = true, silent = true })
+-- Map Tab to go to the next tab
+vim.keymap.set("n", "<Tab>", ":tabnext<CR>", { noremap = true, silent = true })
+-- Map Shift-Tab to go to the previous tab
+vim.keymap.set("n", "<S-Tab>", ":tabprevious<CR>", { noremap = true, silent = true })
--- From terminal mode return to normal mode
-vim.api.nvim_set_keymap('t', '<C-r>', '<C-\\><C-n>', { noremap = true, silent = true })
+-- close tab
+-- vim.keymap.set('n', '<C-w>', ':tabclose<CR>', { noremap = true, silent = true })
+--
+-- From terminal mode return to normal mode
+vim.api.nvim_set_keymap("t", "<C-r>", "<C-\\><C-n>", { noremap = true, silent = true })
-vim.keymap.set('v', 'y', 'ygv<esc>', { noremap = true, silent = true })
+vim.keymap.set("v", "y", "ygv<esc>", { noremap = true, silent = true })
vim.o.splitbelow = true
vim.o.splitright = true
@@ -136,3 +144,8 @@ vim.keymap.set("n", "-", [[<cmd>vertical resize -5<cr>]]) -- make the window sma
vim.keymap.set("n", "+", [[<cmd>horizontal resize +2<cr>]]) -- make the window bigger horizontally by pressing shift and =
vim.keymap.set("n", "_", [[<cmd>horizontal resize -2<cr>]]) -- make the window smaller horizontally by pressing shift and -
+-- buffer navigation
+
+
+vim.keymap.set("n", "b<Right>", ":bn<CR>", { noremap = true, silent = true }) -- b + Right Arrow for next buffer
+vim.keymap.set("n", "b<Left>", ":bp<CR>", { noremap = true, silent = true }) -- b + Left Arrow for previous buffer
diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua
@@ -1,9 +1,9 @@
local ensure_packer = function()
local fn = vim.fn
- local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim'
+ local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
if fn.empty(fn.glob(install_path)) > 0 then
- fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path })
- vim.cmd [[packadd packer.nvim]]
+ fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
+ vim.cmd([[packadd packer.nvim]])
return true
end
return false
@@ -12,50 +12,46 @@ end
local packer_bootstrap = ensure_packer()
-- package manager
-return require('packer').startup(function(use)
- use 'wbthomason/packer.nvim'
+return require("packer").startup(function(use)
+ use("wbthomason/packer.nvim")
-- tex compile features
- use 'lervag/vimtex'
-
- -- NOT NECESSARY WITH MARKVIEW (simplifies proper links)
- -- wiki.vim navigation for notes
- -- use 'lervag/wiki.vim'
+ use("lervag/vimtex")
-- autopairs of {[()]}
- use 'windwp/nvim-autopairs'
- local npairs = require('nvim-autopairs')
+ use("windwp/nvim-autopairs")
+ local npairs = require("nvim-autopairs")
npairs.setup({})
-- theme
- use { "catppuccin/nvim", as = "catppuccin" }
+ use({ "catppuccin/nvim", as = "catppuccin" })
-- lsp
- use {
- 'VonHeikemen/lsp-zero.nvim',
- branch = 'v3.x',
+ use({
+ "VonHeikemen/lsp-zero.nvim",
+ branch = "v3.x",
requires = {
- { 'neovim/nvim-lspconfig' },
- { 'hrsh7th/nvim-cmp' },
- { 'hrsh7th/cmp-nvim-lsp' },
- { 'L3MON4D3/LuaSnip' },
- }
- }
- use {
+ { "neovim/nvim-lspconfig" },
+ { "hrsh7th/nvim-cmp" },
+ { "hrsh7th/cmp-nvim-lsp" },
+ { "L3MON4D3/LuaSnip" },
+ },
+ })
+ use({
"williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim",
- }
-
+ })
-- fuzzy finding
- use {
- 'nvim-telescope/telescope.nvim', tag = '0.1.8',
+ use({
+ "nvim-telescope/telescope.nvim",
+ tag = "0.1.8",
-- or , branch = '0.1.x',
- requires = { { 'nvim-lua/plenary.nvim' } }
- }
+ requires = { { "nvim-lua/plenary.nvim" } },
+ })
-- beautify markdown in vim
- use 'OXY2DEV/markview.nvim'
+ use("OXY2DEV/markview.nvim")
-- preview in browser
use({
@@ -63,54 +59,40 @@ return require('packer').startup(function(use)
run = "cd app && npm install",
setup = function()
vim.g.mkdp_filetypes = {
- "markdown" }
+ "markdown",
+ }
end,
ft = { "markdown" },
})
-- needed for icons for telescope
- use 'nvim-tree/nvim-web-devicons'
+ use("nvim-tree/nvim-web-devicons")
-- Tree sitter (syntax highlighting)
- use 'nvim-treesitter/nvim-treesitter'
-
- -- formatting
-
- use 'stevearc/conform.nvim'
- require("conform").setup({
- formatters_by_ft = {
- lua = { "stylua" },
- python = { "black" },
- cs = {"csharpier"},
- javascript = {"prettier"}
-
- },
- })
-
-require("conform").setup({
- format_on_save = {
- timeout_ms = 500,
- lsp_format = "fallback",
- },
-})
-
+ use("nvim-treesitter/nvim-treesitter")
-- status bar
- use {
- 'nvim-lualine/lualine.nvim',
- requires = { 'nvim-tree/nvim-web-devicons', opt = true }
- }
+ use({
+ "nvim-lualine/lualine.nvim",
+ requires = { "nvim-tree/nvim-web-devicons", opt = true },
+ })
- require('lualine').setup {
+ require("lualine").setup({
options = {
- theme = "catppuccin"
+ theme = "catppuccin",
-- ... the rest of your lualine config
- }
- }
-
+ },
+ })
+ use({
+ "kylechui/nvim-surround",
+ tag = "*", -- Use for stability; omit to use `main` branch for the latest features
+ config = function()
+ require("nvim-surround").setup({})
+ end,
+ })
if packer_bootstrap then
- require('packer').sync()
+ require("packer").sync()
end
end)
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua
@@ -121,11 +121,6 @@ _G.packer_plugins = {
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/mason.nvim",
url = "https://github.com/williamboman/mason.nvim"
},
- ["null-ls.nvim"] = {
- loaded = true,
- path = "/home/andrew/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
- url = "https://github.com/jose-elias-alvarez/null-ls.nvim"
- },
["nvim-autopairs"] = {
loaded = true,
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
@@ -141,6 +136,12 @@ _G.packer_plugins = {
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
url = "https://github.com/neovim/nvim-lspconfig"
},
+ ["nvim-surround"] = {
+ config = { "\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0" },
+ loaded = true,
+ path = "/home/andrew/.local/share/nvim/site/pack/packer/start/nvim-surround",
+ url = "https://github.com/kylechui/nvim-surround"
+ },
["nvim-treesitter"] = {
loaded = true,
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
@@ -178,6 +179,10 @@ time([[Defining packer_plugins]], false)
time([[Setup for markdown-preview.nvim]], true)
try_loadstring("\27LJ\2\n=\0\0\2\0\4\0\0056\0\0\0009\0\1\0005\1\3\0=\1\2\0K\0\1\0\1\2\0\0\rmarkdown\19mkdp_filetypes\6g\bvim\0", "setup", "markdown-preview.nvim")
time([[Setup for markdown-preview.nvim]], false)
+-- Config for: nvim-surround
+time([[Config for nvim-surround]], true)
+try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0", "config", "nvim-surround")
+time([[Config for nvim-surround]], false)
vim.cmd [[augroup packer_load_aucmds]]
vim.cmd [[au!]]
-- Filetype lazy-loads
