commit b5ed3e0495b2cbf792063ab44489fbcd3da2d808
parent 7285578e30bf4497cb8096d064b3b761ff04dbd3
Author: Andrew <andrewlaack1@gmail.com>
Date: Fri, 22 Nov 2024 21:57:53 -0600
Worked on config
Diffstat:
2 files changed, 51 insertions(+), 44 deletions(-)
diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua
@@ -10,10 +10,14 @@ vim.opt.linebreak = true
vim.opt.clipboard = 'unnamedplus'
vim.g.mapleader = ' '
--- File name search
-vim.api.nvim_set_keymap('n', '<C-p>', ':FzfLua files<CR>', { silent = true })
--- Live grep for text
-vim.api.nvim_set_keymap('n', '<leader>p', ':FzfLua live_grep<CR>', { silent = true })
+-- 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' })
+
+--
+
vim.api.nvim_set_keymap('n', '<leader>v', ':split<CR>', { silent = true })
vim.api.nvim_set_keymap('n', '<leader>h', ':vsplit<CR>', { silent = true })
@@ -29,11 +33,8 @@ vim.cmd('autocmd TermOpen * startinsert')
vim.opt.tabstop = 4
-vim.api.nvim_set_keymap('n', '<leader>n', ':Neotree toggle<CR>', {noremap = true, silent = true})
-
-vim.api.nvim_set_keymap('n', '<leader>d', ':e /home/andrew/gitRepos/toDoList/ToDoList.md<CR>', {noremap = true, silent = true})
+vim.api.nvim_set_keymap('n', '<leader>n', ':Explore<CR>', {noremap = true, silent = true})
-vim.api.nvim_set_keymap('n', '<leader>i', ':cd /home/andrew/gitRepos/notes <CR>:e /home/andrew/gitRepos/notes/index.md<CR>', {noremap = true, silent = true})
-- Normal mode and visual mode mappings
@@ -74,6 +75,9 @@ 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})
+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 })
+
-- Insert latex for markdown
@@ -87,11 +91,6 @@ vim.cmd("let g:wiki_root = '~/gitRepos/notes'")
-vim.api.nvim_set_keymap('n', '<leader>b', ':WikiGraphFindBacklinks<CR>', {noremap = true, silent = true})
-vim.api.nvim_set_keymap('n', '<leader>g', ':WikiGraphRelated<CR>', {noremap = true, silent = true})
-
-
-
-- LSP Config
@@ -116,8 +115,8 @@ 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 })
--- From terminal mode return to normal mode and then return to file
-vim.api.nvim_set_keymap('t', '<C-r>', '<C-\\><C-n><C-^>', { 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 })
@@ -126,3 +125,13 @@ vim.o.splitbelow = true
vim.o.splitright = true
vim.o.relativenumber = true
vim.o.statuscolumn = "%s %l %r"
+
+-- stops showing stupid already open message
+vim.opt.swapfile = false
+
+-- resize windows
+
+vim.keymap.set("n", "=", [[<cmd>vertical resize +5<cr>]]) -- make the window biger vertically
+vim.keymap.set("n", "-", [[<cmd>vertical resize -5<cr>]]) -- make the window smaller vertically
+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 -
diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua
@@ -11,22 +11,26 @@ end
local packer_bootstrap = ensure_packer()
-
-
-
+-- package manager
return require('packer').startup(function(use)
use 'wbthomason/packer.nvim'
-use 'lervag/wiki.vim'
-use 'windwp/nvim-autopairs'
+-- tex compile features
+use 'lervag/vimtex'
-local npairs = require('nvim-autopairs')
+-- NOT NECESSARY WITH MARKVIEW (simplifies proper links)
+-- wiki.vim navigation for notes
+-- use 'lervag/wiki.vim'
--- enable autopairs
+-- autopairs of {[()]}
+use 'windwp/nvim-autopairs'
+local npairs = require('nvim-autopairs')
npairs.setup({})
+-- theme
use { "catppuccin/nvim", as = "catppuccin" }
+-- lsp
use {
'VonHeikemen/lsp-zero.nvim',
branch = 'v3.x',
@@ -42,33 +46,27 @@ use {
"williamboman/mason-lspconfig.nvim",
}
-use { "ibhagwan/fzf-lua",
- -- optional for icon support
- requires = { "nvim-tree/nvim-web-devicons" }
-}
-
-
+-- fuzzy finding
use {
- "nvim-neo-tree/neo-tree.nvim",
- branch = "v3.x",
- requires = {
- "nvim-lua/plenary.nvim",
- "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
- "MunifTanjim/nui.nvim",
- -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
- }
- }
-
-use = { "junegunn/fzf", run = "./install --bin" }
-
+ 'nvim-telescope/telescope.nvim', tag = '0.1.8',
+-- or , branch = '0.1.x',
+ requires = { {'nvim-lua/plenary.nvim'} }
+}
- if packer_bootstrap then
- require('packer').sync()
- end
+-- beautify markdown in vim
+use 'OXY2DEV/markview.nvim'
+-- preview in browser
+use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, })
-use = {'nvim-tree/nvim-web-devicons'}
+-- needed for icons for telescope
+use 'nvim-tree/nvim-web-devicons'
+-- Tree sitter (syntax highlighting)
+use 'nvim-treesitter/nvim-treesitter'
+if packer_bootstrap then
+ require('packer').sync()
+end
end)
