From c8dfc7c1ae583d0bda6b4257181147750d6a3dbf Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Fri, 3 Jan 2025 16:43:06 -0500 Subject: [PATCH] Fixed secrets issues --- nvim/.config/nvim/lazy-lock.json | 3 +- nvim/.config/nvim/lua/plugins/avante.lua | 38 ++++++++------- nvim/.config/nvim/lua/plugins/init.lua | 52 ++++++++++----------- nvim/.config/nvim/lua/plugins/mini-deps.lua | 37 +++++++++++++++ zsh/.zshrc | 6 +++ 5 files changed, 93 insertions(+), 43 deletions(-) create mode 100644 nvim/.config/nvim/lua/plugins/mini-deps.lua diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 09e0f39..03b001a 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -6,6 +6,7 @@ "avante.nvim": { "branch": "main", "commit": "81e5f1937f47a7fc855e03a41f2af445f2777de9" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "blink.cmp": { "branch": "main", "commit": "d534f9e8bf39299c480e0c2e11dad21f51cfb2fe" }, + "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, "deadcolumn.nvim": { "branch": "master", "commit": "897c905aef1a268ce4cc507d5cce048ed808fa7a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dracula.nvim": { "branch": "main", "commit": "515acae4fd294fcefa5b15237a333c2606e958d1" }, @@ -16,6 +17,7 @@ "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "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": "18ae5771b22d8f913ef541c827a8180b4cb12c8a" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, @@ -51,7 +53,6 @@ "nvim-lspconfig": { "branch": "master", "commit": "a8ef5e6e497b3ebeaaf35b939c07c211563b2e05" }, "nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" }, "nvim-prose": { "branch": "main", "commit": "38aac8c9c94a5725d152bdfea374d60e07fb93d6" }, - "nvim-tree.lua": { "branch": "master", "commit": "375e38673b5c61debd8074ced01cfd4f3b7ce1e9" }, "nvim-treesitter": { "branch": "master", "commit": "cfbc1c0e0ff63e5b5e37b465b915b95fc2e98cef" }, "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" }, "nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" }, diff --git a/nvim/.config/nvim/lua/plugins/avante.lua b/nvim/.config/nvim/lua/plugins/avante.lua index 79692c4..14ae581 100644 --- a/nvim/.config/nvim/lua/plugins/avante.lua +++ b/nvim/.config/nvim/lua/plugins/avante.lua @@ -6,30 +6,36 @@ return { opts = { -- add any opts here }, + -- if you want to build from source then do `make BUILD_FROM_SOURCE=true` build = "make", + -- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows dependencies = { "stevearc/dressing.nvim", "nvim-lua/plenary.nvim", "MunifTanjim/nui.nvim", + --- The below dependencies are optional, "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons - -- { - -- "HakonHarnes/img-clip.nvim", - -- event = "VeryLazy", - -- opts = { - -- -- recommended settings - -- default = { - -- embed_image_as_base64 = false, - -- prompt_for_file_name = false, - -- drag_and_drop = { - -- insert_mode = true, - -- }, - -- -- required for Windows users - -- use_absolute_path = true, - -- }, - -- }, - -- }, + "zbirenbaum/copilot.lua", -- for providers='copilot' { + -- support for image pasting + "HakonHarnes/img-clip.nvim", + event = "VeryLazy", + opts = { + -- recommended settings + default = { + embed_image_as_base64 = false, + prompt_for_file_name = false, + drag_and_drop = { + insert_mode = true, + }, + -- required for Windows users + use_absolute_path = true, + }, + }, + }, + { + -- Make sure to set this up properly if you have lazy=true 'MeanderingProgrammer/render-markdown.nvim', opts = { file_types = { "markdown", "Avante" }, diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 697141d..441266b 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -104,32 +104,32 @@ return { }, -- 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, -}, - +-- { +-- "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", diff --git a/nvim/.config/nvim/lua/plugins/mini-deps.lua b/nvim/.config/nvim/lua/plugins/mini-deps.lua new file mode 100644 index 0000000..273b965 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/mini-deps.lua @@ -0,0 +1,37 @@ +-- 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 cdded2a..c6b87d0 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -44,7 +44,10 @@ export PATH="/opt/homebrew/sbin:$PATH" export PATH="/opt/homebrew/bin:$PATH" export PATH="$NPM_PACKAGES/bin:$PATH" source /opt/homebrew/share/powerlevel10k/powerlevel10k.zsh-theme +<<<<<<< HEAD +======= +>>>>>>> parent of 45eca45 (Updated settings for avante. Removed mini.deps config.) # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh @@ -58,3 +61,6 @@ 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)" +<<<<<<< HEAD +======= +eval "$(uv generate-shell-completion zsh)"