From 4dc6ffaa858ced00ca58bb0dbe0275117195985a Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Thu, 9 Jan 2025 15:07:42 -0500 Subject: [PATCH] Forgot what a bunch of plugins did so I cleared out the unwated ones and put comments with descriptions of what the plugins do for the more unknown ones. Bonus - great plugin idea! Add comments to you config file about what the plugin does OR an cmp/blink type app that grabs the description from the repo. --- nvim/.config/nvim/init.lua | 2 +- nvim/.config/nvim/lazy-lock.json | 79 +++--- nvim/.config/nvim/lua/plugins/alpha.backup | 113 +++++++++ nvim/.config/nvim/lua/plugins/alpha.lua | 74 ------ nvim/.config/nvim/lua/plugins/blink.lua | 81 ++++--- nvim/.config/nvim/lua/plugins/dashboard.lua | 42 ++++ nvim/.config/nvim/lua/plugins/headlines.lua | 51 ++++ .../nvim/lua/plugins/headlines.lua.backup | 51 ---- nvim/.config/nvim/lua/plugins/init.lua | 229 ++++++++++-------- nvim/.config/nvim/lua/plugins/mini-deps.lua | 37 --- zsh/.zshrc | 2 + 11 files changed, 414 insertions(+), 347 deletions(-) create mode 100644 nvim/.config/nvim/lua/plugins/alpha.backup delete mode 100644 nvim/.config/nvim/lua/plugins/alpha.lua create mode 100644 nvim/.config/nvim/lua/plugins/dashboard.lua create mode 100644 nvim/.config/nvim/lua/plugins/headlines.lua delete mode 100644 nvim/.config/nvim/lua/plugins/headlines.lua.backup delete mode 100644 nvim/.config/nvim/lua/plugins/mini-deps.lua diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 0115ee0..c41573e 100755 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -108,7 +108,7 @@ vim.cmd [[ autocmd FileType python set textwidth=250 ]] vim.cmd [[ autocmd FileType lua set textwidth=80 ]] vim.cmd [[ autocmd FileType markdown,text set shiftwidth=2 foldlevel=99 ]] -- vim.cmd [[ autocmd FileType markdown setlocal foldlevel=99 ]] -vim.cmd[[ colorscheme duskfox ]] +vim.cmd[[ colorscheme morta ]] local disabled_built_ins = { "netrw", diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 20a7bd4..146dc79 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,83 +1,74 @@ { + "LazyDo": { "branch": "main", "commit": "71c3c06f42c24e69df6c6d253cd3febbcbc87b81" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" }, - "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" }, - "avante.nvim": { "branch": "main", "commit": "01e05a538b4b7f20fb922016d72be8c42d400b0e" }, + "avante.nvim": { "branch": "main", "commit": "4b4995d6699b6f59c06f5c3f883252c9dd008b53" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, -<<<<<<< HEAD - "blink.cmp": { "branch": "main", "commit": "d534f9e8bf39299c480e0c2e11dad21f51cfb2fe" }, + "blink.cmp": { "branch": "main", "commit": "5b0f52d42ecbb374695da1a93fa40eca4dc7a7ff" }, "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, - "blink.cmp": { "branch": "main", "commit": "ae5a4ce8f7e519e49de7ae6fcadd74547f820a52" }, -======= ->>>>>>> parent of 2cafc91 (Breaking changes for blink.cmp, so that needed to be updated. Updated keymaps location based on that plugin as well.) - "blink.cmp": { "branch": "main", "commit": "ae5a4ce8f7e519e49de7ae6fcadd74547f820a52" }, + "dashboard-nvim": { "branch": "master", "commit": "ae309606940d26d8c9df8b048a6e136b6bbec478" }, "deadcolumn.nvim": { "branch": "master", "commit": "897c905aef1a268ce4cc507d5cce048ed808fa7a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dracula.nvim": { "branch": "main", "commit": "515acae4fd294fcefa5b15237a333c2606e958d1" }, - "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" }, - "eldritch.nvim": { "branch": "master", "commit": "d3df98f58841bdbd88fbe1ca27c9eb76ccca6572" }, + "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, + "eldritch.nvim": { "branch": "master", "commit": "dbfbaedfdf7b3d40050015fc16dca6aedc97d756" }, "f-string-toggle.nvim": { "branch": "main", "commit": "4e2ad79dfc5122dd65515ebbdd671e8ee01d157e" }, "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "gitsigns.nvim": { "branch": "main", "commit": "b544bd62623ca1b483d8b9bfb6d65805f112a320" }, + "headlines.nvim": { "branch": "master", "commit": "bf17c96a836ea27c0a7a2650ba385a7783ed322e" }, "hover.nvim": { "branch": "main", "commit": "140c4d0ae9397b76baa46b87c574f5377de09309" }, "img-clip.nvim": { "branch": "main", "commit": "5ff183655ad98b5fc50c55c66540375bbd62438c" }, "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, - "kanagawa.nvim": { "branch": "master", "commit": "ad3dddecd606746374ba4807324a08331dfca23c" }, - "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" }, + "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "lsp-timeout.nvim": { "branch": "main", "commit": "6325906730330105a9adc41d0ceb8499b3072e2b" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.comment": { "branch": "main", "commit": "03c13e37318bdb18481311c0ac1adc9ed731caf1" }, "mini.fuzzy": { "branch": "stable", "commit": "ea9d1380ad925c4d0e890f68dbf830d2b19bae5d" }, "mini.hipatterns": { "branch": "main", "commit": "f34975103a38b3f608219a1324cdfc58ea660b8b" }, - "mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" }, + "mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" }, "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" }, "mini.pairs": { "branch": "stable", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" }, "mini.pick": { "branch": "main", "commit": "b87f4d4e75673f6e7b918408017833424ecaa245" }, "mini.surround": { "branch": "main", "commit": "0e67c4bc147f2a15cee94e7c94dcc0e115b9f55e" }, "mini.trailspace": { "branch": "main", "commit": "3a328e62559c33014e422fb9ae97afc4208208b1" }, "mkdnflow.nvim": { "branch": "main", "commit": "d459bd7ce68910272038ed037c028180161fd14d" }, + "morta": { "branch": "main", "commit": "462308c707c0bf0dc1a5e1150ac3aabb544a3820" }, "neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" }, - "neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" }, + "neovim": { "branch": "main", "commit": "66aabf210b5e736a3df5006648d4201016e05a2a" }, "night-owl.nvim": { "branch": "main", "commit": "86ed124c2f7e118670649701288e024444bf91e5" }, - "nightfly": { "branch": "master", "commit": "f1176605eb01b38d84e0e9e221c9599bd022dfd4" }, - "nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" }, + "nightfly": { "branch": "master", "commit": "3fe724c616f5285bafbc762dd1e9830ae1815a1e" }, + "nightfox.nvim": { "branch": "main", "commit": "595ffb8f291fc4a9bef3201a28b7c0379a41cdee" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, - "nvim": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, - "nvim-cmp": { "branch": "main", "commit": "98e8b9d593a5547c126a39212d6f5e954a2d85dd" }, - "nvim-dap": { "branch": "master", "commit": "7e48a80551e0b8fd7e34436d74243de7ae1ec397" }, - "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, + "nvim": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, + "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, + "nvim-dap": { "branch": "master", "commit": "b768c8d0ce6da614ac17ed097bf2d94e35fe1a58" }, + "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" }, "nvim-http": { "branch": "main", "commit": "9a0e97b639d34af17d06b3421fe633b416dd64ee" }, - "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, - "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-prose": { "branch": "main", "commit": "38aac8c9c94a5725d152bdfea374d60e07fb93d6" }, -<<<<<<< HEAD - "nvim-treesitter": { "branch": "master", "commit": "cfbc1c0e0ff63e5b5e37b465b915b95fc2e98cef" }, + "nvim-lspconfig": { "branch": "master", "commit": "8121483b8132b7053120fafd83728178fb3febf6" }, + "nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" }, + "nvim-tree.lua": { "branch": "master", "commit": "375e38673b5c61debd8074ced01cfd4f3b7ce1e9" }, + "nvim-treesitter": { "branch": "master", "commit": "622a4a6ba76d1de52b72a965159213ae655b4ac7" }, "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" }, "nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" }, - "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" }, -======= ->>>>>>> parent of 2cafc91 (Breaking changes for blink.cmp, so that needed to be updated. Updated keymaps location based on that plugin as well.) - "nvim-tree.lua": { "branch": "master", "commit": "375e38673b5c61debd8074ced01cfd4f3b7ce1e9" }, - "nvim-treesitter": { "branch": "master", "commit": "fa915a30c5cdf1d18129e9ef6ac2ee0fa799904f" }, - "nvim-ufo": { "branch": "main", "commit": "270ca542dae992ffe40274718c63645217ebc8bf" }, - "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" }, - "oil.nvim": { "branch": "master", "commit": "dba037598843973b8c54bc5ce0318db4a0da439d" }, + "oil.nvim": { "branch": "master", "commit": "a6a4f48b14b4a51fded531c86f6c04b4503a2ef8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "77e5bad54227dcfe3878ffbda88ab1efdaacb475" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "5578ca6709e0e9a0c76fc7c484b9951b428cbb71" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, - "render-markdown.nvim": { "branch": "main", "commit": "0022a579ac7355966be5ade77699b88c76b6a549" }, - "solarized-osaka.nvim": { "branch": "main", "commit": "eebeb55b2bca73db287b5a6bf9b8c4b7d0317515" }, - "sonokai": { "branch": "master", "commit": "fd42b20963c34dfc1744ac31f6a6efe78f4edad2" }, + "render-markdown.nvim": { "branch": "main", "commit": "bab0663ecdb06b0ff846969764d6c67719ab0fcb" }, + "semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" }, + "solarized-osaka.nvim": { "branch": "main", "commit": "2663501654f8e4aa218db9cad15387b881360fe3" }, + "sonokai": { "branch": "master", "commit": "836ad3994d3d0eaea68126cabddf6319508584e8" }, "spacecamp": { "branch": "master", "commit": "8945b4a2bfaaa16fbcee9f1d7c00cb9c1256b591" }, "telescope-cmdline.nvim": { "branch": "main", "commit": "8b05928ac1b9f2b772cedde891faa6669b0ec59a" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, @@ -87,16 +78,16 @@ "thethethe.nvim": { "branch": "main", "commit": "357580127cd291c8a813564eeaff07c09303084e" }, "tmux.nvim": { "branch": "main", "commit": "307bad95a1274f7288aaee09694c25c8cbcd6f1a" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "toggleterm.nvim": { "branch": "main", "commit": "022ff5594acccc8d90d2e46dc43994f7722ebdf7" }, - "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, + "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, + "tokyonight.nvim": { "branch": "main", "commit": "7bb270adaa7692c2c33befc35f5567fc596a2504" }, "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" }, "vim-arduino": { "branch": "master", "commit": "2ded67cdf09bb07c4805d9e93d478095ed3d8606" }, "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" }, "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" }, - "vim-dadbod-completion": { "branch": "master", "commit": "9e354e86fcc67a5ec2c104f312e374ea2f89c799" }, - "vim-dadbod-ui": { "branch": "master", "commit": "0fec59e3e1e619e302198cd491b7d27f8d398b7c" }, + "vim-dadbod-completion": { "branch": "master", "commit": "95cbcf21ea7a5c8c025f387280c2e261b8cb3a89" }, + "vim-dadbod-ui": { "branch": "master", "commit": "65454e2011c029922c2c972d63f8bf04282de033" }, "vim-wakatime": { "branch": "master", "commit": "cf51327a9e08935569614d1cb24e779ee9f45519" }, - "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" }, + "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }, "wtf.nvim": { "branch": "main", "commit": "16eec1f32c3608bd8519e9e520041fe34201abb0" } } diff --git a/nvim/.config/nvim/lua/plugins/alpha.backup b/nvim/.config/nvim/lua/plugins/alpha.backup new file mode 100644 index 0000000..54a61fb --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/alpha.backup @@ -0,0 +1,113 @@ +----------------------------------------------------------- +-- startify configuration file +----------------------------------------------------------- +return { + "goolord/alpha-nvim", + dependencies = { + 'nvim-tree/nvim-web-devicons', + }, + config = function () + local alpha = require'alpha' + local startify = require'alpha.themes.startify' + + startify.section.header.val = { +"⠀⠀⠀⠀⠀⠀⠀⠉⠲⢌⠀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠶⢃⣼⣿⣷⣿⡿⠟⠃⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠀⠉⠑⠄⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡰⠋⣠⣿⣿⡿⢻⣹⡿⠃⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠰⡀⠀⠀⠒⠈⣅⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠊⢁⣴⣿⠟⠋⠀⢀⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠀⠙⢦⡠⠔⠲⢿⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⠷⠶⢶⣤⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠑⠄⣀⣴⡃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⣿⣳⣤⣴⠿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠻⣄⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠀⢹⣿⣿⡿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⢀⠀⠠⢀⠀⠀⡀⣄⠐⠢⢤⣀⡀⠹⠋⠀⠀⠀⠀⢀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠀⠀⣠⠏⠉⢛⣃⣀⣠⣤⢶⣲⣦⣤⣤⣶⣤⢂⣀⢀⡀⡀", +"⣘⣋⠀⣂⣀⡀⠄⢬⡛⠷⠄⠐⠭⠀⠐⢠⡤⠤⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⣤⣶⠲⠾⣟⢿⣽⣿⣻⣝⣯⣵⣚⣬⣛⣏⣳⠜⠱", +"⠀⠈⠛⠉⠉⠀⠦⢀⣀⡢⠔⠀⠀⠄⢰⡿⠇⠀⠀⠀⠀⣀⢀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡜⠀⠀⠌⠙⠿⣿⣴⠟⡸⢎⣽⣲⣕⣾⢾⣍⡙⠙⠋⠀⠀⠀⠀", +"⠀⠀⠐⠀⠁⠀⠁⠘⠓⠀⠉⠀⠚⠀⢸⠀⡖⠀⠀⠀⠀⣿⡄⢳⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡆⢰⡇⠀⢻⠀⠀⣶⠚⣧⠚⢱⢫⡗⣦⢹⣼⣦⡌⠉⠛⠂⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠁⢀⠤⠀⠀⠘⠉⣀⣴⣉⠉⠁⠀⡼⠀⠀⠙⣧⣿⡄⠀⢀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡧⢞⠁⠀⢺⣧⡀⢸⡯⣝⣾⣏⠿⣍⠛⠶⣶⣌⢻⣦⠀⡀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠀⠄⡩⠂⠈⠁⣠⠖⣶⣶⡞⠁⡄⠀⣼⡯⠀⡾⠀⠀⠑⣤⡀⠀⠀⠀⠀⡴⠀⢀⠾⡇⠀⢾⡰⠀⣴⠙⣿⣮⡷⢻⡝⣿⣯⣿⣟⣦⣬⡿⠙⠁⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠖⠉⠀⠐⠃⢰⠏⣰⠟⣹⠏⠀⢻⣿⣤⡇⠀⠀⡀⠀⠱⠀⠀⠀⣞⠤⢀⡾⠊⢳⣀⡼⠃⢲⣿⣟⢻⡽⣿⠀⢻⠘⢭⣻⣿⡿⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡿⣴⢋⡐⠃⢠⠾⢏⣽⣿⡚⢦⣌⠻⣦⡀⠀⠀⠈⣠⣴⣿⠄⡔⠚⣟⠀⢀⢯⣉⣿⣞⣷⣿⣇⢌⣇⠀⠉⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠞⡽⠙⢻⣧⡾⠩⢆⡞⣿⣿⣧⣈⡏⢧⠸⣇⡀⠀⣰⡿⠟⠁⢸⠀⣲⣿⠃⢢⢿⣿⣿⣿⣣⢾⡌⢦⠛⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠳⡤⣾⡿⠁⠉⠿⣌⣽⣷⣯⣽⡷⠾⣀⢸⣿⠤⣿⣵⠓⠢⠞⠀⠀⠈⡉⠈⢉⣁⠘⣿⣿⠾⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡀⠀⠘⠁⠢⢽⡿⠟⠋⣁⡢⣥⣼⠾⠗⣋⣤⣤⣀⡈⠉⠓⢤⣠⣀⣀⠉⠀⢿⢟⠓⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣴⠉⢀⣀⡘⢻⣿⣿⢠⣤⣬⣿⣿⡟⠁⣠⡾⢛⣭⣤⣀⠉⠑⢦⡀⢻⣿⣿⣿⣦⣨⣿⣿⣿⣷⡦⡀⠀⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⢠⣤⣴⣦⣴⣿⣿⣾⣯⡿⢿⡱⣿⣷⣿⣾⣿⣿⠿⠶⣿⣿⡀⢻⣿⣿⣿⡇⠀⢀⣿⠶⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣾⣿⣿⣷⡄⣄⢤⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⢀⣼⣷⠈⣧⣽⣿⣪⣿⡿⣿⣛⣻⣴⣿⣿⣿⣿⣿⣿⣿⣦⣤⣽⣿⣾⣿⣟⠯⠴⠶⠟⣂⣠⣴⣿⣿⣿⣽⡿⣷⣾⣿⣿⣿⣿⣿⣿⣿⣧⣾⣤⡶⣆⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⡠⡺⢿⣤⣷⣼⢟⢃⢱⠿⡄⡈⣿⣿⣿⣿⣿⣿⣿⣿⣿⢿⣿⡿⣿⢿⣷⣤⣭⣽⣶⡷⠚⠹⣿⣿⣿⣿⣷⣏⣿⡟⣿⣿⣿⣟⣾⣿⣟⣿⣿⣿⣿⣧⣼⠁⠀⠀⠀⠀⠀⠀", +"⠀⢀⣴⡎⠀⡸⠋⠙⡜⢘⡾⢽⡜⢳⡧⣄⡈⠡⠼⠿⣿⣏⣃⣛⢿⡿⡟⠈⠀⠀⠻⣿⠇⣸⠁⠄⠙⢿⠿⠋⡉⣙⢋⡿⢿⡿⣶⣾⣿⠿⣿⣿⡟⢛⣿⠛⣿⣷⡽⣶⡄⠀⠀⠀⠀", +"⠀⠔⡟⠁⠀⡀⠀⠀⡀⠈⠁⠀⣷⡘⣇⠀⠁⠀⡄⢤⣿⣿⣿⣿⣿⣅⣅⡆⠀⠀⣴⣿⣿⣾⣦⣠⣽⣼⣷⡻⣿⡹⣿⣷⣷⢾⢋⣭⣿⣿⡟⢸⡟⠠⣽⡈⠿⣿⠄⢹⣿⢄⠀⠀⠀", +"⠈⠘⠀⠀⠀⣣⠀⠀⠳⠄⠸⡀⢹⣧⠘⣇⠀⠀⠀⣔⣿⣿⣿⣿⣧⣿⡿⣿⣅⠀⠻⣿⢃⣴⣿⣿⣿⣿⣷⣧⡬⢽⣿⣯⠷⣬⣩⡿⣰⠿⢬⣿⣧⣿⣿⣧⣷⣿⠦⢆⣿⣆⠀⠀⠀", +"⡆⢀⠀⠀⠠⡟⠀⠀⠀⠀⡀⢷⠀⠹⣷⡹⠦⣄⣈⣻⣿⣿⣿⣿⢿⣿⣇⢹⣿⢷⣶⣿⣷⣿⣿⣏⣿⠟⠻⣿⣴⡿⠭⣿⣿⣿⣿⠟⠓⠐⣾⣿⣽⢿⣿⠋⠟⣿⡖⢺⣻⣽⡄⠀⠀", +"⡀⠀⠀⠀⠘⡇⠀⠀⠀⠀⠀⠘⢆⠐⣿⣿⣿⡾⢿⣿⣿⣟⣯⡿⣛⣶⡞⣯⡝⣼⣯⣿⣿⣿⣿⣿⣿⣶⣿⣿⣿⡐⠖⠾⠽⢬⣝⣤⡄⢿⢿⣏⣽⣶⡤⠌⠰⡟⢹⣼⠿⢹⣿⡄⠀", +"⠀⠀⠲⠀⠀⣧⠀⠀⠀⠀⣀⣤⠜⠉⠁⠀⠀⠀⠀⠹⣿⣿⣟⣳⣿⣵⡄⣰⣿⣿⣿⣿⣿⣿⣿⣹⣿⡿⢿⡏⣁⠀⠀⠁⠀⠀⠀⠀⠀⠀⢾⠿⠇⠹⠇⣈⣱⣿⠘⢿⡿⠿⡋⠳⠀", +"⠀⠀⠀⠀⢠⠁⠀⣅⠴⠚⠁⠀⢀⠀⠀⠀⠀⠀⠀⢤⣤⣭⣿⣯⡽⢿⣡⢿⣯⡿⠃⠀⠙⣬⣿⠿⣽⣷⣄⣙⣦⣤⡠⠄⠀⠀⠀⠀⠀⢀⠀⠀⠀⠉⢩⢿⣿⣿⢀⣸⣋⡀⠀⠀⠰", +"⠀⡀⢦⡀⠀⠀⠀⢻⡀⠀⠀⢀⣿⣿⣿⣿⣶⣦⣀⠐⢿⡿⢽⣛⣱⣿⡿⠛⣿⠁⠀⠀⠀⠈⡁⠀⢹⠋⡈⡇⠈⠔⠀⠀⠀⣴⣶⡯⣹⣷⣄⡀⠀⠀⠀⡠⠬⠞⢰⣾⣿⣻⠀⠀⠨", +"⠀⠀⠀⠀⠀⠀⠀⠀⡇⠀⠘⣿⣿⣿⣿⣿⣿⣿⡿⣿⣧⣇⣸⣿⠟⠛⠀⢸⡿⠀⠀⠀⠀⠀⡿⠀⠛⠀⠛⠃⠀⣠⣤⠀⢿⣟⣿⡿⣿⠤⣿⠟⠀⠀⠀⠀⠀⠀⠃⠀⠀⠀⠀⠀⠸", +"⠀⠀⠀⠀⠀⠀⠀⣀⠇⠠⣙⣋⣛⡉⣍⡹⣿⣿⢯⣏⣺⣿⡞⠉⠀⠀⠀⠀⠃⠀⠀⠀⠀⠀⢸⠀⠰⡀⠀⡀⠀⢝⠫⡀⢬⢷⡼⠀⠀⠉⠉⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⠀⠀⠀⠀⢿⡠⠑⡀⠉⠙⠛⠛⠷⣿⣿⣿⡿⠿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠀⠀⠙⠤⡀⠀⣄⢧⢉⣿⣿⡦⠄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⡀⠀⢤⡄⠀⠙⠃⠁⠈⠉⠛⠶⣦⣿⣿⣿⣿⣿⣆⣤⠀⠀⠀⠀⠁⠀⠀⠀⠀⠀⠀⠀⢈⠀⠀⠀⡁⢤⣼⣿⣿⣆⠁⠀⠀⠂⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠐⠀⠀⠀⢋⠖⠀⢈⣕⣶⣤⣤⣾⣿⢿⣛⣿⣻⣿⣿⣿⣿⣾⢧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢧⡀⢠⣳⣞⣷⣦⣥⣭⣙⠳⣌⠷⣖⣠⣄⣠⠀⢀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠤⡄⠊⠔⠂⠈⠘⣿⣿⠿⣯⣾⣿⣿⢿⣻⣿⠭⢩⣿⣿⣿⢿⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⣧⣿⣷⡇⣽⣯⣀⡉⣉⣧⠈⠿⣿⣶⣦⡌⠓⢻⣷⠀⠀⠀⠀⠀⠀⠀⠀⠀", +"⠁⠄⠁⠌⢀⡒⡀⣋⠁⢦⣿⣿⣿⣟⣿⣿⣿⣶⣿⣿⣿⣿⠤⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⢞⣯⣷⠚⢻⣽⠶⣮⣝⢶⢤⣞⡻⠗⡀⠀⢀⡀⠀⢀⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠀⢈⣉⣉⣻⡶⣿⣾⣿⣿⣶⣼⣻⣿⣶⣿⣿⠻⣓⠾⠟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠛⢿⣻⡿⡷⢀⣾⣿⠷⠄⠀⣈⣱⣒⠛⠚⠂⣁⠀⠀⠀⠀⠀⠀⠀", +"⠀⠀⠈⠤⠽⢛⣿⣿⣻⣩⣱⣾⣿⣿⣿⣿⡿⢱⣊⠶⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠑⠂⠐⠀⠻⡿⠛⠀⠳⠀⠀⠈⠙⠛⠁⠀⠀⠐⠂⠀⠀⠀⠀", +"⠘⠃⣀⣀⣠⣛⣊⣹⡟⠛⡟⢋⣩⣽⣿⢛⠛⠀⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠐⠁⠀⠈⠀⠀⠀⠀⠀⠈⠀⠀⠀", + -- " ", + -- " █████ █████ ██████ █████ ███ ", + -- "░░███ ░░███ ░░██████ ░░███ ░███ ", + -- " ░███ ░███ ██████ █████ ████ ░███░███ ░███ ██████ ████████ █████████████ ░███ ", + -- " ░███████████ ███░░███░░███ ░███ ░███░░███░███ ███░░███░░███░░███░░███░░███░░███░███ ", + -- " ░███░░░░░███ ░███████ ░███ ░███ ░███ ░░██████ ░███ ░███ ░███ ░░░ ░███ ░███ ░███░███ ", + -- " ░███ ░███ ░███░░░ ░███ ░███ ░███ ░░█████ ░███ ░███ ░███ ░███ ░███ ░███░░░ ", + -- " █████ █████░░██████ ░░███████ █████ ░░█████░░██████ █████ █████░███ ████████ ", + -- "░░░░░ ░░░░░ ░░░░░░ ░░░░░███ ░░░░░ ░░░░░ ░░░░░░ ░░░░░ ░░░░░ ░░░ ░░░░░░░░ ", + -- " ███ ░███ ", + -- " ░░██████ ", + -- " ░░░░░░ ", + } + + + --[[ startify.section.mru.val = { + { type = "text", + val = findtodos, + opts = { + position = "left", + hl = {{"hl_group", 0, -2}} + } + } + }--]] + startify.section.mru_cwd.val = { { type = "padding", val = 0 } } + + -- Devicons - Not sure what this doe + startify.nvim_web_devicons.enabled = false + startify.nvim_web_devicons.highlight = false + startify.nvim_web_devicons.highlight = 'Number' + + -- Top Menu + startify.section.top_buttons.val = { + startify.button('e', ' New file', ':ene startinsert'), + startify.button('f', ' Find file', ':Telescope file_browser'), + startify.button('s', '⋅Find Word', ':Telescope live_grep'), + startify.button('t', '& Todo List', ':TodoTrouble keywords=TODO'), + startify.button('r', ' ' .. ' Recent files', ':Telescope oldfiles '), + startify.button('u', ' Show plugins', ':Lazy'), + startify.button('q', ' Quit', ':qa'), + } + + -- Bottom Menu + startify.section.bottom_buttons.val = { + -- Show Empty Space + } + +--[[ local function footer() + local version = vim.version() + local print_version = "v" .. version.major .. '.' .. version.minor .. '.' .. version.patch + local datetime = os.date('%Y/%m/%d %H:%M:%S') + return print_version .. ' ' .. datetime + end + --]] + + startify.section.footer.val = { + + } + alpha.setup(startify.config) + end + } diff --git a/nvim/.config/nvim/lua/plugins/alpha.lua b/nvim/.config/nvim/lua/plugins/alpha.lua deleted file mode 100644 index c509026..0000000 --- a/nvim/.config/nvim/lua/plugins/alpha.lua +++ /dev/null @@ -1,74 +0,0 @@ ------------------------------------------------------------ --- startify configuration file ------------------------------------------------------------ -return { - "goolord/alpha-nvim", - dependencies = { - 'nvim-tree/nvim-web-devicons', - }, - config = function () - local alpha = require'alpha' - local startify = require'alpha.themes.startify' - - startify.section.header.val = { - " ", - " █████ █████ ██████ █████ ███ ", - "░░███ ░░███ ░░██████ ░░███ ░███ ", - " ░███ ░███ ██████ █████ ████ ░███░███ ░███ ██████ ████████ █████████████ ░███ ", - " ░███████████ ███░░███░░███ ░███ ░███░░███░███ ███░░███░░███░░███░░███░░███░░███░███ ", - " ░███░░░░░███ ░███████ ░███ ░███ ░███ ░░██████ ░███ ░███ ░███ ░░░ ░███ ░███ ░███░███ ", - " ░███ ░███ ░███░░░ ░███ ░███ ░███ ░░█████ ░███ ░███ ░███ ░███ ░███ ░███░░░ ", - " █████ █████░░██████ ░░███████ █████ ░░█████░░██████ █████ █████░███ ████████ ", - "░░░░░ ░░░░░ ░░░░░░ ░░░░░███ ░░░░░ ░░░░░ ░░░░░░ ░░░░░ ░░░░░ ░░░ ░░░░░░░░ ", - " ███ ░███ ", - " ░░██████ ", - " ░░░░░░ ", - } - - - --[[ startify.section.mru.val = { - { type = "text", - val = findtodos, - opts = { - position = "left", - hl = {{"hl_group", 0, -2}} - } - } - }--]] - startify.section.mru_cwd.val = { { type = "padding", val = 0 } } - - -- Devicons - Not sure what this doe - startify.nvim_web_devicons.enabled = false - startify.nvim_web_devicons.highlight = false - startify.nvim_web_devicons.highlight = 'Number' - - -- Top Menu - startify.section.top_buttons.val = { - startify.button('e', ' New file', ':ene startinsert'), - startify.button('f', ' Find file', ':Telescope file_browser'), - startify.button('s', '⋅Find Word', ':Telescope live_grep'), - startify.button('t', '& Todo List', ':TodoTrouble keywords=TODO'), - startify.button('r', ' ' .. ' Recent files', ':Telescope oldfiles '), - startify.button('u', ' Show plugins', ':Lazy'), - startify.button('q', ' Quit', ':qa'), - } - - -- Bottom Menu - startify.section.bottom_buttons.val = { - -- Show Empty Space - } - ---[[ local function footer() - local version = vim.version() - local print_version = "v" .. version.major .. '.' .. version.minor .. '.' .. version.patch - local datetime = os.date('%Y/%m/%d %H:%M:%S') - return print_version .. ' ' .. datetime - end - --]] - - startify.section.footer.val = { - - } - alpha.setup(startify.config) - end - } diff --git a/nvim/.config/nvim/lua/plugins/blink.lua b/nvim/.config/nvim/lua/plugins/blink.lua index dec4005..a3f55d7 100644 --- a/nvim/.config/nvim/lua/plugins/blink.lua +++ b/nvim/.config/nvim/lua/plugins/blink.lua @@ -1,49 +1,58 @@ return { 'saghen/blink.cmp', lazy = false, -- lazy loading handled internally - -- optional: provides snippets for the snippet source + version = '*', dependencies = { 'rafamadriz/friendly-snippets', - 'L3MON4D3/LuaSnip', + 'L3MON4D3/LuaSnip', version = 'v2.*', }, - version = 'v0.*', opts = { keymap = { - preset = "enter", + preset = "default", + [''] = { 'show', 'show_documentation', 'hide_documentation' }, + [''] = { 'hide', 'fallback' }, + [''] = { + function(cmp) + if cmp.snippet_active() then return cmp.accept() + else return cmp.select_and_accept() end + end, + 'snippet_forward', + 'fallback' + }, + [''] = { 'snippet_backward', 'fallback' }, - [""] = { - "select_next", - "snippet_forward", - "fallback", - }, + [''] = { 'select_prev', 'fallback' }, + [''] = { 'select_next', 'fallback' }, + [''] = { 'select_prev', 'fallback' }, + [''] = { 'select_next', 'fallback' }, - [""] = { - "select_prev", - "snippet_backward", - "fallback", - }, + [''] = { 'scroll_documentation_up', 'fallback' }, + [''] = { 'scroll_documentation_down', 'fallback' }, + }, + appearance = { + use_nvim_cmp_as_default = true, + nerd_font_variant = 'normal', + }, + completion = { + menu = { auto_show = function(ctx) return ctx.mode ~= 'cmdline' end }, + -- keyword = { range = 'prefix', regex = '[%w_\\-]'}, + -- trigger = { show_on_blocked_trigger_characters = function() + -- if vim.api.nvim_get_mode().mode == 'c' then return {} end + -- return { ' ', '\n', '\t' } + -- end }, + }, + snippets = { + expand = function(snippet) require('luasnip').lsp_expand(snippet) end, + active = function(filter) + if filter and filter.direction then + return require('luasnip').jumpable(filter.direction) + end + return require('luasnip').in_snippet() + end, + jump = function(direction) require('luasnip').jump(direction) end, }, - - highlight = { - use_nvim_cmp_as_default = true, - nerd_font_variant = 'normal', - } - }, - trigger = { - completion = { - keyword_regex = '[%w_\\-]', - blocked_trigger_characters = { ' ', '\n', '\t' }, - show_on_insert_on_trigger_character = true, - } - }, sources = { - providers = { - { - { 'blink.cmp.sources.lsp' }, - { 'blink.cmp.sources.path' }, - { 'blink.cmp.sources.snippets', score_offset = -1 }, - }, - { { 'blink.cmp.sources.buffer' } }, - } - }, + default = {'lsp', 'path', 'snippets', 'buffer'}, + }, } +} diff --git a/nvim/.config/nvim/lua/plugins/dashboard.lua b/nvim/.config/nvim/lua/plugins/dashboard.lua new file mode 100644 index 0000000..3733a5e --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/dashboard.lua @@ -0,0 +1,42 @@ +return { +{ + 'nvimdev/dashboard-nvim', + event = 'VimEnter', + config = function() + require('dashboard').setup { + theme = 'hyper', + config = { + week_header = { + enable = true, + }, + shortcut = { + { desc = '󰊳 Update', group = '@property', action = 'Lazy update', key = 'u' }, + { + icon = ' ', + icon_hl = '@variable', + desc = 'Files', + group = 'Label', + action = 'Telescope find_files', + key = 'f', + }, + { + desc = ' Apps', + group = 'DiagnosticHint', + action = 'Telescope app', + key = 'a', + }, + { + desc = ' dotfiles', + group = 'Number', + action = 'Telescope dotfiles', + key = 'd', + }, + }, + }, + } + end, + dependencies = { { "echasnovski/mini.icons", opts = {} } }, + -- dependencies = { {'nvim-tree/nvim-web-devicons'}} +} + +} diff --git a/nvim/.config/nvim/lua/plugins/headlines.lua b/nvim/.config/nvim/lua/plugins/headlines.lua new file mode 100644 index 0000000..41ae07a --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/headlines.lua @@ -0,0 +1,51 @@ +return { + 'lukas-reineke/headlines.nvim', + dependencies = "nvim-treesitter/nvim-treesitter", + config = function() + require("headlines").setup { + markdown = { + query = vim.treesitter.query.parse( + "markdown", + [[ + (atx_heading [ + (atx_h1_marker) + (atx_h2_marker) + (atx_h3_marker) + (atx_h4_marker) + (atx_h5_marker) + (atx_h6_marker) + ] @headline) + + (thematic_break) @dash + + (fenced_code_block) @codeblock + + (block_quote_marker) @quote + (block_quote (paragraph (inline (block_continuation) @quote))) + ]] + ), + headline_highlights = { + 'Headline1', + 'Headline2', + 'Headline3', + 'Headline4', + 'Headline5', + 'Headline6', + }, + codeblock_highlight = "CodeBlock", + dash_highlight = "Dash", + dash_string = "-", + quote_highlight = "Quote", + quote_string = "┃", + fat_headlines = false, + }, + } + vim.api.nvim_set_hl(0, 'Headline1', { fg = '#ffffff', bg = '#6272A4', italic = false }) + vim.api.nvim_set_hl(0, 'Headline2', { fg = '#000000', bg = '#8BE9FD', italic = false }) + vim.api.nvim_set_hl(0, 'Headline3', { fg = '#000000', bg = '#BD93F9', italic = false }) + vim.api.nvim_set_hl(0, 'Headline4', { fg = '#000000', bg = '#FFB86C', italic = false }) + vim.api.nvim_set_hl(0, 'Headline5', { fg = '#000000', bg = '#FF79C6', italic = false }) + vim.api.nvim_set_hl(0, 'Headline6', { fg = '#000000', bg = '#FF5555', italic = false }) + vim.api.nvim_set_hl(0, 'CodeBlock', { bg = '#222221' }) + end +} diff --git a/nvim/.config/nvim/lua/plugins/headlines.lua.backup b/nvim/.config/nvim/lua/plugins/headlines.lua.backup deleted file mode 100644 index 7eded28..0000000 --- a/nvim/.config/nvim/lua/plugins/headlines.lua.backup +++ /dev/null @@ -1,51 +0,0 @@ --- return { --- 'lukas-reineke/headlines.nvim', --- dependencies = "nvim-treesitter/nvim-treesitter", --- config = function() --- require("headlines").setup { --- markdown = { --- query = vim.treesitter.query.parse( --- "markdown", --- [[ --- (atx_heading [ --- (atx_h1_marker) --- (atx_h2_marker) --- (atx_h3_marker) --- (atx_h4_marker) --- (atx_h5_marker) --- (atx_h6_marker) --- ] @headline) --- --- (thematic_break) @dash --- --- (fenced_code_block) @codeblock --- --- (block_quote_marker) @quote --- (block_quote (paragraph (inline (block_continuation) @quote))) --- ]] --- ), --- headline_highlights = { --- 'Headline1', --- 'Headline2', --- 'Headline3', --- 'Headline4', --- 'Headline5', --- 'Headline6', --- }, --- codeblock_highlight = "CodeBlock", --- dash_highlight = "Dash", --- dash_string = "-", --- quote_highlight = "Quote", --- quote_string = "┃", --- fat_headlines = false, --- }, --- } --- vim.api.nvim_set_hl(0, 'Headline1', { fg = '#ffffff', bg = '#6272A4', italic = false }) --- vim.api.nvim_set_hl(0, 'Headline2', { fg = '#000000', bg = '#8BE9FD', italic = false }) --- vim.api.nvim_set_hl(0, 'Headline3', { fg = '#000000', bg = '#BD93F9', italic = false }) --- vim.api.nvim_set_hl(0, 'Headline4', { fg = '#000000', bg = '#FFB86C', italic = false }) --- vim.api.nvim_set_hl(0, 'Headline5', { fg = '#000000', bg = '#FF79C6', italic = false }) --- vim.api.nvim_set_hl(0, 'Headline6', { fg = '#000000', bg = '#FF5555', italic = false }) --- vim.api.nvim_set_hl(0, 'CodeBlock', { bg = '#222221' }) --- end --- } diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 441266b..712d039 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -36,8 +36,6 @@ return { require("luasnip").filetype_extend("liquid", {"html","css","javascript"}) require("luasnip.loaders.from_vscode").lazy_load() require("luasnip.loaders.from_vscode").load({ - paths = { - "~/.dotfiles/nvim/.config/nvim/lua/custom_snippets/" } }) -- require("luasnip.extras.filetype_functions").extend_load_ft({ -- liquid = {"html", "css", "javascript" }, @@ -45,38 +43,80 @@ return { end, }, - -- {"ellisonleao/glow.nvim", config = function() require("glow").setup() end }, - - -- 'saadparwaiz1/cmp_luasnip', - -- 'hrsh7th/cmp-nvim-lsp-signature-help', - -- 'lukas-reineke/cmp-under-comparator', - - -- { - -- 'asiryk/auto-hlsearch.nvim', - -- version = "1.1.0", - -- config = function() require("auto-hlsearch").setup{} end, - -- }, ------------------------------------------------------------ -- General Functionality ------------------------------------------------------------ + -- Todo Manager + { + "Dan7h3x/LazyDo", + branch = "main", + keys = { + { + "","LazyDoToggle", + mode = {"n","i"}, + }, + }, + event = "VeryLazy", + opts = {}, + }, + + -- Neovim statusline + { + 'nvim-lualine/lualine.nvim', + dependencies = { { "echasnovski/mini.icons", opts = {} } }, + config = function() require('lualine').setup({ + options = { + theme = 'nord', + -- always_divide_middle = false, + }, + sections = { + lualine_x = { { + function() + return require("lazydo").get_lualine_stats() + end, + cond = function() + return require("lazydo")._initialized + end, + }, + {"fileformat", symbols = { unix = " " }, "filetype" }, + }, + }, + }) + end, + }, + + -- A file explorer that lets you edit your filesystem like a normal Neovim buffer. { 'stevearc/oil.nvim', opts = {}, dependencies = { { "echasnovski/mini.icons", opts = {} } }, - -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons }, + + -- vim plugin for asynchronous synchronisation of remote files and local files using rsync { 'kenn7/vim-arsync', dependencies={'prabirshrestha/async.vim'}, }, + --The goal of nvim-ufo is to make Neovim's fold look modern and keep high performance. {'kevinhwang91/nvim-ufo', requires = 'kevinhwang91/promise-async'}, + -- Open telescope and show files in the same directory as the current buffer. { 'MaximilianLloyd/adjacent.nvim' }, - 'BlackLight/nvim-http', + + --You can use this plugin to run HTTP requests directly in your favorite text editor. + { 'BlackLight/nvim-http' }, + + -- Vim plugin for compiling, uploading, and debugging arduino sketches. + -- It uses arduino-cli when available (recommended), and falls back to + -- using the Arduino IDE's commandline interface (new in 1.5.x). { 'stevearc/vim-arduino'}, + + -- Single tabpage interface for easily cycling through diffs for all modified files for any git rev. + -- :DiffviewFileHistory % { 'sindrets/diffview.nvim' }, - { 'skwee357/nvim-prose' }, + + -- numb.nvim is a Neovim plugin that peeks lines of the buffer in non-obtrusive way. { 'nacro90/numb.nvim', config = function() require('numb').setup{ @@ -88,53 +128,39 @@ return { } end, }, - { - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = function() require('lualine').setup({ - options = { - theme = 'material', - always_divide_middle = false, + +-- Nvim Tree File Manager on the Left +{ + "nvim-tree/nvim-tree.lua", + version = "*", + lazy = false, + dependencies = { { "echasnovski/mini.icons", opts = {} } }, + -- dependencies = { "nvim-tree/nvim-web-devicons"}, + config = function() + require("nvim-tree").setup({ + sort_by = "case_sensitive", + view = { + width = 30, }, - sections = { - lualine_x = { "encoding", { "fileformat", symbols = { unix = " " } }, "filetype" }, + renderer = { + group_empty = true, }, -}) + filters = { + dotfiles = true, + }, + diagnostics = { + enable = true, + }, + }) 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({ --- sort_by = "case_sensitive", --- view = { --- width = 30, --- }, --- renderer = { --- group_empty = true, --- }, --- filters = { --- dotfiles = true, --- }, --- diagnostics = { --- enable = true, --- }, --- }) --- end, --- }, --- -- Tmux Navigation { "aserowy/tmux.nvim", config = function() require("tmux").setup() end }, + -- Toggle an f-string when cursor is inside quoted string. { "roobert/f-string-toggle.nvim", config = function() @@ -148,9 +174,8 @@ return { 'rafamadriz/friendly-snippets', -- Rename and Work with Buffer & Tabs --- 'pacha/vem-tabline', {'romgrk/barbar.nvim', - dependencies = 'nvim-tree/nvim-web-devicons', + dependencies = { { "echasnovski/mini.icons", opts = {} } }, version = '^1.0.0', -- optional: only update when a new 1.x version is released }, @@ -158,14 +183,15 @@ return { -- Trouble Shows Errors with Files. { "folke/trouble.nvim", - dependencies = { 'nvim-tree/nvim-web-devicons' }, + dependencies = { { "echasnovski/mini.icons", opts = {} } }, + -- dependencies = { 'nvim-tree/nvim-web-devicons' }, config = function() require("trouble").setup { } end }, --- Which Key + -- Which Key - pop-up that shows keymaps. { "folke/which-key.nvim", config = function() @@ -173,7 +199,6 @@ return { } end }, - -- "hrsh7th/nvim-cmp", -- optional, for completion -- Top Right Notify Pop Up { @@ -185,16 +210,16 @@ return { vim.notify = require('notify') end }, - + -- Custom Terminal within Neovim {'akinsho/toggleterm.nvim', version = "*", opts = { direction = 'float', }}, + ------------------------------------------------------------ -- echasnovski's Minis get a section of their own... ------------------------------------------------------------ - { 'echasnovski/mini.pick', version = '*', config = function() require('mini.pick').setup() @@ -211,15 +236,15 @@ return { config = function() require('mini.move').setup({ mappings = { - left = '', - right = '', - down = '', - up = '', + left = '', + right = '', + down = '', + up = '', - line_left = '', - line_right = '', - line_down = '', - line_up = '', + line_left = '', + line_right = '', + line_down = '', + line_up = '', } }) end @@ -293,14 +318,7 @@ return { -- end, -- }, { "jbyuki/venn.nvim" }, - --[[ - { 'toppair/peek.nvim', - build = 'deno task --quiet build:fast', - config = function() - require('peek').setup() - end - }, - ]]-- + -- DAP (Debug adaptor Protocol) 'mfussenegger/nvim-dap', @@ -404,7 +422,6 @@ return { opts = {}, }, 'Mofiqul/dracula.nvim', - -- 'ray-x/starry.nvim', 'rose-pine/neovim', 'EdenEast/nightfox.nvim', 'rebelot/kanagawa.nvim', @@ -418,6 +435,15 @@ return { -- load the colorscheme here vim.cmd.colorscheme("night-owl") end, + }, + { + "philosofonusus/morta.nvim", + name = 'morta', + priority = 1000, + opts = {}, + config = function() + vim.cmd.colorscheme 'morta' + end, }, { "folke/tokyonight.nvim", @@ -430,14 +456,9 @@ return { }, { 'bluz71/vim-nightfly-colors', name = "nightfly", lazy = true, priority = 1000 }, 'Bekaboo/deadcolumn.nvim', - -- { - -- "dustypomerleau/tol.nvim", - -- lazy = false, -- load the colorscheme at startup - -- priority = 1000, -- load colorscheme first - -- config = true, - -- }, -- UI Improvements and Changes + -- This is a Neovim plugin to autocorrect common misspellings and typos. If you type teh, neovim will automatically correct it to the. { "https://git.sr.ht/~swaits/thethethe.nvim", lazy = true, @@ -445,27 +466,27 @@ return { opts = { }, }, 'HiPhish/rainbow-delimiters.nvim', - -- { - -- "wookayin/semshi", - -- ft = "python", - -- build = ":UpdateRemotePlugins", - -- config = function() - -- vim.api.nvim_set_hl(0, "semshiLocal", { ctermfg=209, fg="#80aa9e" } ) - -- vim.api.nvim_set_hl(0, "semshiGlobal", { ctermfg=214, fg="#d3869b" } ) - -- vim.api.nvim_set_hl(0, "semshiImported", { ctermfg=214, fg="#8bba7f", cterm=bold, gui=bold } ) - -- vim.api.nvim_set_hl(0, "semshiParameter", { ctermfg=75, fg="#8bba7f" } ) - -- vim.api.nvim_set_hl(0, "semshiParameterUnused", { ctermfg=117, fg="#34381b", cterm=underline, gui=underline} ) - -- vim.api.nvim_set_hl(0, "semshiFree", { ctermfg=218, fg="#e9b143"} ) - -- vim.api.nvim_set_hl(0, "semshiBuiltin", { ctermfg=207, fg="#f2594b"} ) - -- vim.api.nvim_set_hl(0, "semshiAttribute", { ctermfg=49, fg="#3b4439"} ) - -- vim.api.nvim_set_hl(0, "semshiSelf", { ctermfg=249, fg="#db4740"} ) - -- vim.api.nvim_set_hl(0, "semshiUnresolved", { ctermfg=226, fg="#f28534", cterm=underline, gui=underline} ) - -- vim.api.nvim_set_hl(0, "semshiSelected", { ctermfg=231, fg="#ffffff", ctermbg=161, bg="#4c3432"} ) - -- vim.api.nvim_set_hl(0, "semshiErrorSign", { ctermfg=231, fg="#ffffff", ctermbg=160, bg="#402120"} ) - -- vim.api.nvim_set_hl(0, "semshiErrorChar", { ctermfg=231, fg="#ffffff", ctermbg=160, bg="#402120"} ) - -- vim.cmd([[sign define semshiError text=E> texthl=semshiErrorSign]]) - -- end - -- }, + { + "wookayin/semshi", + ft = "python", + build = ":UpdateRemotePlugins", + config = function() + vim.api.nvim_set_hl(0, "semshiLocal", { ctermfg=209, fg="#80aa9e" } ) + vim.api.nvim_set_hl(0, "semshiGlobal", { ctermfg=214, fg="#d3869b" } ) + vim.api.nvim_set_hl(0, "semshiImported", { ctermfg=214, fg="#8bba7f", cterm=bold, gui=bold } ) + vim.api.nvim_set_hl(0, "semshiParameter", { ctermfg=75, fg="#8bba7f" } ) + vim.api.nvim_set_hl(0, "semshiParameterUnused", { ctermfg=117, fg="#34381b", cterm=underline, gui=underline} ) + vim.api.nvim_set_hl(0, "semshiFree", { ctermfg=218, fg="#e9b143"} ) + vim.api.nvim_set_hl(0, "semshiBuiltin", { ctermfg=207, fg="#f2594b"} ) + vim.api.nvim_set_hl(0, "semshiAttribute", { ctermfg=49, fg="#3b4439"} ) + vim.api.nvim_set_hl(0, "semshiSelf", { ctermfg=249, fg="#db4740"} ) + vim.api.nvim_set_hl(0, "semshiUnresolved", { ctermfg=226, fg="#f28534", cterm=underline, gui=underline} ) + vim.api.nvim_set_hl(0, "semshiSelected", { ctermfg=231, fg="#ffffff", ctermbg=161, bg="#4c3432"} ) + vim.api.nvim_set_hl(0, "semshiErrorSign", { ctermfg=231, fg="#ffffff", ctermbg=160, bg="#402120"} ) + vim.api.nvim_set_hl(0, "semshiErrorChar", { ctermfg=231, fg="#ffffff", ctermbg=160, bg="#402120"} ) + vim.cmd([[sign define semshiError text=E> texthl=semshiErrorSign]]) + end + }, -- Wakatime Tracking 'wakatime/vim-wakatime', diff --git a/nvim/.config/nvim/lua/plugins/mini-deps.lua b/nvim/.config/nvim/lua/plugins/mini-deps.lua deleted file mode 100644 index 273b965..0000000 --- a/nvim/.config/nvim/lua/plugins/mini-deps.lua +++ /dev/null @@ -1,37 +0,0 @@ --- return { --- 'echasnovski/mini.deps', version='*', --- config = function() --- require('mini.deps').setup({ --- path = { package = path_package } --- }) --- end --- --- local add, later, now = MiniDeps.add, MiniDeps.later, MiniDeps.now --- --- --- add({ --- source = 'yetone/avante.nvim', --- monitor = 'main', --- depends = { --- 'stevearc/dressing.nvim', --- 'nvim-lua/plenary.nvim', --- 'MunifTanjim/nui.nvim', --- 'echasnovski/mini.icons' --- }, --- hooks = { post_checkout = function() vim.cmd('make') end } --- }) --- --- optional --- add({ source = 'hrsh7th/nvim-cmp' }) --- add({ source = 'zbirenbaum/copilot.lua' }) --- add({ source = 'HakonHarnes/img-clip.nvim' }) --- add({ source = 'MeanderingProgrammer/render-markdown.nvim' }) --- --- now(function() require('avante_lib').load() end) --- later(function() require('render-markdown').setup({...}) end) --- later(function() --- require('img-clip').setup({...}) -- config img-clip --- require("copilot").setup({...}) -- setup copilot to your liking --- require("avante").setup({...}) -- config for avante.nvim --- end) --- --- } diff --git a/zsh/.zshrc b/zsh/.zshrc index 8f5e3ba..deec7e3 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -57,3 +57,5 @@ export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)"