From 91c4897b7f6d97338529c0641370a2695e5a9508 Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Fri, 17 Jan 2025 16:38:24 -0500 Subject: [PATCH] Cleaned up a bunch of plugins. Revamped dashboard and init.lua. --- nvim/.config/nvim/lazy-lock.json | 60 +++--- nvim/.config/nvim/lua/plugins/dashboard.lua | 96 ++++++++- nvim/.config/nvim/lua/plugins/init.lua | 214 ++++++++++++-------- zsh/.zshrc | 8 + 4 files changed, 254 insertions(+), 124 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 146dc79..a2a4a26 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,75 +1,67 @@ { - "LazyDo": { "branch": "main", "commit": "71c3c06f42c24e69df6c6d253cd3febbcbc87b81" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" }, "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" }, - "avante.nvim": { "branch": "main", "commit": "4b4995d6699b6f59c06f5c3f883252c9dd008b53" }, + "avante.nvim": { "branch": "main", "commit": "122bc3287b973154d64e23ec7187e659fc91c8c8" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, - "blink.cmp": { "branch": "main", "commit": "5b0f52d42ecbb374695da1a93fa40eca4dc7a7ff" }, + "blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" }, "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, - "dashboard-nvim": { "branch": "master", "commit": "ae309606940d26d8c9df8b048a6e136b6bbec478" }, + "dashboard-nvim": { "branch": "master", "commit": "2f641b07a6bc03299c454f7e14177c52ce01a093" }, "deadcolumn.nvim": { "branch": "master", "commit": "897c905aef1a268ce4cc507d5cce048ed808fa7a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dracula.nvim": { "branch": "main", "commit": "515acae4fd294fcefa5b15237a333c2606e958d1" }, "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, - "eldritch.nvim": { "branch": "master", "commit": "dbfbaedfdf7b3d40050015fc16dca6aedc97d756" }, + "eldritch.nvim": { "branch": "master", "commit": "adedead3423c58cc2e2ebf30001fe4055ad0e416" }, "f-string-toggle.nvim": { "branch": "main", "commit": "4e2ad79dfc5122dd65515ebbdd671e8ee01d157e" }, - "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" }, + "fidget.nvim": { "branch": "main", "commit": "a0abbf18084b77d28bc70e24752e4f4fd54aea17" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "b544bd62623ca1b483d8b9bfb6d65805f112a320" }, + "gitsigns.nvim": { "branch": "main", "commit": "0797734e2bf229cc67b05e82a17e22a18f191913" }, "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" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7a698a1d7ed755af9f5a88733b23ca246ce2df28" }, "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": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, "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": "1c79feb7478ca773fa3dac5cadf43ced9180e861" }, + "mini.icons": { "branch": "main", "commit": "910db5df9724d65371182948f921fce23c2c881e" }, "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": "66aabf210b5e736a3df5006648d4201016e05a2a" }, - "night-owl.nvim": { "branch": "main", "commit": "86ed124c2f7e118670649701288e024444bf91e5" }, - "nightfly": { "branch": "master", "commit": "3fe724c616f5285bafbc762dd1e9830ae1815a1e" }, + "neowarrior.nvim": { "branch": "main", "commit": "197cd4a7a56d07374fcda09b5b56baa433e40549" }, + "nightfly": { "branch": "master", "commit": "674f38e12ffc251bee6c572cfffbf814c1f116e4" }, "nightfox.nvim": { "branch": "main", "commit": "595ffb8f291fc4a9bef3201a28b7c0379a41cdee" }, + "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, + "numb.nvim": { "branch": "master", "commit": "7f564e638d3ba367abf1ec91181965b9882dd509" }, "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": "8121483b8132b7053120fafd83728178fb3febf6" }, - "nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" }, - "nvim-tree.lua": { "branch": "master", "commit": "375e38673b5c61debd8074ced01cfd4f3b7ce1e9" }, - "nvim-treesitter": { "branch": "master", "commit": "622a4a6ba76d1de52b72a965159213ae655b4ac7" }, + "nvim-lspconfig": { "branch": "master", "commit": "339ccc81e08793c3af9b83882a6ebd90c9cc0d3b" }, + "nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" }, + "nvim-tree.lua": { "branch": "master", "commit": "d529a99f88e0dff02e0aa275db2f595cd252a2c8" }, + "nvim-treesitter": { "branch": "master", "commit": "5da195ac3dfafd08d8b10756d975f0e01e1d563a" }, "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" }, - "nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" }, - "oil.nvim": { "branch": "master", "commit": "a6a4f48b14b4a51fded531c86f6c04b4503a2ef8" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, + "oil.nvim": { "branch": "master", "commit": "09fa1d22f5edf0730824d2b222d726c8c81bbdc9" }, + "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "5578ca6709e0e9a0c76fc7c484b9951b428cbb71" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "85b80abaa09cbbc039e3095b2f515b3cf8cadd11" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, - "render-markdown.nvim": { "branch": "main", "commit": "bab0663ecdb06b0ff846969764d6c67719ab0fcb" }, + "render-markdown.nvim": { "branch": "main", "commit": "ad055861d17afe058bd835e82292e14a64b51b1d" }, "semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" }, - "solarized-osaka.nvim": { "branch": "main", "commit": "2663501654f8e4aa218db9cad15387b881360fe3" }, - "sonokai": { "branch": "master", "commit": "836ad3994d3d0eaea68126cabddf6319508584e8" }, - "spacecamp": { "branch": "master", "commit": "8945b4a2bfaaa16fbcee9f1d7c00cb9c1256b591" }, + "solarized-osaka.nvim": { "branch": "main", "commit": "7c63ea4dc3287913e154ce9432c722004bbe9b7e" }, "telescope-cmdline.nvim": { "branch": "main", "commit": "8b05928ac1b9f2b772cedde891faa6669b0ec59a" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, @@ -77,11 +69,9 @@ "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "thethethe.nvim": { "branch": "main", "commit": "357580127cd291c8a813564eeaff07c09303084e" }, "tmux.nvim": { "branch": "main", "commit": "307bad95a1274f7288aaee09694c25c8cbcd6f1a" }, - "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, - "tokyonight.nvim": { "branch": "main", "commit": "7bb270adaa7692c2c33befc35f5567fc596a2504" }, - "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, - "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" }, + "tokyonight.nvim": { "branch": "main", "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" }, + "trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" }, "vim-arduino": { "branch": "master", "commit": "2ded67cdf09bb07c4805d9e93d478095ed3d8606" }, "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" }, "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" }, diff --git a/nvim/.config/nvim/lua/plugins/dashboard.lua b/nvim/.config/nvim/lua/plugins/dashboard.lua index 3733a5e..25a6aff 100644 --- a/nvim/.config/nvim/lua/plugins/dashboard.lua +++ b/nvim/.config/nvim/lua/plugins/dashboard.lua @@ -1,10 +1,98 @@ return { +-- { +-- "folke/snacks.nvim", +-- priority = 1000, +-- lazy = false, +-- ---@type snacks.Config +-- opts = { +-- -- your configuration comes here +-- -- or leave it empty to use the default settings +-- -- refer to the configuration section below +-- dashboard = { +-- sections = { +-- { section = "header" }, +-- -- { +-- -- pane = 2, +-- -- section = "terminal", +-- -- cmd = "colorscript -e square", +-- -- height = 5, +-- -- padding = 1, +-- -- }, +-- { section = "keys", gap = 1, padding = 1 }, +-- { +-- pane = 2, +-- icon = " ", +-- desc = "Browse Repo", +-- padding = 1, +-- key = "b", +-- action = function() +-- Snacks.gitbrowse() +-- end, +-- }, +-- function() +-- local in_git = Snacks.git.get_root() ~= nil +-- local cmds = { +-- { +-- title = "Notifications", +-- cmd = "gh notify -s -a -n5", +-- action = function() +-- vim.ui.open("https://github.com/notifications") +-- end, +-- key = "n", +-- icon = " ", +-- height = 5, +-- enabled = true, +-- }, +-- { +-- title = "Open Issues", +-- cmd = "gh issue list -L 3", +-- key = "i", +-- action = function() +-- vim.fn.jobstart("gh issue list --web", { detach = true }) +-- end, +-- icon = " ", +-- height = 7, +-- }, +-- { +-- icon = " ", +-- title = "Open PRs", +-- cmd = "gh pr list -L 3", +-- key = "p", +-- action = function() +-- vim.fn.jobstart("gh pr list --web", { detach = true }) +-- end, +-- height = 7, +-- }, +-- { +-- icon = " ", +-- title = "Git Status", +-- cmd = "git --no-pager diff --stat -B -M -C", +-- height = 10, +-- }, +-- } +-- return vim.tbl_map(function(cmd) +-- return vim.tbl_extend("force", { +-- pane = 2, +-- section = "terminal", +-- enabled = in_git, +-- padding = 1, +-- ttl = 5 * 60, +-- indent = 3, +-- }, cmd) +-- end, cmds) +-- end, +-- { section = "startup" }, +-- } +-- +-- }, +-- }, +-- } { 'nvimdev/dashboard-nvim', event = 'VimEnter', config = function() require('dashboard').setup { - theme = 'hyper', + theme = 'hyper', config = { week_header = { enable = true, @@ -20,10 +108,10 @@ return { key = 'f', }, { - desc = ' Apps', + desc = ' NeoWarrior', group = 'DiagnosticHint', - action = 'Telescope app', - key = 'a', + action = 'NeoWarriorOpen current', + key = 'n', }, { desc = ' dotfiles', diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 712d039..fff810f 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -48,19 +48,50 @@ return { -- General Functionality ------------------------------------------------------------ - -- Todo Manager - { - "Dan7h3x/LazyDo", - branch = "main", - keys = { - { - "","LazyDoToggle", - mode = {"n","i"}, - }, - }, - event = "VeryLazy", - opts = {}, - }, + -- lazy.nvim +{ + "folke/noice.nvim", + event = "VeryLazy", + opts = { + -- add any options here + }, + dependencies = { + -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries + "MunifTanjim/nui.nvim", + -- OPTIONAL: + -- `nvim-notify` is only needed, if you want to use the notification view. + -- If not available, we use `mini` as the fallback + "rcarriga/nvim-notify", + } +}, +-- { +-- "huantrinh1802/m_taskwarrior_d.nvim", +-- version = "*", +-- dependencies = { "MunifTanjim/nui.nvim" }, +-- config = function() +-- -- Require +-- require("m_taskwarrior_d").setup() +-- -- Optional +-- vim.api.nvim_set_keymap("n", "te", "TWEditTask", { desc = "TaskWarrior Edit", noremap = true, silent = true }) +-- vim.api.nvim_set_keymap("n", "tv", "TWView", { noremap = true, silent = true }) +-- vim.api.nvim_set_keymap("n", "tu", "TWUpdateCurrent", { noremap = true, silent = true }) +-- vim.api.nvim_set_keymap("n", "ts", "TWSyncTasks", { noremap = true, silent = true }) +-- vim.api.nvim_set_keymap( +-- "n", +-- "", +-- "TWToggle", +-- { silent = true } +-- ) +-- -- Be caution: it may be slow to open large files, because it scan the whole buffer +-- vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost" }, { +-- group = vim.api.nvim_create_augroup("TWTask", { clear = true }), +-- pattern = "*.md,*.markdown", -- Pattern to match Markdown files +-- callback = function() +-- vim.cmd('TWSyncTasks') +-- end, +-- }) +-- end, +-- }, -- Neovim statusline { @@ -72,14 +103,15 @@ return { -- always_divide_middle = false, }, sections = { - lualine_x = { { - function() - return require("lazydo").get_lualine_stats() - end, - cond = function() - return require("lazydo")._initialized - end, - }, + lualine_x = { + -- { + -- function() + -- return require("lazydo").get_lualine_stats() + -- end, + -- cond = function() + -- return require("lazydo")._initialized + -- end, + -- }, {"fileformat", symbols = { unix = " " }, "filetype" }, }, }, @@ -204,10 +236,20 @@ return { { "rcarriga/nvim-notify", config = function () - require("notify").setup { - } + require("notify").setup ({ + timeout = 5000, + render = "minimal", + stages = "fade_in_slide_out", + on_open = function(win) + vim.api.nvim_win_set_config(win, { focusable = false }) + end, + }) + + vim.keymap.set("n", "", function() + require("notify").dismiss() + end, { desc = "dismiss notify popup and clear hlsearch" }) -- vim.api.nvim_notify = require('notify') - vim.notify = require('notify') + -- vim.notify = require('notify') end }, -- Custom Terminal within Neovim @@ -220,11 +262,11 @@ return { -- echasnovski's Minis get a section of their own... ------------------------------------------------------------ -{ 'echasnovski/mini.pick', version = '*', - config = function() - require('mini.pick').setup() - end - }, +-- { 'echasnovski/mini.pick', version = '*', +-- config = function() +-- require('mini.pick').setup() +-- end +-- }, { 'echasnovski/mini.comment', version = '*', config = function() @@ -273,7 +315,7 @@ return { require('mini.fuzzy').setup() end }, - { + { 'echasnovski/mini.hipatterns', version = false, -- event = "BufReadPre", config = function() @@ -294,7 +336,7 @@ return { }, }) end - }, + }, ----------------------------------------------------------- -- Markdown Plugins @@ -317,10 +359,10 @@ return { -- vim.g.mkdp_page_title = "${name}" -- end, -- }, - { "jbyuki/venn.nvim" }, + -- { "jbyuki/venn.nvim" }, -- DAP (Debug adaptor Protocol) - 'mfussenegger/nvim-dap', + -- 'mfussenegger/nvim-dap', -- { -- 'mfussenegger/nvim-dap-python', @@ -330,9 +372,9 @@ return { -- ) -- end -- }, - { - 'rcarriga/nvim-dap-ui', dependencies = {"mfussenegger/nvim-dap"} - }, + -- { + -- 'rcarriga/nvim-dap-ui', dependencies = {"mfussenegger/nvim-dap"} + -- }, --------------------------------------------------------- -- Text, Icons, Symbols @@ -351,47 +393,47 @@ return { }, }, 'lukas-reineke/indent-blankline.nvim', - 'karb94/neoscroll.nvim', + -- 'karb94/neoscroll.nvim', -- Allow Popups for Telescope etc 'nvim-lua/popup.nvim', 'nvim-lua/plenary.nvim', -- Todo & Comments for Organization - { - 'folke/todo-comments.nvim', - dependencies = "nvim-lua/plenary.nvim", - config = function() - require("todo-comments").setup { - keywords = { - FIX = { - icon = " ", -- icon used for the sign, and in search results - color = "error", -- can be a hex color, or a named color (see below) - alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, -- a set of other keywords that all map to this FIX keywords - -- 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" } }, - RISK = { icon = " ", color = "hint", alt = { "RISK" } }, - GOAL = { icon = " ", color = "test", alt = { "GOAL", "KPI"} }, - }, - highlight = { - comments_only = false, - }, - colors = { - error = { "DiagnosticError", "ErrorMsg", "#DC2626" }, - warning = { "DiagnosticWarning", "WarningMsg", "#FBBF24" }, - info = { "DiagnosticInfo", "#2563EB" }, - hint = { "DiagnosticHint", "#10B981" }, - default = { "Identifier", "#7C3AED" }, - test = { "Identifier", "#FF00FF" } - }, - } - end - }, + -- { + -- 'folke/todo-comments.nvim', + -- dependencies = "nvim-lua/plenary.nvim", + -- config = function() + -- require("todo-comments").setup { + -- keywords = { + -- FIX = { + -- icon = " ", -- icon used for the sign, and in search results + -- color = "error", -- can be a hex color, or a named color (see below) + -- alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, -- a set of other keywords that all map to this FIX keywords + -- -- 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" } }, + -- RISK = { icon = " ", color = "hint", alt = { "RISK" } }, + -- GOAL = { icon = " ", color = "test", alt = { "GOAL", "KPI"} }, + -- }, + -- highlight = { + -- comments_only = false, + -- }, + -- colors = { + -- error = { "DiagnosticError", "ErrorMsg", "#DC2626" }, + -- warning = { "DiagnosticWarning", "WarningMsg", "#FBBF24" }, + -- info = { "DiagnosticInfo", "#2563EB" }, + -- hint = { "DiagnosticHint", "#10B981" }, + -- default = { "Identifier", "#7C3AED" }, + -- test = { "Identifier", "#FF00FF" } + -- }, + -- } + -- end + -- }, -- Various telescopes 'nvim-telescope/telescope-file-browser.nvim', @@ -405,14 +447,13 @@ return { ----------------------------------------------------------- - {'jaredgorski/spacecamp'}, { "eldritch-theme/eldritch.nvim", lazy = false, priority = 1000, opts = {}, }, - { 'rktjmp/lush.nvim' }, + -- { 'rktjmp/lush.nvim' }, -- { 'normanras/link.nvim' }, -- { dir = '/Users/normrasmussen/Documents/Projects/link-two/', lazy = true}, { @@ -422,20 +463,9 @@ return { opts = {}, }, 'Mofiqul/dracula.nvim', - 'rose-pine/neovim', 'EdenEast/nightfox.nvim', 'rebelot/kanagawa.nvim', 'catppuccin/nvim', - 'sainnhe/sonokai', - { - "oxfist/night-owl.nvim", - lazy = false, -- make sure we load this during startup if it is your main colorscheme - priority = 1000, -- make sure to load this before all the other start plugins - config = function() - -- load the colorscheme here - vim.cmd.colorscheme("night-owl") - end, - }, { "philosofonusus/morta.nvim", name = 'morta', @@ -465,7 +495,7 @@ return { event = "VeryLazy", opts = { }, }, - 'HiPhish/rainbow-delimiters.nvim', + { 'HiPhish/rainbow-delimiters.nvim' }, { "wookayin/semshi", ft = "python", @@ -491,6 +521,20 @@ return { -- Wakatime Tracking 'wakatime/vim-wakatime', + -- Todo Manager + { + 'duckdm/neowarrior.nvim', + event = "VeryLazy", + brancy = "develop", + dependencies = { + 'nvim-telescope/telescope.nvim', + --- Optional but recommended for nicer inputs + 'folke/noice.nvim', + }, + --- See config example below + opts = { + } +}, ---------------------------------------------- --- Custom Plugins and Tests ---------------------------------------------- diff --git a/zsh/.zshrc b/zsh/.zshrc index deec7e3..41081da 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -59,3 +59,11 @@ export NVM_DIR="$HOME/.nvm" eval "$(uv generate-shell-completion zsh)" eval "$(uv generate-shell-completion zsh)" eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)"