From 42d664d91f0ccd2f9cd88d1018ce654a99f409f2 Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Mon, 21 Jul 2025 18:07:37 +0930 Subject: [PATCH] yay updates --- .config/nvim/lua/lazyvim/plugins/cmp.lua | 10 ++--- .../lua/lazyvim/plugins/codecompanion.lua | 2 +- .config/nvim/lua/lazyvim/plugins/snippets.lua | 38 +++++++++---------- .config/nvim/lua/lazyvim/utils/init.lua | 11 ++++++ .config/shell/profile | 2 +- 5 files changed, 37 insertions(+), 26 deletions(-) diff --git a/.config/nvim/lua/lazyvim/plugins/cmp.lua b/.config/nvim/lua/lazyvim/plugins/cmp.lua index c2d2d87..afd954d 100644 --- a/.config/nvim/lua/lazyvim/plugins/cmp.lua +++ b/.config/nvim/lua/lazyvim/plugins/cmp.lua @@ -56,7 +56,7 @@ return { "hrsh7th/cmp-path", "hrsh7th/cmp-emoji", "hrsh7th/cmp-buffer", - "saadparwaiz1/cmp_luasnip", + -- "saadparwaiz1/cmp_luasnip", }, config = function() local cmp = require("cmp") @@ -65,9 +65,9 @@ return { completeopt = "menu,menuone,noinsert", }, snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, + -- expand = function(args) + -- require("luasnip").lsp_expand(args.body) + -- end, }, mapping = cmp.mapping.preset.insert({ [""] = cmp.mapping.scroll_docs(-4), @@ -80,7 +80,7 @@ return { }), sources = cmp.config.sources({ { name = "nvim_lsp" }, - { name = "luasnip" }, + -- { name = "luasnip" }, { name = "path" }, { name = "emoji" }, { name = "buffer" }, diff --git a/.config/nvim/lua/lazyvim/plugins/codecompanion.lua b/.config/nvim/lua/lazyvim/plugins/codecompanion.lua index 06f54e9..b03f115 100644 --- a/.config/nvim/lua/lazyvim/plugins/codecompanion.lua +++ b/.config/nvim/lua/lazyvim/plugins/codecompanion.lua @@ -1,7 +1,7 @@ return { { "olimorris/codecompanion.nvim", - enabled = true, + enabled = require('lazyvim.utils').exists('$HOME/.config/openai/KEY'), lazy = false, dependencies = { { "nvim-lua/plenary.nvim", branch = "master" }, diff --git a/.config/nvim/lua/lazyvim/plugins/snippets.lua b/.config/nvim/lua/lazyvim/plugins/snippets.lua index 732906e..7fd6bf9 100644 --- a/.config/nvim/lua/lazyvim/plugins/snippets.lua +++ b/.config/nvim/lua/lazyvim/plugins/snippets.lua @@ -1,21 +1,21 @@ return { - { - "L3MON4D3/LuaSnip", - enabled = true, - dependencies = { - "rafamadriz/friendly-snippets", - config = function() - require("luasnip.loaders.from_vscode").lazy_load() - end, - }, - opts = { - history = true, - delete_check_events = "TextChanged", - }, - -- stylua: ignore - keys = { - { "", function() require("luasnip").jump(1) end, mode = "s", }, - { "", function() require("luasnip").jump(-1) end, mode = { "i", "s" }, }, - }, - }, + -- { + -- "L3MON4D3/LuaSnip", + -- enabled = true, + -- dependencies = { + -- "rafamadriz/friendly-snippets", + -- config = function() + -- require("luasnip.loaders.from_vscode").lazy_load() + -- end, + -- }, + -- opts = { + -- history = true, + -- delete_check_events = "TextChanged", + -- }, + -- -- stylua: ignore + -- keys = { + -- { "", function() require("luasnip").jump(1) end, mode = "s", }, + -- { "", function() require("luasnip").jump(-1) end, mode = { "i", "s" }, }, + -- }, + -- }, } diff --git a/.config/nvim/lua/lazyvim/utils/init.lua b/.config/nvim/lua/lazyvim/utils/init.lua index 094b4af..7ff924c 100644 --- a/.config/nvim/lua/lazyvim/utils/init.lua +++ b/.config/nvim/lua/lazyvim/utils/init.lua @@ -155,4 +155,15 @@ function M.trim_whitespace() pcall(vim.cmd, 'cal cursor(currPos[1], currPos[2])') end +function M.exists(path) + local exists = vim.fn.filereadable(vim.fn.expand(path)) + if exists == 1 then + vim.notify(path .. " exists", vim.log.levels.INFO) + return true + else + vim.notify(path .. " doesn't exist", vim.log.levels.INFO) + return false + end +end + return M diff --git a/.config/shell/profile b/.config/shell/profile index 657ea1d..e63791e 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -71,7 +71,7 @@ export REPOS="$HOME/repos" export GITUSER="inkletblot" export NOTE_DIR="$HOME/notes/" export DWM_DIR="$REPOS/gitlab.inkletblot.com/inkletblot/dwm-inkletblot/" -export OPENAI_API_KEY="$(cat "$HOME/.config/openai/KEY")" +export OPENAI_API_KEY="$(touch "$HOME/.config/openai/KEY" && cat "$HOME/.config/openai/KEY")" # This is something luke smith has in his profile (which I have stolen, it's nice but # doesn't work very nicely with my login manager, lightdm, and I prefer to just run