Added some plugins and organization

nvim/.config/nvim/init.lua

@@ -13,7 +13,8 @@ vim.opt.rtp:prepend(lazypath)
 
 vim.g.mapleader = ','
 vim.g.localmapleader = ','
+
+require('lazy').setup('plugins')
 require('core/keymaps')
 require('core/settings')
 
-require('lazy').setup('plugins')

nvim/.config/nvim/lazy-lock.json

@@ -9,6 +9,7 @@
   "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" },
+  "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
   "deadcolumn.nvim": { "branch": "master", "commit": "b9b5e237371ae5379e280e4df9ecf62e4bc8d7a5" },
   "distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" },
@@ -23,8 +24,8 @@
   "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
   "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
   "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "c993ca55e3991535bc74cd2d6ef273810d066c84" },
-  "mason.nvim": { "branch": "main", "commit": "db58ec7bc9248fb1878172f90cadc825b77564a6" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "4c3baba22189aa2a08d32bb8d08b32c7e22a2e84" },
+  "mason.nvim": { "branch": "main", "commit": "8adaf0bc58ddadd70dad563f949042fb1cb0211c" },
   "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
   "mini.fuzzy": { "branch": "stable", "commit": "295763d73cbf580c27a4419364c47b09fc82e0f4" },
   "mini.move": { "branch": "main", "commit": "3afd39873eb9171684e554a214c055482444a47d" },
@@ -37,7 +38,8 @@
   "neovim": { "branch": "main", "commit": "932adb0d9351186db047302de021bb2976756a07" },
   "nightfox.nvim": { "branch": "main", "commit": "77aa7458d2b725c2d9ff55a18befe1b891ac473e" },
   "null-ls.nvim": { "branch": "main", "commit": "bbaf5a96913aa92281f154b08732be2f57021c45" },
-  "nvim": { "branch": "main", "commit": "8d02781a638123394f9bc160aad47a9560a113f9" },
+  "numb.nvim": { "branch": "master", "commit": "2c89245d1185e02fec1494c45bc765a38b6b40b3" },
+  "nvim": { "branch": "main", "commit": "12894370fa3c9e2200f3724c4184354d6b79733a" },
   "nvim-cmp": { "branch": "main", "commit": "e1f1b40790a8cb7e64091fb12cc5ffe350363aa0" },
   "nvim-dap": { "branch": "master", "commit": "a6d48d23407fbad7a4c1451803b8f34cab31c441" },
   "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
@@ -46,7 +48,7 @@
   "nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" },
   "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
   "nvim-tree.lua": { "branch": "master", "commit": "3cc698b35b0a67792c61e1726830bb9ecfc4c9f4" },
-  "nvim-treesitter": { "branch": "master", "commit": "bad9f5bf5b4af5d97a9cffdc957f1b23dc91d851" },
+  "nvim-treesitter": { "branch": "master", "commit": "e7f2b1276b7aa68099acc8169ce51f7e389b1772" },
   "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" },
   "plenary.nvim": { "branch": "master", "commit": "36aaceb6e93addd20b1b18f94d86aecc552f30c4" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
@@ -60,6 +62,7 @@
   "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },
   "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" },
   "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" },
+  "toggleterm.nvim": { "branch": "main", "commit": "95204ece0f2a54c89c4395295432f9aeedca7b5f" },
   "tokyonight.nvim": { "branch": "main", "commit": "fd0a005fd8986ec0d98a1938dc570303e8d8444b" },
   "trouble.nvim": { "branch": "main", "commit": "d99e2abd10808ef91738ce98a5c767e6a51df449" },
   "vim-arduino": { "branch": "master", "commit": "111db616db21d4f925691f1517792953f7671647" },

nvim/.config/nvim/lua/core/keymaps.lua

@@ -8,7 +8,7 @@ local default_opts = { noremap = true, silent = true }
 -- Fast saving with <leader> and s
 map('n', '<leader>s', ':w<CR>', default_opts)
 map('n', '<leader>a', ':w|:luafile %<CR>', default_opts)
