Huge changes. Changed init.lua to have my settings.lua. Cleaned up a few plugins. What a mess

nvim/.config/nvim/init.lua

@@ -1,19 +1,160 @@
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath,
-  })
-end
+  if not vim.loop.fs_stat(lazypath) then
+    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)
+require('lazy').setup('plugins')
 
 vim.g.mapleader = ','
 vim.g.localmapleader = ','
+vim.opt.textwidth = 85
+vim.opt.colorcolumn = '+2'
+
+-----------------------------------------------------------
+-- General Neovim settings and configuration
+-----------------------------------------------------------
+
+-----------------------------------------------------------
+-- Neovim API aliases
+-----------------------------------------------------------
+local fn = vim.fn       	-- Call Vim functions
+local cmd = vim.cmd     	-- Execute Vim commands
+local exec = vim.api.nvim_exec 	-- Execute Vimscript
+local g = vim.g          	-- Global variables
+local opt = vim.opt         	-- Set options (global/buffer/windows-scoped)
+local o = vim.o
+
+-----------------------------------------------------------
+-- General
+-----------------------------------------------------------
+g.mapleader = ','               -- Change leader to a comma
+opt.mouse = 'a'                 -- Enable mouse support
+opt.clipboard = 'unnamedplus'   -- Copy/paste to system clipboard
+opt.swapfile = false            -- Don't use swapfile
+opt.shadafile  = "NONE"
+opt.shadafile = ""
+opt.shell = "/bin/zsh"
+opt.updatetime = 200
+opt.cursorline = true
+g.markdown_folding = 1
+-- opt.spell=true
+opt.spelllang = 'en_us'
+cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]]
+vim.api.nvim_set_hl(0, "ColorColumn", {guibg=DarkOrchid1})
+-----------------------------------------------------------
+-- Neovim UI
+-----------------------------------------------------------
+opt.number = true               -- Show line number
+opt.relativenumber = true       -- Show Current Line with Relative numbers above and below cursor.
+opt.showmatch = true            -- Highlight matching parenthesis
+opt.foldmethod = "syntax"       -- Enable folding (default 'foldmarker')
+opt.splitright = true           -- Vertical split to the right
+opt.splitbelow = true           -- Horizontal split to the bottom
+opt.ignorecase = true           -- Ignore case letters when search
+opt.smartcase = true            -- Ignore lowercase for the whole pattern
+opt.linebreak = true            -- Wrap on word boundary
+opt.signcolumn = 'yes:1'          -- Signs column always on, minimum 2.
+opt.wrap = true
+
+-----------------------------------------------------------
+-- Memory, CPU
+-----------------------------------------------------------
+opt.hidden = true               -- Enable background buffers
+opt.history = 100               -- Remember N lines in historma:y
+opt.lazyredraw = true           -- Faster scrolling
+opt.synmaxcol = 240             -- Max column for syntax highlight
+-----------------------------------------------------------
+-- Colorscheme
+-----------------------------------------------------------
+opt.termguicolors = true      -- Enable 24-bit RGB colors
+-----------------------------------------------------------
+-- Tabs, indent
+-----------------------------------------------------------
+opt.expandtab = true            -- Use spaces instead of tabs
+opt.shiftwidth = 4              -- Shift 4 spaces when tab
+opt.tabstop = 4                 -- 1 tab == 4 spaces
+opt.smartindent = true          -- Autoindent new lines
+-----------------------------------------------------------
+-- Glow Settings
+-----------------------------------------------------------
+g.glow_binary_path = '/bin'
+g.glow_border = 'rounded'
+g.glow_width = 120
+g.glow_use_pager = true
+g.glow_style = 'dark'
+-----------------------------------------------------------
+-- MKDX Settings, mkdx#settings.
+-----------------------------------------------------------
+-- 2 spaces for selected filetypes
+cmd [[
+  autocmd FileType md,liquid,xml,html,xhtml,css,scss,javascript,lua,yaml setlocal shiftwidth=2 tabstop=8 noexpandtab
+]]
+
+
+local disabled_built_ins = {
+    "netrw",
+    "netrwPlugin",
+    "netrwSettings",
+    "netrwFileHandlers",
+    "gzip",
+    "zip",
+    "zipPlugin",
+    "tar",
+    "tarPlugin",
+    "getscript",
+    "getscriptPlugin",
+    "vimball",
+    "vimballPlugin",
+    "2html_plugin",
+    "logipat",
+    "rrhelper",
+    "spellfile_plugin",
+    "matchit"
+}
+
+for _, plugin in pairs(disabled_built_ins) do
+    vim.g["loaded_" .. plugin] = 1
+end
+
+--[[
+Deletes all trailing whitespaces in a file if it's not binary nor a diff.
+]]--
+function _G.trim_trailing_whitespaces()
+    if not o.binary and o.filetype ~= 'diff' then
+        local current_view = fn.winsaveview()
+        cmd([[keeppatterns %s/\s\+$//e]])
+        fn.winrestview(current_view)
+    end
+end
+
+--  see https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance#how-to-add-visual-studio-code-dark-theme-colors-to-the-menu
+--[[vim.cmd[[
+	highlight! link CmpItemMenu Comment
+	" gray
+	highlight! CmpItemAbbrDeprecated guibg=NONE gui=strikethrough guifg=#808080
+	" blue
+	highlight! CmpItemAbbrMatch guibg=NONE guifg=#569CD6
+	highlight! CmpItemAbbrMatchFuzzy guibg=NONE guifg=#569CD6
+	" light blue
+	highlight! CmpItemKindVariable guibg=NONE guifg=#9CDCFE
+	highlight! CmpItemKindInterface guibg=NONE guifg=#9CDCFE
+	highlight! CmpItemKindText guibg=NONE guifg=#9CDCFE
+	" pink
+	highlight! CmpItemKindFunction guibg=NONE guifg=#C586C0
+	highlight! CmpItemKindMethod guibg=NONE guifg=#C586C0
+	" front
+	highlight! CmpItemKindKeyword guibg=NONE guifg=#D4D4D4
+	highlight! CmpItemKindProperty guibg=NONE guifg=#D4D4D4
+	highlight! CmpItemKindUnit guibg=NONE guifg=#D4D4D4
+      ]]
+--]]
 
-require('lazy').setup('plugins')
 require('core/keymaps')
-require('core/settings')
+vim.cmd[[colorscheme moonlight]]

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

@@ -19,7 +19,7 @@
   "f-string-toggle.nvim": { "branch": "main", "commit": "383ca5c08ed001f7c1632ba752c14e7bb88ce6ed" },
   "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" },
   "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" },
-  "gitsigns.nvim": { "branch": "main", "commit": "d8b52fc95e3d424e5c09b287ee2c293dcb4e26fb" },
+  "gitsigns.nvim": { "branch": "main", "commit": "44adf808ace6cb65a3353bd61fa585a2d8fe0db3" },
   "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" },
   "headlines.nvim": { "branch": "master", "commit": "74a083a3c32a08be24f7dfcc6f448ecf47857f46" },
   "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
