Skip to content

Commit 533d67a

Browse files
committed
update neovim config
- refactor: to use lazy.vim plugin manager - fix: issue with netrw and vim-tmux-navigator - conflicting keybinding <C-L> not working as expected - see: christoomey/vim-tmux-navigator#189
1 parent d8d4a0f commit 533d67a

22 files changed

+112
-350
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-- fix for: https://github.com/christoomey/vim-tmux-navigator/issues/189
2+
vim.keymap.set('n', '<c-l>', ':TmuxNavigateRight<CR>', {
3+
silent = true, buffer = true
4+
})

commons/dev-environment/.config/nvim/after/plugin/fugitive.lua

-1
This file was deleted.

commons/dev-environment/.config/nvim/after/plugin/harpoon.lua

-10
This file was deleted.

commons/dev-environment/.config/nvim/after/plugin/lsp.lua

-10
This file was deleted.

commons/dev-environment/.config/nvim/after/plugin/telescope.lua

-6
This file was deleted.

commons/dev-environment/.config/nvim/after/plugin/treesitter.lua

-41
This file was deleted.

commons/dev-environment/.config/nvim/after/plugin/undotree.lua

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"catppuccin": { "branch": "main", "commit": "c2034f7b549152e5cc757820426341ea5000bc7a" },
3+
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
4+
"nvim-treesitter": { "branch": "master", "commit": "b52b298669f0813bbfbc12d07280c9e2f6f17ebc" },
5+
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
6+
"telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
7+
"vim-maximizer": { "branch": "master", "commit": "2e54952fe91e140a2e69f35f22131219fcd9c5f1" },
8+
"vim-tmux-navigator": { "branch": "master", "commit": "38b1d0402c4600543281dc85b3f51884205674b6" }
9+
}

commons/dev-environment/.config/nvim/lua/sizm/colorscheme.lua

-45
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vim.g.netrw_liststyle = 3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
require('sizm.globals')
12
require('sizm.options')
2-
require('sizm.remap')
3-
require('sizm.colorscheme')
3+
require('sizm.mappings')
4+
require('sizm.lazy')
5+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
2+
if not vim.loop.fs_stat(lazypath) then
3+
vim.fn.system({
4+
'git',
5+
'clone',
6+
'--filter=blob:none',
7+
'https://github.com/folke/lazy.nvim.git',
8+
'--branch=stable', -- latest stable release
9+
lazypath,
10+
})
11+
end
12+
vim.opt.rtp:prepend(lazypath)
13+
14+
require('lazy').setup('sizm.plugins')
15+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
local keymap = vim.keymap -- for conciseness
2+
3+
-- remap <leader> to Space Bar key
4+
vim.g.mapleader = ' '
5+
6+
-- file explorer
7+
keymap.set('n', '<leader>fe', vim.cmd.Ex)
8+
9+
-- window management
10+
keymap.set('n', '<leader>sv', '<C-w>v') -- split window vertically
11+
keymap.set('n', '<leader>sh', '<C-w>s') -- split window horizontally
12+
keymap.set('n', '<leader>se', '<C-w>=') -- make split windows equal width & height
13+
keymap.set('n', '<leader>sx', ':close<CR>') -- close current split window

commons/dev-environment/.config/nvim/lua/sizm/packer.lua

-58
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
return {
2+
'catppuccin/nvim',
3+
name = 'catppuccin',
4+
lazy = false,
5+
priority = 1000,
6+
config = function()
7+
-- load colorscheme on launch
8+
vim.cmd([[colorscheme catppuccin]])
9+
end
10+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- for plugins that do not require any configuration
2+
3+
return {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
return {
2+
'nvim-telescope/telescope.nvim', tag = '0.1.5',
3+
dependencies = { 'nvim-lua/plenary.nvim' },
4+
config = function()
5+
local builtin = require('telescope.builtin')
6+
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
7+
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
8+
vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
9+
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
10+
end
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
return {
2+
'nvim-treesitter/nvim-treesitter',
3+
build = ':TSUpdate',
4+
config = function ()
5+
local configs = require('nvim-treesitter.configs')
6+
7+
configs.setup({
8+
ensure_installed = {
9+
'c', 'lua', 'vim', 'vimdoc', 'query',
10+
'html', 'css', 'javascript', 'typescript',
11+
'bash', 'python', 'ruby', 'go', 'rust',
12+
'markdown', 'yaml', 'json', 'jsonc', 'csv'
13+
},
14+
sync_install = false,
15+
highlight = { enable = true },
16+
indent = { enable = true },
17+
})
18+
end
19+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
return {
2+
'szw/vim-maximizer',
3+
keys = {
4+
{ '<leader>z', '<cmd>MaximizerToggle<CR>' }
5+
}
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
return {
2+
"christoomey/vim-tmux-navigator",
3+
cmd = {
4+
"TmuxNavigateLeft",
5+
"TmuxNavigateDown",
6+
"TmuxNavigateUp",
7+
"TmuxNavigateRight",
8+
"TmuxNavigatePrevious",
9+
},
10+
keys = {
11+
{ "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
12+
{ "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
13+
{ "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
14+
{ "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
15+
{ "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
16+
},
17+
}

commons/dev-environment/.config/nvim/lua/sizm/remap.lua

-2
This file was deleted.

0 commit comments

Comments
 (0)