commit 7285578e30bf4497cb8096d064b3b761ff04dbd3
parent 1c9ee8d9fffadcaf63e005906c38de1bd4fbb47d
Author: Andrew <andrewlaack1@gmail.com>
Date: Fri, 22 Nov 2024 01:49:13 -0600
Changed git config
Diffstat:
4 files changed, 65 insertions(+), 24 deletions(-)
diff --git a/init.lua b/init.lua
@@ -1,3 +1,5 @@
require("core.keymaps")
require("core.plugins")
require("core.lsp_config")
+
+vim.cmd('colorscheme catppuccin-mocha')
diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua
@@ -1,7 +1,7 @@
vim.opt.spelllang = { 'en_us' }
-- here you can setup the language servers
-vim.cmd.colorscheme "catppuccin"
+-- vim.cmd.colorscheme "catppuccin"
vim.opt.conceallevel = 1 -- or 2
vim.opt.number = true
@@ -21,13 +21,16 @@ 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('i', '<expr> <TAB>', 'pumvisible() ? "<C-y>" : "<TAB>"', { silent = true })
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>i', ':cd /home/andrew/gitRepos/notes <CR>:e /home/andrew/gitRepos/notes/index.md<CR>', {noremap = true, silent = true})
@@ -89,8 +92,37 @@ vim.api.nvim_set_keymap('n', '<leader>g', ':WikiGraphRelated<CR>', {noremap = tr
+-- 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 })
+
+-- 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 })
+
+
+-- 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 })
+-- 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 })
+vim.keymap.set('v', 'y', 'ygv<esc>', { noremap = true, silent = true })
+vim.o.splitbelow = true
+vim.o.splitright = true
+vim.o.relativenumber = true
+vim.o.statuscolumn = "%s %l %r"
diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua
@@ -25,7 +25,6 @@ local npairs = require('nvim-autopairs')
-- enable autopairs
npairs.setup({})
-use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, })
use { "catppuccin/nvim", as = "catppuccin" }
use {
@@ -50,6 +49,17 @@ use { "ibhagwan/fzf-lua",
+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" }
@@ -58,7 +68,7 @@ use = { "junegunn/fzf", run = "./install --bin" }
end
-
+use = {'nvim-tree/nvim-web-devicons'}
end)
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua
@@ -49,8 +49,8 @@ local function save_profiles(threshold)
end
time([[Luarocks path setup]], true)
-local package_path_str = "/home/andrew/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/andrew/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/andrew/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/andrew/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/home/andrew/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+local package_path_str = "/home/andrew/.cache/nvim/packer_hererocks/2.1.1713484068/share/lua/5.1/?.lua;/home/andrew/.cache/nvim/packer_hererocks/2.1.1713484068/share/lua/5.1/?/init.lua;/home/andrew/.cache/nvim/packer_hererocks/2.1.1713484068/lib/luarocks/rocks-5.1/?.lua;/home/andrew/.cache/nvim/packer_hererocks/2.1.1713484068/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/andrew/.cache/nvim/packer_hererocks/2.1.1713484068/lib/lua/5.1/?.so"
if not string.find(package.path, package_path_str, 1, true) then
package.path = package.path .. ';' .. package_path_str
end
@@ -99,13 +99,6 @@ _G.packer_plugins = {
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim",
url = "https://github.com/VonHeikemen/lsp-zero.nvim"
},
- ["markdown-preview.nvim"] = {
- loaded = false,
- needs_bufread = false,
- only_cond = false,
- path = "/home/andrew/.local/share/nvim/site/pack/packer/opt/markdown-preview.nvim",
- url = "https://github.com/iamcco/markdown-preview.nvim"
- },
["mason-lspconfig.nvim"] = {
loaded = true,
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
@@ -116,6 +109,16 @@ _G.packer_plugins = {
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/mason.nvim",
url = "https://github.com/williamboman/mason.nvim"
},
+ ["neo-tree.nvim"] = {
+ loaded = true,
+ path = "/home/andrew/.local/share/nvim/site/pack/packer/start/neo-tree.nvim",
+ url = "https://github.com/nvim-neo-tree/neo-tree.nvim"
+ },
+ ["nui.nvim"] = {
+ loaded = true,
+ path = "/home/andrew/.local/share/nvim/site/pack/packer/start/nui.nvim",
+ url = "https://github.com/MunifTanjim/nui.nvim"
+ },
["nvim-autopairs"] = {
loaded = true,
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
@@ -141,6 +144,11 @@ _G.packer_plugins = {
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/packer.nvim",
url = "https://github.com/wbthomason/packer.nvim"
},
+ ["plenary.nvim"] = {
+ loaded = true,
+ path = "/home/andrew/.local/share/nvim/site/pack/packer/start/plenary.nvim",
+ url = "https://github.com/nvim-lua/plenary.nvim"
+ },
["wiki.vim"] = {
loaded = true,
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/wiki.vim",
@@ -149,17 +157,6 @@ _G.packer_plugins = {
}
time([[Defining packer_plugins]], false)
--- Setup for: markdown-preview.nvim
-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)
-vim.cmd [[augroup packer_load_aucmds]]
-vim.cmd [[au!]]
- -- Filetype lazy-loads
-time([[Defining lazy-load filetype autocommands]], true)
-vim.cmd [[au FileType markdown ++once lua require("packer.load")({'markdown-preview.nvim'}, { ft = "markdown" }, _G.packer_plugins)]]
-time([[Defining lazy-load filetype autocommands]], false)
-vim.cmd("augroup END")
_G._packer.inside_compile = false
if _G._packer.needs_bufread == true then