@@ -28,6 +28,7 @@
   "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
   "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
   "mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" },
   "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
   "mini.fuzzy": { "branch": "stable", "commit": "295763d73cbf580c27a4419364c47b09fc82e0f4" },
@@ -36,8 +37,8 @@
   "mini.surround": { "branch": "main", "commit": "eeaf96562947f75afa51a6266e066529369ca7ef" },
   "mini.trailspace": { "branch": "main", "commit": "c41ab1035d184ff20c1aebd76639320c055afebe" },
   "mkdnflow.nvim": { "branch": "main", "commit": "a728a3533bb57502fdfd6fdb4e5839fc87430edc" },
-  "moonfly": { "branch": "master", "commit": "49a0f8aa5aa59af01b2305bb01d96ebd3a78f758" },
-  "neorg": { "branch": "main", "commit": "f296a22864bbac0d94ad00fa18cc8231dbeaa1e3" },
+  "moonfly": { "branch": "master", "commit": "fe8d67b8f3848ecdaadafcbfbcb8ee7585b4819a" },
+  "neorg": { "branch": "main", "commit": "064f8f65dd32f4fe728e76acfa3e4e153b121147" },
   "neorg-templates": { "branch": "main", "commit": "1078ced1f995cc053cdb10b51bd5e5dd5d76f78a" },
   "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" },
   "neovim": { "branch": "main", "commit": "e29002cbee4854a9c8c4b148d8a52fae3176070f" },
@@ -46,20 +47,19 @@
   "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
   "nvim": { "branch": "main", "commit": "2e3e5ebcdc24ef0d5b14a0a999dbbe7936512c46" },
   "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
-  "nvim-dap": { "branch": "master", "commit": "4377a05b9476587b7b485d6a9d9745768c4e4b37" },
+  "nvim-dap": { "branch": "master", "commit": "31e1ece773e10448dcb616d5144290946a6264b7" },
   "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
   "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
   "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" },
   "nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" },
   "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
   "nvim-tree.lua": { "branch": "master", "commit": "00741206c2df9c4b538055def19b99790f0c95c8" },
-  "nvim-treesitter": { "branch": "master", "commit": "920b37260ebc720b0399bd12954fd2bf8bd18242" },
+  "nvim-treesitter": { "branch": "master", "commit": "f8c2825220bff70919b527ee68fe44e7b1dae4b2" },
   "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
   "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" },
   "starry.nvim": { "branch": "master", "commit": "f189b1026ef11ab61185a4bb35baf72106a624de" },
-  "styler.nvim": { "branch": "main", "commit": "d5b7e43af4fdaa06e4175c84f4f57b633ae7e6ff" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "ad7b637c72549713b9aaed7c4f9c79c62bcbdff0" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },

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