-map('n', '<leader>aa', ':w|:luafile %<CR> |:PackerSync<CR>', default_opts)
+map('n', '<leader>aa', ':w|:luafile %<CR> |:Lazy<CR>', default_opts)
 map('i', '<leader>s', '<C-c>:w<CR>', default_opts)
 -- Python Script that saves the file & moves Todos to my Todolist.
 map('n', '<leader>sd', ':w|:! python3 ~/Documents/Northpass/Scripts/TodoMD/todo.py %<CR>', default_opts)

nvim/.config/nvim/lua/core/settings.lua

@@ -57,8 +57,7 @@ opt.synmaxcol = 240             -- Max column for syntax highlight
 -- Colorscheme
 -----------------------------------------------------------
 opt.termguicolors = true      -- Enable 24-bit RGB colors
---cmd[[colorscheme dracula]]
-cmd[[colorscheme lunaperche]]
+cmd[[colorscheme dracula]]
 -----------------------------------------------------------
 -- Tabs, indent
 -----------------------------------------------------------

nvim/.config/nvim/lua/plugins/init.lua

@@ -43,6 +43,7 @@ return {
   },
     'saadparwaiz1/cmp_luasnip',
     'hrsh7th/cmp-nvim-lsp-signature-help',
+    'lukas-reineke/cmp-under-comparator',
   {
     'asiryk/auto-hlsearch.nvim',
     version = "1.1.0",
@@ -52,8 +53,17 @@ return {
 ------------------------------------------------------------
 -- General Functionality
 ------------------------------------------------------------
+  'stevearc/vim-arduino',
   {
-    'stevearc/vim-arduino'
+    'nacro90/numb.nvim',
+    config = function() require('numb').setup{
+      show_cursorline = false,
+      show_numbers = false, -- Enable 'number' for the window while peeking
+      hide_relativenumbers = false, -- Enable turning off 'relativenumber' for the window while peeking
+      number_only = true, -- Peek only when the command is only a number instead of when it starts with a number
+      centered_peeking = true,
+    }
+    end,
   },
   {
   'nvim-lualine/lualine.nvim',
@@ -105,6 +115,7 @@ return {
 
 -- Top Right Notify Pop Up
   'rcarriga/nvim-notify',
+  {'akinsho/toggleterm.nvim', version = "*", opts = {--[[ things you want to change go here]]}},
 
 ------------------------------------------------------------
 -- echasnovski's Minis get a section of their own...

nvim/.config/nvim/lua/plugins/nvim-cmp.lua

@@ -85,6 +85,16 @@ return {
 	  { name = 'path' },
 	--  { name = 'buffer' },
 	-- { name = 'zsh' },
+	sorting = {
+		comparators = {
+			cmp.config.compare.offset,
+			cmp.config.compare.exact,
+			cmp.config.compare.score,
+			cmp.config.compare.recently_used,
+			require("cmp-under-comparator").under,
+			cmp.config.compare.kind,
+		},
+	},
 	}
       }
     end

nvim/.config/nvim/lua/plugins/styler.lua

@@ -7,7 +7,7 @@ return {
 	python = { colorscheme = "dracula" },
 	html = { colorscheme = "carbonfox" },
         help = { colorscheme = "catppuccin-mocha", background = "dark" },
-	css = { colorscheme = "carbonfox" }
+	css = { colorscheme = "carbonfox" },
       },
     })
   end,

nvim/.config/nvim/lua/plugins/telescope.lua

@@ -48,7 +48,7 @@ return {
 	      results_title = false,
 	      sorting_strategy = 'descending',
 	      layout_strategy = 'bottom_pane',
-	      layout_config = {
+	    layout_config = {
 		height = 13,
 		preview_cutoff = 1,
 		prompt_position = 'bottom'