Compare commits

..

14 Commits

7 changed files with 78 additions and 52 deletions

View File

@@ -36,6 +36,7 @@ The **Leader Key** is set to `Space`.
### Navigation & Searching
| Action | Keybinding | Description |
| :--- | :--- | :--- |
| **Dashboard** | `<leader>;` | Open the MzansiVim Dasboard. |
| **File Explorer** | `<leader>cd` | Open the built-in Netrw explorer. |
| **Find Files** | `<leader>ff` | Fuzzy find files in your project. |
| **Live Grep** | `<leader>fg` | Search for specific text across all files. |
@@ -55,7 +56,7 @@ The **Leader Key** is set to `Space`.
| **Hover Docs** | `K` | Display documentation for the symbol under cursor. |
| **Go to Definition**| `gd` | Jump to the source code of a function/variable. |
| **Code Actions** | `<leader>ca` | Show available fixes or refactors. |
| **Align File** | `<leader>rn` | Auto align file. |
| **Align File** | `<leader>af` | Auto align file. |
| **References** | `gr` | List all places where a symbol is used. |
| **Rename** | `<leader>rn` | Rename all occurrences of the symbol. |
@@ -95,9 +96,9 @@ To ensure all plugins (LSP, Tree-sitter, and Telescope) function correctly, plea
* **Neovim** (v0.10+ recommended)
* **Git** (For cloning the repo and managing plugins)
* **Tree-sitter & Tree-sitter-cli** (For syntax highlighting)
* **Tree-sitter-cli** (For syntax highlighting)
* **Ripgrep** (Required for Telescope live grep)
* **Node.js & npm** (Required for various LSP servers like `html` and `eslint`)
* **Node & NPM** (Required for various LSP servers like `html` and `eslint`)
* **Go** (Required for certain internal tools)
For the best results, we recommend you install and use the Ghostty terminal with the following configuration:
@@ -117,13 +118,14 @@ Depending on whether you have an existing setup, follow the appropriate step bel
**For a Fresh Install:**
If you have never configured Neovim, create the configuration folder:
```bash
mkdir -p ~/.config/nvim
mkdir ~/.config/nvim
```
**For an Existing Setup:**
If you have never configured Neovim, create the configuration folder:
If you have configured Neovim already, create a backup folder:
```bash
mv ~/.config/nvim ~/.config/nvim.bak
mkdir ~/.config/nvim
```
#### 2. Clone the Repository
@@ -131,7 +133,7 @@ Clone the Mzansi Vim configuration into your config folder:
```bash
cd ~/.config/nvim
git clone https://git.mzansi-innovation-hub.co.za/yaso_meth/mzansi_vim.git
git clone https://git.mzansi-innovation-hub.co.za/yaso_meth/mzansi_vim.git .
```
#### 3. Initialize

View File

@@ -11,11 +11,13 @@
"harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "a979821a975897b88493843301950c456a725982" },
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
"mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" },
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
"nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
"nvim-lspconfig": { "branch": "master", "commit": "dc2f86d2b66a6e01a98c37cdadd3be3e90f8ab9a" },
"nvim-treesitter": { "branch": "main", "commit": "2cc172c28e5550e00e6beead4599b1469469c1c7" },
"nvim-lspconfig": { "branch": "master", "commit": "841c6d4139aedb8a3f2baf30cef5327371385b93" },
"nvim-treesitter": { "branch": "main", "commit": "53f6ce29df5841ce26e5a9f06fb371088b8d8031" },
"nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },

View File

@@ -11,7 +11,7 @@ return {
╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝╚═╝ ╚═══╝╚══════╝╚═╝ ╚═══╝ ╚═╝╚═╝ ╚═╝
]]
logo = string.rep("\n", 8) .. logo .. "\n\n"
logo = string.rep("\n", 3) .. logo .. "\n\n"
local opts = {
theme = "doom",
@@ -33,7 +33,7 @@ return {
},
{ icon = "󱗘 ", desc = " Harpoon Search ", key = "fl", action = "Telescope harpoon marks" },
{ icon = "󰒲 ", desc = " Lazy Manager ", key = "z", action = "Lazy" },
{ icon = " ", desc = " Help Tags ", key = "fh", action = "Telescope help_tags" },
{ icon = "󰌵 ", desc = " Help Tags ", key = "fh", action = "Telescope help_tags" },
{ icon = "", desc = " Quit ", key = "q", action = "qa" },
},
-- footer = { vim.fn.strftime("%Y-%m-%d %H:%M:%S") .. " • Mzansi Vim Kickstart" },

View File

@@ -132,6 +132,13 @@ return {
["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(),
["<CR>"] = cmp.mapping.confirm({ select = true }),
["<Tab>"] = cmp.mapping(function(fallback) -- add this
if cmp.visible() then
cmp.confirm({ select = true })
else
fallback()
end
end, { "i", "s" }),
}),
sources = cmp.config.sources({
{ name = "nvim_lsp" },

9
lua/plugins/mini-ai.lua Normal file
View File

@@ -0,0 +1,9 @@
return {
"echasnovski/mini.ai",
version = "*",
config = function()
require("mini.ai").setup({
search_method = "next",
})
end,
}

View File

@@ -1,14 +1,20 @@
return {
{
-- Git Plugin
'tpope/vim-fugitive',
},
{
"numToStr/Comment.nvim",
config = function()
require("Comment").setup()
vim.keymap.set("n", "<C-/>", "gcc", { remap = true, desc = "Toggle comment" })
vim.keymap.set("v", "<C-/>", "gc", { remap = true, desc = "Toggle comment" })
end,
},
{
-- Git Plugin
'tpope/vim-fugitive',
},
{
"numToStr/Comment.nvim",
config = function()
require("Comment").setup()
vim.keymap.set("n", "<C-/>", "gcc", { remap = true, desc = "Toggle comment" })
vim.keymap.set("v", "<C-/>", "gc", { remap = true, desc = "Toggle comment" })
end,
},
{
'windwp/nvim-autopairs',
event = "InsertEnter",
config = true
},
}

View File

@@ -1,31 +1,31 @@
return {
"nvim-treesitter/nvim-treesitter",
lazy = false,
build = ":TSUpdate",
config = function()
require("nvim-treesitter").setup({
install_dir = vim.fn.stdpath("data") .. "/site",
highlight = { enable = true },
indent = { enable = true },
autotag = { enable = true },
ensure_installed = {
"lua",
"vim",
"vimdoc",
"query",
"dart",
"python",
"dockerfile",
"yaml",
"bash",
"json",
"html",
"css",
"javascript",
"sql",
"markdown",
"markdown_inline",
},
})
end,
"nvim-treesitter/nvim-treesitter",
lazy = false,
build = ":TSUpdate",
config = function()
require("nvim-treesitter").setup({
install_dir = vim.fn.stdpath("data") .. "/site",
highlight = { enable = true },
indent = { enable = true },
autotag = { enable = true },
ensure_installed = {
"lua",
"vim",
"vimdoc",
"query",
"dart",
"python",
"dockerfile",
"yaml",
"bash",
"json",
"html",
"css",
"javascript",
"sql",
"markdown",
"markdown_inline",
},
})
end,
}