Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JustBarnt/NvaderVIM
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.5
Choose a base ref
...
head repository: JustBarnt/NvaderVIM
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing with 4,082 additions and 2,448 deletions.
  1. +2 −5 .gitignore
  2. +0 −7 .luarc.json
  3. +1 −1 .stylua.toml
  4. +3 −4 README.md
  5. +0 −12 after/ftplugin/markdown.lua
  6. +0 −1 after/ftplugin/neo-tree.lua
  7. +0 −12 after/ftplugin/norg.lua
  8. +0 −20 after/ftplugin/qf.lua
  9. +6 −22 init.lua
  10. +0 −23 lua/core/autocmds/init.lua
  11. +54 −27 lua/core/init.lua
  12. +0 −95 lua/core/options.lua
  13. +13 −0 lua/core/plugins/autopairs.lua
  14. +8 −0 lua/core/plugins/bars.lua
  15. +1 −1 lua/core/plugins/{lush/init.lua → bufdelete.lua}
  16. +10 −0 lua/core/plugins/ccc.lua
  17. +102 −0 lua/core/plugins/cmp.lua
  18. +12 −0 lua/core/plugins/comments.lua
  19. +4 −0 lua/core/plugins/deadcolumn.lua
  20. +4 −0 lua/core/plugins/detour.lua
  21. +0 −10 lua/core/plugins/diagflow/init.lua
  22. +31 −0 lua/core/plugins/dressing.lua
  23. +0 −40 lua/core/plugins/dressing/init.lua
  24. +54 −0 lua/core/plugins/edgy.lua
  25. +0 −37 lua/core/plugins/edgy/init.lua
  26. +4 −0 lua/core/plugins/fastaction.lua
  27. +26 −0 lua/core/plugins/flash.lua
  28. +15 −0 lua/core/plugins/gitsigns.lua
  29. +31 −0 lua/core/plugins/global-note.lua
  30. +45 −0 lua/core/plugins/grapple.lua
  31. +22 −0 lua/core/plugins/grug-far.lua
  32. +15 −0 lua/core/plugins/hbac.lua
  33. +0 −67 lua/core/plugins/heirline/common.lua
  34. +0 −18 lua/core/plugins/heirline/harpoon_component.lua
  35. +0 −61 lua/core/plugins/heirline/init.lua
  36. +31 −0 lua/core/plugins/hlchunk.lua
  37. +13 −0 lua/core/plugins/illuminate.lua
  38. +5 −0 lua/core/plugins/inc-rename.lua
  39. +15 −0 lua/core/plugins/lazydev.lua
  40. +2 −14 lua/core/plugins/lsp/config.lua
  41. +12 −14 lua/core/plugins/lsp/default-config.lua
  42. +16 −25 lua/core/plugins/lsp/init.lua
  43. +15 −16 lua/core/plugins/lsp/on_attach.lua
  44. +9 −0 lua/core/plugins/lsp/servers/cssls.lua
  45. +0 −8 lua/core/plugins/lsp/servers/emmet_language_server.lua
  46. +3 −1 lua/core/plugins/lsp/servers/lua_ls.lua
  47. +99 −0 lua/core/plugins/lualine.lua
  48. +5 −0 lua/core/plugins/markdown.lua
  49. +0 −11 lua/core/plugins/markdown/init.lua
  50. +18 −0 lua/core/plugins/mini-icons.lua
  51. +36 −0 lua/core/plugins/mini/ai.lua
  52. +19 −0 lua/core/plugins/mini/pairs.lua
  53. +8 −0 lua/core/plugins/nerdy.lua
  54. +111 −0 lua/core/plugins/noice.lua
  55. +0 −44 lua/core/plugins/noice/init.lua
  56. +0 −7 lua/core/plugins/nui/init.lua
  57. +5 −0 lua/core/plugins/numb.lua
  58. +0 −17 lua/core/plugins/nvim-cmp/cmp-comparators.lua
  59. +0 −41 lua/core/plugins/nvim-cmp/cmp-mappings.lua
  60. +0 −47 lua/core/plugins/nvim-cmp/cmp-menu-theme.lua
  61. +0 −45 lua/core/plugins/nvim-cmp/cmp-sources.lua
  62. +0 −115 lua/core/plugins/nvim-cmp/init.lua
  63. +0 −27 lua/core/plugins/nvim-dbee/init.lua
  64. +0 −17 lua/core/plugins/nvim-notify/init.lua
  65. +5 −0 lua/core/plugins/nvim-surround.lua
  66. +5 −0 lua/core/plugins/nvim-toggler.lua
  67. +0 −10 lua/core/plugins/nvim-ts-autotag/init.lua
  68. +30 −0 lua/core/plugins/oil.lua
  69. +0 −33 lua/core/plugins/oil/init.lua
  70. +11 −0 lua/core/plugins/reactive.lua
  71. +3 −0 lua/core/plugins/slueth.lua
  72. +0 −10 lua/core/plugins/strathero/init.lua
  73. +60 −0 lua/core/plugins/telescope.lua
  74. +0 −166 lua/core/plugins/telescope/init.lua
  75. +8 −0 lua/core/plugins/todo-comments.lua
  76. +56 −0 lua/core/plugins/tokyonight.lua
  77. +66 −0 lua/core/plugins/treesitter.lua
  78. +0 −43 lua/core/plugins/treesitter/init.lua
  79. +16 −0 lua/core/plugins/trouble.lua
  80. +0 −34 lua/core/plugins/trouble/init.lua
  81. +2 −5 lua/core/plugins/{undotree/init.lua → undotree.lua}
  82. +0 −18 lua/core/plugins/vim-dadbod/init.lua
  83. +33 −0 lua/core/plugins/which-key.lua
  84. +0 −65 lua/core/plugins/which-key/init.lua
  85. +17 −0 lua/core/plugins/workspaces.lua
  86. +0 −22 lua/core/plugins/workspaces/init.lua
  87. +0 −30 lua/core/types.lua
  88. +0 −34 lua/core/ui/kanagawa.lua
  89. +0 −24 lua/core/ui/rose-pine.lua
  90. +0 −40 lua/core/ui/tokyonight.lua
  91. +0 −24 lua/core/user-commands/init.lua
  92. +114 −0 lua/core/user/autocmds.lua
  93. +21 −9 lua/core/{ → user}/keymaps.lua
  94. +52 −0 lua/core/user/nushell.lua
  95. +109 −0 lua/core/user/options.lua
  96. +19 −0 lua/core/user/user-commands.lua
  97. +210 −0 lua/core/utils/cmp/formatting.lua
  98. +72 −0 lua/core/utils/cmp/init.lua
  99. +0 −10 lua/core/utils/format.lua
  100. +43 −0 lua/core/utils/gx.lua
  101. +206 −0 lua/core/utils/icons.lua
  102. +32 −102 lua/core/utils/init.lua
  103. +170 −0 lua/core/utils/mini.lua
  104. +105 −1 lua/core/utils/telescope/init.lua
  105. +0 −211 lua/core/utils/ui.lua
  106. +7 −0 lua/custom_plugins/bars-N-lines.nvim/.luarc.json
  107. +290 −0 lua/custom_plugins/bars-N-lines.nvim/README.md
  108. +229 −0 lua/custom_plugins/bars-N-lines.nvim/lua/bars.lua
  109. +304 −0 lua/custom_plugins/bars-N-lines.nvim/lua/bars/colors.lua
  110. +125 −0 lua/custom_plugins/bars-N-lines.nvim/lua/bars/scratch.lua
  111. +396 −0 lua/custom_plugins/bars-N-lines.nvim/lua/bars/statuscolumn.lua
  112. +104 −0 lua/custom_plugins/bars-N-lines.nvim/lua/bars/utils.lua
  113. +255 −0 lua/custom_plugins/bars-N-lines.nvim/lua/definitions.lua
  114. +0 −10 lua/default_config.lua
  115. +0 −73 lua/extras/autocmds/init.lua
  116. +0 −13 lua/extras/commands/init.lua
  117. +0 −114 lua/plugins/coding.lua
  118. +0 −191 lua/plugins/editor.lua
  119. +1 −0 lua/plugins/init.lua
  120. +0 −139 lua/plugins/themes.lua
  121. +0 −96 lua/plugins/ui.lua
  122. +0 −1 lua/user/keepme
  123. +13 −0 snippets/lua.json
  124. +8 −8 snippets/package.json
  125. 0 snippets/{svelte/tsdocs.json → svelte.json}