@@ -36,8 +36,10 @@ opt.number = true               -- Show line number
 opt.relativenumber = true       -- Show Current Line with Relative numbers above and below cursor.
 opt.showmatch = true            -- Highlight matching parenthesis
 opt.foldmethod = "syntax"       -- Enable folding (default 'foldmarker')
-opt.cc = '+1,+2,+3'		-- Line length marker at 80 columns
-opt.tw = 120
+opt.colorcolumn = '99'
+opt.textwidth = 100
+-- opt.cc = '+1,+2,+3'		-- Line length marker at 80 columns
+-- opt.tw = 120
 opt.splitright = true           -- Vertical split to the right
 opt.splitbelow = true           -- Horizontal split to the bottom
 opt.ignorecase = true           -- Ignore case letters when search

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

@@ -1,6 +1,5 @@
 return {
 ----------------------------------------------------------------
-
 -- LSP and Autocomplete Plugins
 -- They should be pulled first!
 -----------------------------------------------------------------
@@ -332,6 +331,18 @@ return {
   },
   { "bluz71/vim-moonfly-colors", name = "moonfly", lazy = true, priority = 1000 },
   'Bekaboo/deadcolumn.nvim',
+  -- {
+  --   'm4xshen/smartcolumn.nvim',
+  --       config = function()
+  --         require("smartcolumn").setup{
+  --    config = {
+  --     colorcolumn = "100",
+  --     disabled_filetypes = { "help" },
+  --     custom_colorcolumn = {},
+  --   },
+  -- }
+  --     end
+  -- },
   {
     'feline-nvim/feline.nvim',
     dependencies = { 'nvim-tree/nvim-web-devicons' },

nvim/.config/nvim/lua/plugins/mason-null-ls.lua

@@ -0,0 +1,29 @@
+return {
+    "jay-babu/mason-null-ls.nvim",
+    event = { "BufReadPre", "BufNewFile" },
+    dependencies = {
+      "williamboman/mason.nvim",
+      "jose-elias-alvarez/null-ls.nvim",
+    },
+      config = function ()
+	require("mason-null-ls").setup({
+	    ensure_installed = nil,
+	    automatic_installation = true,
+      })
+	local null_ls = require'null-ls'
+	  null_ls.setup({
+	    debug = true,
+	    sources = {
+	      null_ls.builtins.completion.spell,
+	      null_ls.builtins.diagnostics.codespell,
+	      -- null_ls.builtins.diagnostics.markdownlint.with({ extra_args = { "--disable", "MD024", "MD013", "--" }
+	      -- ,}),
+	      -- null_ls.builtins.diagnostics.ruff,
+	--      null_ls.builtins.diagnostics.pylama,
+	      null_ls.builtins.formatting.black,
+	 --     null_ls.builtins.diagnostics.pylint,
+	      -- null_ls.builtins.diagnostics.pycodestyle,
+	    },
+	  })
+    end
+}

nvim/.config/nvim/lua/plugins/null-ls.lua

@@ -1,23 +0,0 @@
-return {
-    'jose-elias-alvarez/null-ls.nvim',
-    dependencies = {
-     'nvim-lua/plenary.nvim',
-      },
-      config = function ()
-	local null_ls = require'null-ls'
-	  null_ls.setup({
-	    debug = true,
-	    sources = {
-	      null_ls.builtins.completion.spell,
-	      null_ls.builtins.diagnostics.codespell,
-	      null_ls.builtins.diagnostics.markdownlint.with({ extra_args = { "--disable", "MD024", "MD013", "--" }
-	      ,}),
-	      null_ls.builtins.diagnostics.ruff,
-	--      null_ls.builtins.diagnostics.pylama,
-	      null_ls.builtins.formatting.black,
-	 --     null_ls.builtins.diagnostics.pylint,
-	      null_ls.builtins.diagnostics.pycodestyle.with({ extra_args = { "--max-line-length=80" }}),
-	    },
-	  })
-      end
-}

nvim/.config/nvim/lua/plugins/nvim-mapper.lua

@@ -15,6 +15,11 @@ return {
 	  "Sidebar Update", "sidebar-update", "Refresh the Sidebar"
 	  )
 
+	  -- Nvim Tree Plugin
+	  M('n', '<leader>v', ':NvimTreeToggle<CR>', default_opts,
+	  "Nvim Tree Sidebar", "nvim-tree-toggle", "OpenClose NvimTree Sidebar"
+	  )
+
 	  -- Telescope Options
 	  M('n', '<leader>ff', ':Telescope find_files<CR>', default_opts,
 	  "Find Files", "find-files", "Find Files in Telescope pop-up"

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

@@ -1,4 +1,4 @@
-return {
+[[--return {
   "folke/styler.nvim",
   config = function()
     require("styler").setup({
@@ -12,3 +12,4 @@ return {
     })
   end,
 }
+--]]