Cleaned up keymaps and a few files.

README.md

@@ -0,0 +1,22 @@
+ ```
+ _   _                                _
+ | \ | |                              (_)
+ |  \| |  ___   _ __  _ __ ___ __   __ _  _ __ ___
+ | . ` | / _ \ | '__|| '_ ` _ \\ \ / /| || '_ ` _ \
+ | |\  || (_) || |   | | | | | |\ V / | || | | | | |
+ |_| \_| \___/ |_|   |_| |_| |_| \_/  |_||_| |_| |_|
+```
+
+ ### Welcome to my setup
+
+Most of the times I'm writing in Markdown or Python. I'll also manage my servers from a similar environment which is mostly yaml and bash scripts. Here's a few images.
+
+![1](images/neovim1.png)
+ 
+![2](images/neovim2.png)
+ 
+![3](images/neovim3.png)
+ 
+![4](images/neovim4.png)
+ 
+![5](images/neovim5.png)

nvim/.config/nvim/init.lua

@@ -10,13 +10,15 @@ if not vim.loop.fs_stat(lazypath) then
     })
   end
 vim.opt.rtp:prepend(lazypath)
-
 vim.g.mapleader = ','
 vim.g.localmapleader = ','
+vim.opt.textwidth = 85
+vim.opt.colorcolumn = '+2'
 
 require('lazy').setup('plugins')
-require('keymaps')
 
+
+-----------------------------------------------------------
 -- General Neovim settings and configuration
 -----------------------------------------------------------
 
@@ -43,25 +45,23 @@ opt.shell = "/bin/zsh"
 opt.updatetime = 200
 opt.cursorline = true
 g.markdown_folding = 1
-opt.spell=true
+-- opt.spell=true
 opt.spelllang = 'en_us'
 cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]]
-vim.api.nvim_set_hl(0, "ColorColumn", {guibg=lightmagenta})
+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.foldmethod = "syntax"       -- Enable folding (default 'foldmarker')
-opt.colorcolumn = '120'          -- Line length marker at 80 columns
-opt.textwidth = 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
 opt.smartcase = true            -- Ignore lowercase for the whole pattern
 opt.linebreak = true            -- Wrap on word boundary
-opt.signcolumn = 'yes:2'          -- Signs column always on, minimum 2.
+opt.signcolumn = 'yes:1'          -- Signs column always on, minimum 2.
 opt.wrap = true
 
 -----------------------------------------------------------
@@ -79,8 +79,8 @@ opt.termguicolors = true      -- Enable 24-bit RGB colors
 -- Tabs, indent
 -----------------------------------------------------------
 opt.expandtab = true            -- Use spaces instead of tabs
-opt.shiftwidth = 1              -- Shift 4 spaces when tab
+opt.shiftwidth = 4              -- Shift 4 spaces when tab
-opt.tabstop = 1                 -- 1 tab == 4 spaces
+opt.tabstop = 4                 -- 1 tab == 4 spaces
 opt.smartindent = true          -- Autoindent new lines
 -----------------------------------------------------------
 -- Glow Settings
@@ -136,7 +136,7 @@ function _G.trim_trailing_whitespaces()
 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[[
+--[[vim.cmd[[
 	highlight! link CmpItemMenu Comment
 	" gray
 	highlight! CmpItemAbbrDeprecated guibg=NONE gui=strikethrough guifg=#808080
@@ -155,4 +155,7 @@ vim.cmd[[
 	highlight! CmpItemKindProperty guibg=NONE guifg=#D4D4D4
 	highlight! CmpItemKindUnit guibg=NONE guifg=#D4D4D4
       ]]
+--]]
 
+require('core/keymaps')
+vim.cmd[[colorscheme moonlight]]

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

@@ -1,63 +1,75 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "563827f00bb4fe43269e3be653deabc0005f1302" },
+  "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" },
-  "alpha-nvim": { "branch": "main", "commit": "d35b99e36e32040ba06c48a25b5bd3e75be2a566" },
+  "adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" },
+  "alpha-nvim": { "branch": "main", "commit": "5f211a1597b06be24b1600d72a62b94cab1e2df9" },
+  "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" },
+  "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" },
+  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "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" },
-  "colorschemes": { "branch": "master", "commit": "e29f32990d6e2c7c3a4763326194fbd847b49dac" },
+  "deadcolumn.nvim": { "branch": "master", "commit": "b9b5e237371ae5379e280e4df9ecf62e4bc8d7a5" },
-  "dracula.nvim": { "branch": "main", "commit": "798274ba3c454a9aa3cd71f95a86ea55cbbbb142" },
+  "diffview.nvim": { "branch": "main", "commit": "7e5a85c186027cab1e825d018f07c350177077fc" },
+  "distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" },
+  "dracula.nvim": { "branch": "main", "commit": "9fe831e685a76e1a1898a694623b33247c4d036c" },
+  "f-string-toggle.nvim": { "branch": "main", "commit": "383ca5c08ed001f7c1632ba752c14e7bb88ce6ed" },
   "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" },
-  "friendly-snippets": { "branch": "main", "commit": "1645e7cd98ed99e766c84ab3cf13a1612c77dcee" },
+  "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" },
-  "gitsigns.nvim": { "branch": "main", "commit": "4bd5d7702c17643ff40c035b6b936757b99743c7" },
+  "gitsigns.nvim": { "branch": "main", "commit": "44adf808ace6cb65a3353bd61fa585a2d8fe0db3" },
-  "glow.nvim": { "branch": "main", "commit": "2bb4afb6e9dbc93993a1d7d4168dac08c74590ac" },
+  "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" },
-  "headlines.nvim": { "branch": "master", "commit": "1cd93a641c03419bb255f8b3fe734451517763b1" },
+  "headlines.nvim": { "branch": "master", "commit": "74a083a3c32a08be24f7dfcc6f448ecf47857f46" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "8299fe7703dfff4b1752aeed271c3b95281a952d" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
-  "lazy.nvim": { "branch": "main", "commit": "c249ea376bcd3e5d121b79eac595837b7d0c73a4" },
+  "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
-  "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" },
+  "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
-  "lsp-colors.nvim": { "branch": "main", "commit": "d0b245232aeb197bbd097111d8b69621b0671edb" },
+  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
   "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "93e58e100f37ef4fb0f897deeed20599dae9d128" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" },
-  "mason.nvim": { "branch": "main", "commit": "eb6010ac97e9b510ddce8d28b6925ff6b046eab2" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
-  "mini.fuzzy": { "branch": "stable", "commit": "e8faf897330eadb1b1b76da67eeff04be85cbd8b" },
+  "mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" },
-  "mini.move": { "branch": "main", "commit": "a0c5930e33e55467b0a9f3bca93d8f6fdbfac2e4" },
+  "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
-  "mini.pairs": { "branch": "stable", "commit": "4ebc1ff8d77fe75e8f219432302800ca29e17614" },
+  "mini.fuzzy": { "branch": "stable", "commit": "295763d73cbf580c27a4419364c47b09fc82e0f4" },
-  "mini.surround": { "branch": "main", "commit": "6a4f31e2a380439315729f561d7e7898bde1fd52" },
+  "mini.move": { "branch": "main", "commit": "3afd39873eb9171684e554a214c055482444a47d" },
-  "mini.trailspace": { "branch": "main", "commit": "8566ae0cf1524b263e489b6771d339025773189e" },
+  "mini.pairs": { "branch": "stable", "commit": "963b800d0524eadd297199207011b98684205ada" },
-  "mkdnflow.nvim": { "branch": "main", "commit": "51cf944514e49662cca8a075b1a8f485c2c39d0f" },
+  "mini.surround": { "branch": "main", "commit": "eeaf96562947f75afa51a6266e066529369ca7ef" },
-  "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" },
+  "mini.trailspace": { "branch": "main", "commit": "c41ab1035d184ff20c1aebd76639320c055afebe" },
-  "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" },
+  "mkdnflow.nvim": { "branch": "main", "commit": "a728a3533bb57502fdfd6fdb4e5839fc87430edc" },
-  "neovim": { "branch": "main", "commit": "845a6ad5443e3559dde42910c4523a5835c9233b" },
+  "moonfly": { "branch": "master", "commit": "1e81cbb88a34c41572fde43cd633bd6d60727274" },
-  "nord.nvim": { "branch": "main", "commit": "70df2b61de21b953fd577f292a973cd22e0ca686" },
+  "neorg": { "branch": "main", "commit": "064f8f65dd32f4fe728e76acfa3e4e153b121147" },
-  "null-ls.nvim": { "branch": "main", "commit": "9d811bb6ed44cf766f4bda8a47fd65fdfbdcaa7d" },
+  "neorg-templates": { "branch": "main", "commit": "1078ced1f995cc053cdb10b51bd5e5dd5d76f78a" },
-  "nvim": { "branch": "main", "commit": "a5f3ed5d3b1d9ea21183718a8a89a6653bd6ea48" },
+  "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" },
-  "nvim-cmp": { "branch": "main", "commit": "c4128bcd131fb7152bda8f8dd2b5e41d2fefa88c" },
+  "neovim": { "branch": "main", "commit": "e29002cbee4854a9c8c4b148d8a52fae3176070f" },
-  "nvim-dap": { "branch": "master", "commit": "401f5f22b2d7f9bdbb9294d0235136091458816a" },
+  "nightfox.nvim": { "branch": "main", "commit": "a48f6d9a0273101df76eb25d2f5477baa277f935" },
-  "nvim-dap-python": { "branch": "master", "commit": "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531" },
+  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9b8f5260f3e793e2dcb2899e0a5b944667a95cb2" },
+  "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
-  "nvim-mapper": { "branch": "main", "commit": "7585479199ad7c3fdfed47ae79d26198f948cfc5" },
+  "nvim": { "branch": "main", "commit": "2e3e5ebcdc24ef0d5b14a0a999dbbe7936512c46" },
-  "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" },
+  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
-  "nvim-tree.lua": { "branch": "master", "commit": "4222bb875d86a2a53069c75c4833e27f58e26d90" },
+  "nvim-dap": { "branch": "master", "commit": "31e1ece773e10448dcb616d5144290946a6264b7" },
-  "nvim-treesitter": { "branch": "master", "commit": "6cdaf3f15ecf2495d890715723686abfb667cb7a" },
+  "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
-  "nvim-web-devicons": { "branch": "master", "commit": "bb6d4fd1e010300510172b173ab5205d37af084f" },
+  "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
-  "plenary.nvim": { "branch": "master", "commit": "9a0d3bf7b832818c042aaf30f692b081ddd58bd9" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" },
+  "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
+  "nvim-tree.lua": { "branch": "master", "commit": "00741206c2df9c4b538055def19b99790f0c95c8" },
+  "nvim-treesitter": { "branch": "master", "commit": "691d73287a94e8ed82a383df82aabfe77ab4bcaa" },
+  "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
+  "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
-  "prettier.nvim": { "branch": "main", "commit": "918b99f5ddd7a56395fd393767ab6a3c15a50789" },
   "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" },
+  "starry.nvim": { "branch": "master", "commit": "f189b1026ef11ab61185a4bb35baf72106a624de" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "a18f78121d74c4fae9edd29e138a918a8ede2a70" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "ad7b637c72549713b9aaed7c4f9c79c62bcbdff0" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
-  "telescope-live-grep-args.nvim": { "branch": "master", "commit": "7de3baef1ec4fb77f7a8195fe87bebd513244b6a" },
+  "telescope-live-grep-args.nvim": { "branch": "master", "commit": "851c0997d55601f2afd7290db0f90dc364e29f58" },
-  "telescope.nvim": { "branch": "master", "commit": "b79cd6c88b3d96b0f49cb7d240807cd59b610cd8" },
+  "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },
-  "tmux.nvim": { "branch": "main", "commit": "feafcf8f48c49c720ee64e745648d69d42cb9c5a" },
+  "tmux.nvim": { "branch": "main", "commit": "cb12b31a6b8aea1b39e4735ed70f7c73c2a938b0" },
-  "todo-comments.nvim": { "branch": "main", "commit": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1" },
+  "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
-  "tokyonight.nvim": { "branch": "main", "commit": "a0abe53df53616d13da327636cb0bcac3ea7f5af" },
+  "toggleterm.nvim": { "branch": "main", "commit": "b90a1381e9b5b8596f49070ee86c71db267ac868" },
-  "trouble.nvim": { "branch": "main", "commit": "556ef3089709a6e253df1e500381fec5eb48e48a" },
+  "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" },
-  "vem-tabline": { "branch": "master", "commit": "8399cf77603b6c2110a39ea3efe1053f64b057aa" },
+  "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
-  "vim-wakatime": { "branch": "master", "commit": "ee4ab57adf62a309aeef383a2da23b6e48e5ae50" },
+  "vim-arduino": { "branch": "master", "commit": "111db616db21d4f925691f1517792953f7671647" },
-  "vista.vim": { "branch": "master", "commit": "33774aff5d8b224f24c2e4c6015c613c1a17bf74" },
+  "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" },
-  "which-key.nvim": { "branch": "main", "commit": "5224c261825263f46f6771f1b644cae33cd06995" }
+  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }
 }

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

@@ -0,0 +1,80 @@
+-----------------------------------------------------------
+-- Keymaps of Neovim and installed plugins
+-----------------------------------------------------------
+
+local map = vim.api.nvim_set_keymap
+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> |: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)
+
+-- Neovim Tab Navgation via Vem-Tabline
+map('n', '<leader>t', ':tabnew<CR>', default_opts)
+map('n', '<leader>e', ':bnext<CR>', default_opts)
+map('n', '<leader>w', ':bprev<CR>', default_opts)
+map('n', '<leader>d', ':bdelete<CR>', default_opts)
+map('n', '<leader>r', '<Plug>vem_move_buffer_right', default_opts)
+map('n', '<leader>q', '<Plug>vem_move_buffer_left', default_opts)
+
+-- Nvim-Tree
+map('n', '<leader>v', ':NvimTreeToggle<CR>', default_opts)
+
+-- Nvim Sidebar
+map('n', '<leader>n', ':SidebarNvimToggle<CR>', default_opts)
+map('n', '<leader>q', ':SidebarNvimUpdate<CR>', default_opts)
+
+-- Telescope
+map('n', '<leader>ff', ':Telescope find_files<CR>', default_opts)
+map('n', '<leader>fg', ':Telescope live_grep<CR>', default_opts)
+map('n', '<leader>fb', ':Telescope buffers<CR>', default_opts)
+map('n', '<leader>fe', ':Telescope file_browser<CR>', default_opts)
+map('n', '<leader>fk', ':Telescope keymaps<CR>', default_opts)
+map('n', '<leader>fa', ':Telescope adjacent<CR>', default_opts)
+
+-- Formatting
+map('n', '<leader>b', ':! black %<CR>', default_opts)
+map('n', '<leader>m', ':! markdownlint -f %<CR>', default_opts)
+
+------------------------------------------------
+-- Old Keymaps from Nvim-Mapper (Sunsetted)
+------------------------------------------------
+--[[
+-- Macros for Todo Trouble
+M('n', '<C-t>', "@t<CR>", default_opts,
+"Add Todo", "todo_todo", "Add To-do/Task to the beginning of the line"
+)
+
+M('n', '<C-s>', "@s<CR>", default_opts,
+"Add Solutions Engineering", "todo_seng", "Add Solutions Engineering to the beginning of the line"
+)
+
+M('n', '<C-f>', "@f<CR>", default_opts,
+"Add Feature", "add_feat", "Add Feature Request tag to the beginning of the line. "
+)
+
+M( 'n', '<C-x>', "@c<CR>", default_opts,
+"Replace with Complete", "add_complete", "Replace tag with Complete tag at beginning of the line."
+)
+
+M('n', '<C-r>', "@w<CR>", default_opts,
+"Add Warning/Error", "add_error", "Add Warning/Error tag at the beginning of the line."
+)
+
+M('n', '<leader>ce', ":TodoTrouble keywords=TODO<CR>", default_opts,
+"Show Todo Tags", "show_todos", "Show Todo Tags."
+)
+
+M('n', '<leader>cf', ":TodoTrouble keywords=FEAT<CR>", default_opts,
+"Show Feature Tags", "show_features", "Show Feature Requests."
+)
+
+M('n', '<leader>cq', ":TodoTrouble keywords=ERROR, WARN<CR>", default_opts,
+"Show Warning Tags", "show_warnings", "Show Errors Tags."
+)
+
+--]]

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

@@ -1,3 +1,4 @@
+-----------------------------------------------------------
 -- General Neovim settings and configuration
 -----------------------------------------------------------
 
@@ -27,22 +28,24 @@ 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=lightmagenta})
+--vim.api.nvim_set_hl(0, "ColorColumn", {guibg=lightmagenta})
 -----------------------------------------------------------
 -- 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.foldmethod = "syntax"       -- Enable folding (default 'foldmarker')
-opt.colorcolumn = '120'          -- Line length marker at 80 columns
+opt.colorcolumn = '99'
-opt.textwidth = 120
+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
 opt.smartcase = true            -- Ignore lowercase for the whole pattern
 opt.linebreak = true            -- Wrap on word boundary
-opt.signcolumn = 'yes:2'          -- Signs column always on, minimum 2.
+opt.signcolumn = 'yes:1'          -- Signs column always on, minimum 2.
 opt.wrap = true
 
 -----------------------------------------------------------
@@ -56,12 +59,13 @@ opt.synmaxcol = 240             -- Max column for syntax highlight
 -- Colorscheme
 -----------------------------------------------------------
 opt.termguicolors = true      -- Enable 24-bit RGB colors
+cmd[[colorscheme dracula]]
 -----------------------------------------------------------
 -- Tabs, indent
 -----------------------------------------------------------
 opt.expandtab = true            -- Use spaces instead of tabs
-opt.shiftwidth = 1              -- Shift 4 spaces when tab
+opt.shiftwidth = 4              -- Shift 4 spaces when tab
-opt.tabstop = 1                 -- 1 tab == 4 spaces
+opt.tabstop = 4                 -- 1 tab == 4 spaces
 opt.smartindent = true          -- Autoindent new lines
 -----------------------------------------------------------
 -- Glow Settings
@@ -115,3 +119,25 @@ function _G.trim_trailing_whitespaces()
         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
+      ]]
+

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

@@ -1,126 +0,0 @@
------------------------------------------------------------
-
--- Keymaps of Neovim and installed plugins
------------------------------------------------------------
-
-local map = vim.api.nvim_set_keymap
-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('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)
-
--- Neovim Tab Navgation via Vem-Tabline
-map('n', '<leader>t', ':tabnew<CR>', default_opts)
-map('n', '<leader>e', ':bnext<CR>', default_opts)
-map('n', '<leader>w', ':bprev<CR>', default_opts)
-map('n', '<leader>d', ':bdelete<CR>', default_opts)
-map('n', '<leader>r', '<Plug>vem_move_buffer_right', default_opts)
-map('n', '<leader>q', '<Plug>vem_move_buffer_left', default_opts)
-
------------------------------------------------------------
-
--- Applications and Plugins shortcuts
------------------------------------------------------------
-
------------------------------------------------------------
-
--- Telescope Keymaps
------------------------------------------------------------
-
--- For Neovim >= 0.7.0
-Mapper = require("nvim-mapper")
-local M = Mapper.map
-local default_opts = {noremap=true, silent=true}
-
--- Sidebar
-M('n', '<leader>n', ':SidebarNvimToggle<CR>', default_opts,
-  "Sidebar Toggle", "sidebar-toggle", "Open or Close Sidebar"
-)
-M('n', '<leader>q', ':SidebarNvimUpdate<CR>', default_opts,
-  "Sidebar Update", "sidebar-update", "Refresh the Sidebar"
-)
-
---[[ Sidebar Resize
-M('n', '<leader>=', ':SidebarNvimResize +1<CR>', default_opts,
-  "Sidebar +1", "sidebar-plus1", "Sidebar Bigger by one"
-)
-M('n', '<leader>-', ':SidebarNvimResize -1<CR>', default_opts,
-  "Sidebar -1", "sidebar-minus1", "Sidebar Smaller by one"
-)
-M('n', '<leader>==', ':SidebarNvimResize +10<CR>', default_opts,
-  "Sidebar +10", "sidebar-plus10", "Sidebar Bigger by 10"
-)
-M('n', '<leader>--', ':SidebarNvimResize -10<CR>', default_opts,
-  "Sidebar -10", "sidebar-minus10", "Sidebar Smaller by 10"
-)--]]
-
--- Lazy Git
-M('n', '<leader>lg', ":LazyGit<CR>", default_opts,
-  "Lazy Git", "lazy-git", "Show Lazy Git"
-)
-
--- Markdown Preview Toggle
-M('n', '<leader>P', ":MarkdownPreview<CR>", default_opts,
-  "Markdown Preview", "md_preview", "Display Markdown preview in browser"
-)
-
--- Telescope Options
-M('n', '<leader>ff', ':Telescope find_files<CR>', default_opts,
-  "Find Files", "find-files", "Find Files in Telescope pop-up"
-)
-M('n', '<leader>fg', ':Telescope live_grep<CR>', default_opts,
-  "Live Grep", "live-grep", "Grep Files in Telescope pop-up"
-)
-M('n', '<leader>fb', ':Telescope buffers<CR>', default_opts,
-  "Buffers", "buffers", "See Buffers in Telescope pop-up"
-)
-M('n', '<leader>fe', ":Telescope file_browser<CR>", default_opts,
-  "Telescope Files", "telescope-file-browser", "Find files and directories in telescope"
-)
-
-M('n', '<C-t>', "@t<CR>", default_opts,
-  "Add Todo", "todo_todo", "Add To-do/Task to the beginning of the line"
-)
-
-M('n', '<C-s>', "@s<CR>", default_opts,
-  "Add Solutions Engineering", "todo_seng", "Add Solutions Engineering to the beginning of the line"
-)
-
-M('n', '<C-f>', "@f<CR>", default_opts,
-  "Add Feature", "add_feat", "Add Feature Request tag to the beginning of the line. "
-)
-
-M( 'n', '<C-x>', "@c<CR>", default_opts,
-  "Replace with Complete", "add_complete", "Replace tag with Complete tag at beginning of the line."
-  )
-
-M('n', '<C-r>', "@w<CR>", default_opts,
-  "Add Warning/Error", "add_error", "Add Warning/Error tag at the beginning of the line."
-  )
-
-M('n', '<leader>ce', ":TodoTrouble keywords=TODO<CR> | :resize +10<CR>", default_opts,
-  "Show Todo Tags", "show_todos", "Show Todo Tags."
-  )
-
-M('n', '<leader>cf', ":TodoTrouble keywords=FEAT<CR>", default_opts,
-  "Show Feature Tags", "show_features", "Show Feature Requests."
-  )
-
-M('n', '<leader>cq', ":TodoTrouble keywords=ERROR, WARN<CR>", default_opts,
-  "Show Warning Tags", "show_warnings", "Show Errors Tags."
-  )
-
-M('n', '<leader>b', ":! black %<CR>", default_opts,
-  "Black Formatting", "black_current_file", "Use Black Formatting on Current File."
-)
-M('n', '<leader>m', ":! markdownlint -f %<CR>", default_opts,
-  "Markdownlint", "md_lint_format", "Use mdlint Formatting on Current File."
-)
-M('n', '<leader>r30', ":resize 30<CR>", default_opts,
-  "Resize30", "resize_30", "Resize Window to #30"
-)

nvim/.config/nvim/lua/plugins/alpha.lua

@@ -4,7 +4,7 @@
 return {
   "goolord/alpha-nvim",
   dependencies = {
-    'kyazdani42/nvim-web-devicons',
+    'nvim-tree/nvim-web-devicons',
   },
   config = function ()
       local alpha = require'alpha'

nvim/.config/nvim/lua/plugins/distant.lua

@@ -0,0 +1,16 @@
+return
+  {
+  'chipsenkbeil/distant.nvim',
+  branch = 'v0.2',
+  config = function()
+    require('distant').setup {
+      -- Applies Chip's personal settings to every machine you connect to
+      --
+      -- 1. Ensures that distant servers terminate with no connections
+      -- 2. Provides navigation bindings for remote directories
+      -- 3. Provides keybinding to jump into a remote file's parent directory
+      ['*'] = require('distant.settings').chip_default()
+    }
+  end
+}
+

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

@@ -1,48 +1,112 @@
 return {
-
 ----------------------------------------------------------------
 -- LSP and Autocomplete Plugins
 -- They should be pulled first!
 -----------------------------------------------------------------
 
-  -- Manage all your Keymaps!
+{'williamboman/mason.nvim',
+  config = function() require("mason").setup({
+    ui = {
+        icons = {
+            package_installed = "✓",
+            package_pending = "➜",
+            package_uninstalled = "✗"
+        }
+    }
+})
+  end,
+},
+  { 'williamboman/mason-lspconfig.nvim',
+    config = function() require("mason-lspconfig").setup{} end,
+  },
+  { 'neovim/nvim-lspconfig' },
+
   {
-    "gregorias/nvim-mapper",
+    'L3MON4D3/LuaSnip', version = "2.0.0",
-    config = function() require("nvim-mapper").setup{} end,
+      build = "make install_jsregexp",
-    before = "telescope.nvim"
+      dependencies = { "friendly-snippets" },
   },
 
-  -- Neovim Autocomplete with LSP
+  {"ellisonleao/glow.nvim", config = function() require("glow").setup() end },
+
+    'saadparwaiz1/cmp_luasnip',
+    'hrsh7th/cmp-nvim-lsp-signature-help',
+    'lukas-reineke/cmp-under-comparator',
+
   {
-    'L3MON4D3/LuaSnip', tag = "v1.1.0",
+    'asiryk/auto-hlsearch.nvim',
-      wants = { "friendly-snippets", "vim-snippets" },
+    version = "1.1.0",
+    config = function() require("auto-hlsearch").setup{} end,
   },
 
 ------------------------------------------------------------
 -- General Functionality
 ------------------------------------------------------------
-  'kdheepak/lazygit.nvim',
+
+  { 'MaximilianLloyd/adjacent.nvim' },
+  { 'stevearc/vim-arduino'},
+  { 'sindrets/diffview.nvim' },
+  {
+    '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',
+  dependencies = { 'nvim-tree/nvim-web-devicons' },
+  config = function() require('lualine').setup{
+    options = { theme = 'palenight' }
+  } end,
+},
+
+-- Nvim Tree File Manager on the Left
+{
+  "nvim-tree/nvim-tree.lua",
+  version = "*",
+  lazy = false,
+  dependencies = {
+    "nvim-tree/nvim-web-devicons",
+  },
+  config = function()
+    require("nvim-tree").setup {}
+  end,
+},
+
   -- Tmux Navigation
   {
     "aserowy/tmux.nvim",
     config = function() require("tmux").setup() end
   },
-  -- Find & Search LSP Tags
+  {
-  'liuchengxu/vista.vim',
+  "roobert/f-string-toggle.nvim",
+    config = function()
+      require("f-string-toggle").setup{
+	key_binding = "<leader>g"
+      }
+    end,
+  },
 
   -- Snippets
   'rafamadriz/friendly-snippets',
 
   -- Rename and Work with Buffer & Tabs
-  'pacha/vem-tabline',
+--  'pacha/vem-tabline',
+  {'romgrk/barbar.nvim',
+    dependencies = 'nvim-tree/nvim-web-devicons',
+    version = '^1.0.0', -- optional: only update when a new 1.x version is released
+  },
 
-  -- Nvim Tree File Manager on the Left
-  'nvim-tree/nvim-tree.lua',
 
   -- Trouble Shows Errors with Files.
   {
     "folke/trouble.nvim",
-    dependencies = { 'kyazdani42/nvim-web-devicons' },
+    dependencies = { 'nvim-tree/nvim-web-devicons' },
     config = function()
       require("trouble").setup {
       }
@@ -57,11 +121,22 @@ return {
       }
     end
   },
+  "hrsh7th/nvim-cmp",       -- optional, for completion
 
 -- Top Right Notify Pop Up
   'rcarriga/nvim-notify',
+  {'akinsho/toggleterm.nvim', version = "*", opts = {--[[ things you want to change go here]]}},
 
--- echasnovski Mini Modules (Selected)
+------------------------------------------------------------
+-- echasnovski's Minis get a section of their own...
+------------------------------------------------------------
+
+{
+    'echasnovski/mini.comment', version = '*',
+    config = function()
+      require('mini.comment').setup()
+    end
+  },
   {
     'echasnovski/mini.move',
     config = function()
@@ -110,29 +185,29 @@ return {
 ------------------------------------------------------------
 
    {
-    'jakewvincent/mkdnflow.nvim',
+    "iamcco/markdown-preview.nvim",
+    build = "cd app && npm install",
+    ft = "markdown",
+    lazy = true,
+    keys = { { "gm", "<cmd>MarkdownPreviewToggle<cr>", desc = "Markdown Preview" } },
     config = function()
-        require('mkdnflow').setup({
+      vim.g.mkdp_auto_close = true
-          mappings = {
+      vim.g.mkdp_open_to_the_world = false
-            MkdnToggleToDo = {{'i', 'n'}, '<C-Space>'},
+      vim.g.mkdp_open_ip = "127.0.0.1"
-            MkdnNewListItem = {{'i'}, '<CR>'},
+      vim.g.mkdp_port = "8888"
-            MkdnEnter = {{'n'}, '<CR>'},
+      vim.g.mkdp_browser = ""
-            MkdnTableNextCell = false,
+      vim.g.mkdp_echo_preview_url = true
-            MkdnTab = {{'i',}, '<Tab>'},
+      vim.g.mkdp_page_title = "${name}"
-            MkdnSTab = {{'i'}, '<S-Tab>'},
+    end,
-            MkdnFollowLink = {'n', '<leader>p'}
   },
-	  wrap = true
+ --[[
-        })
+  { 'toppair/peek.nvim',
+      build = 'deno task --quiet build:fast',
+      config = function()
+	require('peek').setup()
       end
     },
-
+    ]]--
-{ "iamcco/markdown-preview.nvim", build = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = {
-  "markdown" } end, ft = { "markdown" }, },
-
-  -- Prettier Plugin for Neovim specifically
-  'MunifTanjim/prettier.nvim',
-
   -- DAP (Debug adaptor Protocol)
   'mfussenegger/nvim-dap',
 
@@ -149,28 +224,43 @@ return {
    'sidebar-nvim/sidebar.nvim',
    config = function()
      require("sidebar-nvim").setup({
+      side = "right",
       sections = {
-	  "symbols",
    "git",
+   "symbols",
    "diagnostics",
+   "files",
    "todos",
      },
-	  initial_width = 45,
-	  hide_statusline = true,
  todos = {
    initially_closed = false, -- whether the groups should be initially closed on start. You can manually open/close groups later.
-    }
+ },
+ diagnostics = {
+   icon = "",
+ },
   })
   end
 },
 
+{
+  'rcarriga/nvim-dap-ui', dependencies = {"mfussenegger/nvim-dap"}
+},
+
 ---------------------------------------------------------
+
 -- Text, Icons, Symbols
 ----------------------------------------------------------
-  'lukas-reineke/indent-blankline.nvim',
+
+  {
     'simrat39/symbols-outline.nvim',
---  'nvim-tree/nvim-web-devicons',
+    config = function()
+      require('symbols-outline').setup()
+    end
+  },
+
+  'lukas-reineke/indent-blankline.nvim',
   'folke/lsp-colors.nvim',
+  'Mofiqul/dracula.nvim',
   'karb94/neoscroll.nvim',
 
   -- Allow Popups for Telescope etc
@@ -191,10 +281,11 @@ return {
                   -- signs = false, -- configure signs for some keywords individually
                   },
                   DONE = { icon = " ", color = "info" },
+		  IN_PROG = { icon = "󰇘", color = "default" },
                   FEAT = { icon = " ", color = "warning", alt = { "NEED", "REQUEST" } },
                   WARN = { icon = " ", color = "error", alt = { "WARNING", "ERROR" } },
                   TODO = { icon = " ", color = "hint", alt = { "TASK", "TBD" } },
-                  NOTE = { icon = " ", color = "hint", alt = { "INFO" } },
+                  RISK = { icon = " ", color = "hint", alt = { "RISK" } },
                   SENG = { icon = " ", color = "test", alt = { "SOLUTIONS", "SE", "WORKAROUND" } },
                 },
                 highlight = {
@@ -220,13 +311,14 @@ return {
   },
 
 -----------------------------------------------------------
+
 -- Various Color Schemes, Dashboard, etc
 -----------------------------------------------------------
-  'tanvirtin/monokai.nvim',
+
-  'gbprod/nord.nvim',
+ {'ray-x/starry.nvim', setup=function()
-  'Mofiqul/dracula.nvim',
+ end},
-  'lunarvim/colorschemes',
   'rose-pine/neovim',
+  'EdenEast/nightfox.nvim',
   'catppuccin/nvim',
   {
     "folke/tokyonight.nvim",
@@ -234,17 +326,40 @@ return {
     priority = 1000, -- make sure to load this before all the other start plugins
     config = function()
       -- load the colorscheme here
-      vim.cmd([[colorscheme tokyonight]])
+     --  vim.cmd([[colorscheme tokyonight]])
     end,
   },
+  { "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 = { 'kyazdani42/nvim-web-devicons' },
+    dependencies = { 'nvim-tree/nvim-web-devicons' },
   },
-  'ellisonleao/glow.nvim',
   -- Plugin that causes your code to crumble >:)
   -- 'eandrju/cellular-automaton.nvim',
 
 -- Wakatime Tracking
-  'wakatime/vim-wakatime'
+  'wakatime/vim-wakatime',
+
+----------------------------------------------
+--- Custom Plugins and Tests
+----------------------------------------------
+  {
+    dir = '/Users/normrasmussen/Documents/Projects/tasksPlugin.nvim/',
+    dev = true,
+    name = "Mkdn Tasks (DEV)",
+  },
 }
+

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.formatting.black,
+	      null_ls.builtins.diagnostics.ruff,
+	--      null_ls.builtins.diagnostics.pylama,
+	--      null_ls.builtins.diagnostics.pylint,
+	--      null_ls.builtins.diagnostics.pycodestyle,
+	    },
+	  })
+    end
+}

nvim/.config/nvim/lua/plugins/mason.lua

@@ -1,22 +0,0 @@
-return {
-    -- Easy Way to install Language Servers
-  { 'williamboman/mason.nvim',
-  },
-  'williamboman/mason-lspconfig.nvim',
-  'neovim/nvim-lspconfig',
-
-  config = function()
-    require("mason").setup()
-      local lsp_installer = require("mason-lspconfig").setup({
-	automatic_instalsation = true,
-	ui = {
-	    icons = {
-		server_installed = "✓",
-		server_pending = "➜",
-		server_uninstalled = "✗"
-	    }
-	}
-    })
-  end
-
-}

nvim/.config/nvim/lua/plugins/mkdnflow.lua

@@ -0,0 +1,41 @@
+return {
+    'jakewvincent/mkdnflow.nvim',
+    config = function()
+        require('mkdnflow').setup({
+          mappings = {
+            MkdnToggleToDo = {{'i', 'n'}, '<C-Space>'},
+            MkdnNewListItem = {{'i'}, '<CR>'},
+            MkdnEnter = {{'n'}, '<CR>'},
+            MkdnTableNextCell = false,
+            MkdnTab = {{'i',}, '<Tab>'},
+            MkdnSTab = {{'i'}, '<S-Tab>'},
+            MkdnFollowLink = {{'n'}, '<leader>p'}
+          },
+	  links = {
+	    name_is_source = true,
+	    conceal = true,
+	  },
+	  new_file_template = {
+	      use_template = true,
+	      template = [[
+# {{ title }}
+  * Date: {{ date }}
+  * Customer: {{ customer }}
+
+## Meeting Notes:]],
+		placeholders = {
+		  before = {
+		      date = function()
+			  return os.date("%A, %B %d, %Y") -- Wednesday, March 1, 2023
+		      end
+		  },
+		  after = {
+		      customer = function()
+			return vim.fn.expand('%:p:h:t')
+		      end
+		  }
+	      }
+	      },
+        })
+    end,
+  }

nvim/.config/nvim/lua/plugins/neorg.lua

@@ -0,0 +1,42 @@
+ return {
+    "nvim-neorg/neorg",
+    build = ":Neorg sync-parsers",
+    dependencies = {
+      { "nvim-lua/plenary.nvim",
+        "pysan3/neorg-templates", dependencies = { "L3MON4D3/LuaSnip" },
+    },
+  },
+    config = function()
+      require("neorg").setup {
+        load = {
+          ["core.defaults"] = {},
+          ["core.concealer"] = {},
+	  ["core.integrations.nvim-cmp"] = {},
+	  ["core.integrations.treesitter"] = {},
+	  ["core.highlights"] = {},
+	  ["core.export"] = {},
+	  ["core.mode"] = {},
+	  ["core.itero"] = {},
+	  ["core.keybinds"] = {
+	    config = {
+	      hook =  function(keybinds)
+		keybinds.remap_key("norg", "n", "<M-CR>", "<S-tab>")
+	      end,
+	    }
+	  },
+	  ["core.completion"] = {
+	    config = {
+	      engine = "nvim-cmp"
+	    },
+	  },
+          ["core.dirman"] = {
+            config = {
+              workspaces = {
+                customer_notes = "~/Documents/Work/Customer_Notes/",
+              },
+            },
+          },
+        },
+      }
+    end,
+  }

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

@@ -1,20 +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", "MD013", "MD024", "--" }
-       ,}),
-       null_ls.builtins.diagnostics.pycodestyle.with({ extra_args = { "--max-line-length=150" }}),
-       null_ls.builtins.formatting.black.with({ extra_args = { "--fast" }}),
-     },
-   })
- end
-}

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

@@ -22,18 +22,22 @@ return {
       if not luasnip_status_ok then
 	return
       end
-      --cmp.setup {
+
+      require("luasnip.loaders.from_vscode").lazy_load()
+
+      cmp.setup({
 	-- Load snippet support
-	--snippet = {
+	snippet = {
-	--  expand = function(args)
+	  expand = function(args)
-	--    luasnip.lsp_expand(args.body)
+	    luasnip.lsp_expand(args.body)
-	 -- },
+	  end
+	  },
 
 	-- Completion settings
 	completion = {
 	  --completeopt = 'menu,menuone,noselect'
 	  keyword_length = 2
-	}
+	},
 
 	-- Key mapping
 	mapping = {
@@ -68,16 +72,39 @@ return {
 	    else
 	      fallback()
 	    end
-	  end
+	  end,
-	}
+	},
-
-	-- Load sources, see: https://github.com/topics/nvim-cmp
 	sources = {
-	  { name = 'nvim-lsp' },
+	  { name = 'nvim-lsp', keyword_length = 1 },
-	  { name = 'luasnip' },
+	  { name = 'luasnip', keyword_length=2 },
 	  { name = 'path' },
-	  { name = 'buffer' },
+	  { name = 'nvim_lsp_signature_help' },
-	  { name = 'zsh' },
+	  { name = 'buffer', keyword_length = 3 },
+	  { name = 'neorg' },
+	},
+	formatting = {
+	  fields = {'menu', 'abbr', 'kind'},
+	  format = function(entry, item)
+	    local menu_icon = {
+	      nvim_lsp = 'λ',
+	      luasnip = '⋗',
+	      buffer = 'Ω',
+	      path = '',
 	    }
+	  item.menu = menu_icon[entry.source.name]
+	  return item
+	end,
+      },
+	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/nvim-lspconfig.lua

@@ -0,0 +1,51 @@
+return {
+   'neovim/nvim-lspconfig',
+   config = function()
+      -- Mappings.
+      -- See `:help vim.diagnostic.*` for documentation on any of the below functions
+      local opts = { noremap=true, silent=true }
+      vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
+      vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
+      vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
+      vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
+
+      -- Use an on_attach function to only map the following keys
+      -- after the language server attaches to the current buffer
+      local on_attach = function(client, bufnr)
+	-- Enable completion triggered by <c-x><c-o>
+	vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+
+	-- Mappings.
+	-- See `:help vim.lsp.*` for documentation on any of the below functions
+	local bufopts = { noremap=true, silent=true, buffer=bufnr }
+	vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
+	vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+	vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
+	vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
+	vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
+	vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
+	vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
+	vim.keymap.set('n', '<space>wl', function()
+	  print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+	end, bufopts)
+	vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
+	vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
+	vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
+	vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+	vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
+      end
+
+      local lsp_flags = {
+	-- This is the default in Nvim 0.7+
+	debounce_text_changes = 150,
+      }
+      require('lspconfig')['pyright'].setup{
+	  on_attach = on_attach,
+	  flags = lsp_flags,
+      }
+      require('lspconfig')['tsserver'].setup{
+	  on_attach = on_attach,
+	  flags = lsp_flags,
+      }
+   end
+}

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

@@ -0,0 +1,15 @@
+[[--return {
+  "folke/styler.nvim",
+  config = function()
+    require("styler").setup({
+      themes = {
+        markdown = { colorscheme = "tokyonight-storm" },
+	python = { colorscheme = "dracula" },
+	html = { colorscheme = "carbonfox" },
+        help = { colorscheme = "catppuccin-mocha", background = "dark" },
+	css = { colorscheme = "carbonfox" },
+      },
+    })
+  end,
+}
+--]]

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

@@ -1,6 +1,6 @@
 return {
     {
-    'nvim-telescope/telescope.nvim', tag = '0.1.0',
+    'nvim-telescope/telescope.nvim', tag = '0.1.1',
       dependencies = {
 	'nvim-lua/plenary.nvim',
 	'nvim-telescope/telescope-live-grep-args.nvim',
@@ -114,13 +114,13 @@ return {
 	      preview = {
 		treesitter = {
 		  enable = {
-		    'css', 'dockerfile', 'elixir', 'erlang', 'fish',
+		    'css', 'dockerfile', 'elixir', 'erlang', 'zsh',
 		    'html', 'http', 'javascript', 'json', 'lua', 'php',
-		    'python', 'regex', 'ruby', 'rust', 'scss', 'svelte',
+		    'python', 'regex', 'ruby', 'rust', 'scss',
-		    'typescript', 'vue', 'yaml', 'markdown', 'bash', 'c',
+		    'typescript', 'yaml', 'markdown', 'bash', 'c',
 		    'cmake', 'comment', 'cpp', 'dart', 'go', 'jsdoc',
-		    'json5', 'jsonc', 'llvm', 'make', 'ninja', 'prisma',
+		    'json5', 'jsonc', 'llvm', 'make', 'ninja',
-		    'proto', 'pug', 'swift', 'todotxt', 'toml', 'tsx',
+		    'todotxt', 'toml', 'help'
 		  }
 		}
 	      },
@@ -138,7 +138,8 @@ return {
 		    ["<C-y>"] = fb_actions.copy,
 		    ["<C-r>"] = fb_actions.rename,
 		    ["<C-w>"] = fb_actions.goto_cwd,
-		    ["<C-o>"] = fb_actions.open
+		    ["<C-o>"] = fb_actions.open,
+		    ["<C-d>"] = fb_actions.remove,
 		  },
 		},
 	      },
@@ -151,9 +152,9 @@ return {
 	    }
 	  })
       require("telescope").load_extension "file_browser"
-      require("telescope").load_extension "mapper"
       require("telescope").load_extension "live_grep_args"
       require("telescope").load_extension "fzf"
+      require("telescope").load_extension "adjacent"
     end
 
 	}}

nvim/.config/nvim/spell/en.utf-8.add

@@ -286,3 +286,35 @@ repo
 Unific
 AIIM
 FOMO
+Async
+zendesk
+centre
+centres
+consisently
+LiveStorm
+represneted
+Jagannatha
+Q2
+Gainsight
+unlinked
+Gainsight's
+RevOps
+Heraly
+Cherrill
+LeanData
+nitty
+Planhat
+Toothman
+event
+event
+MJ
+Wix
+cateogries
+cateogries
+Glassdoor
+accomodate
+Ines
+distrcits
+suggstions
+Chek's
+COO

starship/.config/starship.toml

@@ -3,11 +3,7 @@
 format = """
 $character\
 $directory\
-$username\
-$hostname\
 $python\
-$os\
-$shell\
 $fill\
 $git_branch$git_commit$git_state$git_status
 [>... ](fg:purple)
@@ -23,7 +19,7 @@ error_symbol = '[\(ಠ_ಠ\)](fg:red)'
 success_symbol = '[¯\\_\(ツ\)_/¯](fg:green)'
 
 [directory]
-truncation_length = 8
+truncation_length = 3
 
 [fill]
 symbol = '-'
@@ -41,17 +37,17 @@ format = '[$symbol$branch(:$remote_branch)]($style) '
 
 [git_status]
 style = 'bold white'
-#conflicted = '🏳'
+conflicted = '🏳'
 #ahead = '🏎💨'
 #behind = '😰'
 #diverged = '😵'
-#up_to_date = grey'✓'
+up_to_date = '✓'
 #untracked = '🤷'
 #stashed = '📦'
-#modified = '📝'
+modified = '📝'
 staged = '[++\($count\)](green)'
-#renamed = '👅'
+renamed = '👅'
-#deleted = '🗑'
+deleted = '🗑'
 
 [memory_usage]
 disabled = false

tmux/.config/tmux/tmux.conf

@@ -1,3 +1,6 @@
+set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin"
+set-window-option -g mode-keys vi
+
 # Standard Plugins
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
@@ -6,16 +9,8 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
 
-# synchronize panes toggle - literally typing at the same time in both panes!
-# unbind C-s
-# bind C-y set-window-option synchronize-panes
-
 # Search your Scrollback using fzf
-set -g @plugin 'roosta/tmux-fuzzback'
+# set -g @plugin 'roosta/tmux-fuzzback'
-
-# Open files in Neovim from another pane
-# Might not work on ZSH. Commenting out for now.
-# set -g @plugin 'trevarj/tmux-open-nvim'
 
 # Allow Focus Events
 set -g focus-events on
@@ -23,62 +18,40 @@ set -g focus-events on
 # enable mouse support
 set-option -g mouse on
 
+# Open Pane in same working directory
+# Set the control character to Ctrl+Spacebar (instead of Ctrl+B)
+set -g prefix C-b
+unbind-key C-space
+bind-key C-b send-prefix
+
+# Set new panes to open in current directory
+bind c new-window -c "#{pane_current_path}"
+bind '"' split-window -c "#{pane_current_path}"
+bind % split-window -h -c "#{pane_current_path}"
+
 # Vim-Tmux-Navigator plugin/
 set -g @plugin 'christoomey/vim-tmux-navigator'
 
-# Navigating Vim & Tmux Panes
-# Smart pane switching with awareness of Vim splits.
-#is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
-    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
-#bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h'  'select-pane -L'
-#bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j'  'select-pane -D'
-#bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k'  'select-pane -U'
-#bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l'  'select-pane -R'
-#tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
-#if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
-#    "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\'  'select-pane -l'"
-#if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
-    "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\'  'select-pane -l'"
-
-#bind-key -T copy-mode-vi 'C-h' select-pane -L
-#bind-key -T copy-mode-vi 'C-j' select-pane -D
-#bind-key -T copy-mode-vi 'C-k' select-pane -U
-#bind-key -T copy-mode-vi 'C-l' select-pane -R
-#bind-key -T copy-mode-vi 'C-\' select-pane -l
-
-# Themes
-# set -g @plugin 'o0th/tmux-nova'
-#set -g @plugin "janoamaral/tokyo-night-tmux"
-
 # Dracula
 set -g @plugin 'dracula/tmux'
-set -g @dracula-plugins "git weather network-ping cpu-usage time"
+set -g @dracula-plugins "git network-ping cpu-usage time"
 
-set -g @dracula-show-location false
-set -g @dracula-fixed-location "Parsippany, NJ"
 set -g @dracula-show-powerline true
 set -g @dracula-show-flags true
 set -g @dracula-show-left-icon window
 set -g @dracula-border-contrast true
-
-
 set -g @dracula-ping-server "overras.duckdns.org"
 set -g @dracula-ping-rate 5
-
 set -g @dracula-cpu-usage-label " "
 set -g @dracula-cpu-usage-colors "pink dark_gray"
-
 set -g @dracula-git-show-current-symbol ✓
 set -g @dracula-git-show-diff-symbol !
 set -g @dracula-git-no-repo-message ⊚
-
 set -g @dracula-show-timezone false
 set -g @dracula-military-time true
 
+#run-shell ~/.dotfiles/tmux/.config/tmux/plugins/tmux-continuum/continuum.tmux
 
-run-shell ~/clone/path/continuum.tmux
-
-# Autoreload tmux.conf
-set-option -g @plugin 'b0o/tmux-autoreload'
 # Initiazlie TMUX plugin manager - kept at bottom of file
-run '~/.config/tmux/plugins/tpm/tpm'
+# run '~/.config/tmux/plugins/tpm/tpm'
+run '~/.dotfiles/tmux/.config/tmux/plugins/tpm/tpm'

tmuxinator/.config/tmuxinator/Work.yml

@@ -1,24 +0,0 @@
-# /Users/normrasmussen/.config/tmuxinator/NvimTemplates.yml
-
-name: Northpass
-root: ~/
-windows:
-  - notes:
-      root: ~/Documents/Work/CustomerNotes
-      panes:
-        - nvim
-  - templates:
-      root: ~/Documents/Work/Custom_Templates/customer_templates/
-      panes:
-        - nvim
-  - scripts:
-      root: ~/Documents/Work/Scripts
-      layout: main-horizontal
-      panes:
-        - nvim
-        - pyenv activate np_scripts
-  - dots:
-      root: ~/.config/nvim/
-      panes:
-        - nvim
-  - tut-tut: tut

tmuxp/Work.yaml

@@ -0,0 +1,54 @@
+session_name: Northpass
+windows:
+- layout: c39e,229x45,0,0,1
+  options: {}
+  panes:
+  - focus: 'true'
+    shell_command: zsh
+  start_directory: /Users/normrasmussen/Documents/Work
+  window_name: notes
+- focus: 'true'
+  layout: c39f,229x45,0,0,2
+  options: {}
+  panes:
+  - focus: 'true'
+    shell_command: Python
+  start_directory: /Users/normrasmussen/.dotfiles/tmuxp
+  window_name: templates
+- layout: 40b3,229x45,0,0[229x42,0,0,3,229x2,0,43,4]
+  options: {}
+  panes:
+  - focus: 'true'
+    shell_command:
+    - cd /Users/normrasmussen/Documents/Work/Scripts/GoogleScripts/Luminate_API_Exam
+    - zsh
+  - shell_command:
+    - cd /Users/normrasmussen/Documents/Work/Scripts/API_Tests
+    - zsh
+  window_name: scripts
+- layout: c3c2,196x45,0,0,5
+  options: {}
+  panes:
+  - focus: 'true'
+    shell_command: zsh
+  start_directory: /Users/normrasmussen/.dotfiles
+  window_name: dots
+- layout: 60a9,229x45,0,0[229x42,0,0,6,229x2,0,43,18]
+  options: {}
+  panes:
+  - focus: 'true'
+    shell_command: zsh
+  - zsh
+  start_directory: /Users/normrasmussen/Documents/Projects/nginx_docs
+  window_name: nginx
+- layout: 0ceb,229x45,0,0{115x45,0,0,11,113x45,116,0,14}
+  options: {}
+  panes:
+  - focus: 'true'
+    shell_command:
+    - cd /Users/normrasmussen/Documents/Projects
+    - zsh
+  - shell_command:
+    - cd /Users/normrasmussen
+    - zsh
+  window_name: zsh

zsh/.zshrc

@@ -0,0 +1,59 @@
+
+# Path to your oh-my-zsh installation.
+# export ZSH="$HOME/.oh-my-zsh"
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+
+plugins=(
+    zsh-autosuggestions,
+    git,
+    wakatime,
+    brew,
+    npm,
+    z,
+    zsh-syntax-highlighting,
+    vi-mode,
+)
+
+# Zsh Autosuggestion Config
+source ~/.dotfiles/zsh/zsh-autosuggestions/
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#ff00ff,bg=cyan,bold,underline"
+
+# User configuration
+
+export DOT="~/.dotfiles"
+alias vim='vim -S ~/.vimrc'
+alias nvim='nvim'
+alias brew='env PATH="${PATH//$(pyenv root)\/shims:/}" brew'
+
+export EDITOR="$VISUAL"
+export VISUAL='nvim'
+export PYTHONPATH="/opt/homebrew/bin/python3:$PYTHONPATH"
+export PYENV_ROOT="$HOME/.pyenv"
+command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init -)"
+
+# alias nvim-minimal="NVIM_APPNAME=Minivim nvim"
+# alias nvim-arduino="NVIM_APPNAME=Arduino nvim"
+
+#function nvims() {
+#  items=("Main" "Minivim" "Arduinvim")
+#  config=$(printf "%s\n" "${items[@]}" | fzf --prompt=" Neovim Config  " --height=~50% --layout=reverse --border --exit-0)
+#  if [[ -z $config ]]; then
+#    echo "Nothing selected"
+#    return 0
+#  elif [[ $config == "Main" ]]; then
+#    config=""
+#  fi
+#  NVIM_APPNAME=$config nvim $@
+#}
+#bindkey -s ^a "nvims\n"
+
+# source /Users/normrasmussen/.docker/init-zsh.sh || true # Added by Docker Desktop
+
+export PATH="$PATH:$HOME/.rvm/bin"
+
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+export PATH="/opt/homebrew/sbin:$PATH"
+eval "$(starship init zsh)"
+export PATH="/opt/homebrew/bin:$PATH"