7 changes: 2 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -4,8 +4,5 @@ config.yaml
.env
lua/colorscheme.lua
lua/user/*
after/**/*.lua
!after/ftplugin/qf.lua
!after/ftplugin/norg.lua
!after/ftplugin/markdown.lua
!after/ftplugin/neo-tree.lua
after/ftplugin/**
spell/**
7 changes: 0 additions & 7 deletions .luarc.json

This file was deleted.

2 changes: 1 addition & 1 deletion .stylua.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
indent_type = "Spaces"
indent_width = 2
call_parentheses = "NoSingleTable"
column_width = 140
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -3,11 +3,10 @@
This is my creation of a Neovim Distribution.

### Why?
Other Distros included multiple plugins I didn't use and I wanted to use this as a good experience to learn more about neovim itself. As well as this sounded fun to build.
Other Distributions included multiple plugins I didn't use and I wanted to use this as a good experience to learn more about neovim itself. As well as this sounded fun to build.

## Pre-requisites
1. Neovim >= 0.9.5
lthrough I recommend you build from nightly
## Prerequisites
1. Neovim >= 0.10.0
2. a `C` compliler for `nvim-treesitter`
make` optional, but there are plugins that use `make` such as `telescope-fzf` for fuzzy finding
3. [Ripgrep](https://github.com/BurntSushi/ripgrep) is required for Telescope grep searching which this Distribution uses as a core feature
12 changes: 0 additions & 12 deletions after/ftplugin/markdown.lua

This file was deleted.

1 change: 0 additions & 1 deletion after/ftplugin/neo-tree.lua

This file was deleted.

12 changes: 0 additions & 12 deletions after/ftplugin/norg.lua

This file was deleted.

20 changes: 0 additions & 20 deletions after/ftplugin/qf.lua

This file was deleted.

28 changes: 6 additions & 22 deletions init.lua
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
-- Define if user has nushell installed
vim.g.has_nushell = vim.fn.executable("nu") and true or false

-- Mapleader should be set as quick as possible. There is no reason to not set it at the very top of your initial init.lua
vim.g.mapleader = " "
vim.g.maplocalleader = ","
vim.g.maplocalleader = "\\"

if vim.g.vscode then
require("core.keymaps")
require("core.options")
require("core.user.keymaps")
require("core.user.options")
return
end

@@ -18,22 +21,3 @@ if vim.fn.has("win32") == 1 then
return result:gsub("\\", "/")
end
end

vim.diagnostic.config {
virtual_text = false,
signs = {
text = {
[vim.diagnostic.severity.ERROR] = "",
[vim.diagnostic.severity.WARN] = "",
[vim.diagnostic.severity.INFO] = "󰋼",
[vim.diagnostic.severity.HINT] = "󰌵",
},
},
float = {
border = "rounded",
format = function(d)
return ("%s (%s) [%s]"):format(d.message, d.source, d.code or d.user_data.lsp.code)
end,
},
underline = true,
}
23 changes: 0 additions & 23 deletions lua/core/autocmds/init.lua

This file was deleted.

81 changes: 54 additions & 27 deletions lua/core/init.lua
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
-- Creating our lazy install dir, then creating the git clone call
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not vim.uv.fs_stat(lazypath) then
vim.fn.system {
vim.fn.system({
"git",
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
}
})
end

vim.opt.rtp:prepend(lazypath)
@@ -18,7 +18,7 @@ local lazy = require("lazy")
---@class LazySpec
-- TODO: For integrating VSCODE support to load only plugins it needs
-- https://github.com/isaksamsten/nvim-config/blob/e6eac29e17df6a2314f109d74952331cb52b2a00/lua/config/lazy.lua#L13
local plugins_spec = { { import = "core.plugins" }, { import = "plugins" }, { "justinsgithub/wezterm-types" } }
local plugins_spec = { { import = "core.plugins" }, { import = "plugins" } }

---@class LazyConfig
local opts = {
@@ -30,11 +30,18 @@ local opts = {
colorscheme = { "tokyonight" },
},
checker = {
enabled = true,
enabled = false,
notify = false,
},
change_detection = {
notify = false,
enabled = false,
},
pkg = {
enabled = true,
sources = {
"lazy",
"rockspec",
},
},
performance = {
rtp = {
@@ -52,36 +59,56 @@ local opts = {
},
}

if vim.fn.isdirectory("lua/user/plugins") == 1 then
table.insert(plugins_spec, { import = "user.plugins" })
end

-- Setting up lazy specs
lazy.setup(plugins_spec, opts)

vim.notify = require("notify")

if vim.fn.findfile(vim.fn.stdpath("config") .. "/lua/colorscheme.lua") ~= "" then
require("colorscheme")
else
vim.notify_once(
"No Colorscheme file found: Defaulting to `tokyonight-storm`, call `:Telescope themes` to set one",
vim.log.levels.INFO
)
vim.cmd([[colorscheme tokyonight-storm]])
end
vim.api.nvim_create_autocmd("User", {
pattern = "VeryLazy",
callback = function()
_G.Utils = require("core.utils")
require("core.user.options")
require("core.user.keymaps")
require("core.user.autocmds")
require("core.user.user-commands")
if vim.g.has_nushell then
require("core.user.nushell")
end
end,
})

-- From https://github.com/willothy/nvim-config/blob/b0a59463c6e6cb29ecb0d68dd102807bef3db0fb/init.lua#L11
-- Loading shada is SLOW, so we're going to load it manually,
-- after UI-enter so it doesn't block startup.
local shada = vim.o.shada
vim.o.shada = ""
vim.api.nvim_create_autocmd("User", {
pattern = "LazyVimStarted",
pattern = "VeryLazy",
callback = function()
require("core.options")
vim.o.shada = shada
pcall(vim.cmd.rshada, { bang = true })
end,
})

vim.schedule(function()
require("core.keymaps")
require("core.autocmds")
require("core.user-commands")
require("extras.commands")
require("extras.autocmds")
end)
vim.diagnostic.config({
virtual_text = false,
signs = {
text = {
[vim.diagnostic.severity.ERROR] = "",
[vim.diagnostic.severity.WARN] = "",
[vim.diagnostic.severity.INFO] = "󰋼",
[vim.diagnostic.severity.HINT] = "󰌵",
},
},
float = {
border = "rounded",
format = function(d)
return ("%s (%s) [%s]"):format(d.message, d.source, d.code or d.user_data.lsp.code)
end,
},
underline = true,
jump = {
float = true,
},
})
95 changes: 0 additions & 95 deletions lua/core/options.lua

This file was deleted.

13 changes: 13 additions & 0 deletions lua/core/plugins/autopairs.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
return {
"windwp/nvim-autopairs",
event = "InsertEnter",
opts = {
disable_filetype = { "TelescopePrompt", "spectre_panel", "neo-tree" },
check_ts = true,
ts_config = {
lua = { "string" },
javascript = { "template_string" },
java = false,
},
},
}
8 changes: 8 additions & 0 deletions lua/core/plugins/bars.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
return {
dir = vim.fn.stdpath("config") .. "/lua/custom_plugins/bars-N-lines.nvim",
name = "bars",
config = function()
require("bars").setup()
require("bars.colors").setup({})
end,
}
Loading