From 5e33fdd9d43a19c675943603f7c714ec57ebdad7 Mon Sep 17 00:00:00 2001 From: Daniel Nehrig Date: Sat, 4 Jan 2025 03:53:24 +0100 Subject: [PATCH] feat: adding some plugins and ai key adjustment - Mintty plugin added - Timer plugin added - Added configurable openai key --- lazy-lock.json | 13 ++++++++----- lua/config/core/config.type.lua | 5 +++++ lua/config/core/default_config.lua | 5 +++++ lua/config/plugins/modules/completion.lua | 4 ++-- lua/config/plugins/modules/utility.lua | 9 +++++++++ 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 5aa44b3..b6a5d8b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -35,8 +35,9 @@ "mini.icons": { "branch": "main", "commit": "6787321f70d674a481776b7cc2c781fb7002c644" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" }, + "minty": { "branch": "main", "commit": "6dce9f097667862537823d515a0250ce58faab05" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neoconf.nvim": { "branch": "main", "commit": "a66da62912af38b83a42b3e4268974539d09fbdf" }, + "neoconf.nvim": { "branch": "main", "commit": "cf7646efbaf5e4d1f43b3ae2ebd9aa5b3c9ef756" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "neogen": { "branch": "main", "commit": "dd0301bfba1f83a3bc009b5430fce7aa3cee6941" }, "neogit": { "branch": "master", "commit": "9ea60f79e370d8f4847efc145e53afe4b0613fc1" }, @@ -51,11 +52,11 @@ "nvim-cmp-lua-latex-symbols": { "branch": "master", "commit": "0050e236dbebe12de35ecdc646fc1d9a6b0dbb29" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-coverage": { "branch": "main", "commit": "a939e425e363319d952a6c35fb3f38b34041ded2" }, - "nvim-dap": { "branch": "master", "commit": "0e673accbb512e1e191dfb4fecea89cc38c1bcdd" }, + "nvim-dap": { "branch": "master", "commit": "ffb077e65259f13be096ea6d603e3575a76b214a" }, "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" }, "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" }, - "nvim-jdtls": { "branch": "master", "commit": "266d0cb912bbe61d66b43c5e73db19a364380360" }, + "nvim-jdtls": { "branch": "master", "commit": "8f14aa1922ee5491ded1079a6576fae834535658" }, "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, "nvim-metals": { "branch": "main", "commit": "e6b02c99161b43c67cfe1d6e5f9a9b9a0bb4701c" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, @@ -63,7 +64,7 @@ "nvim-notify": { "branch": "master", "commit": "c3797193536711b5d8983975791c4b11dc35ab3a" }, "nvim-pqf": { "branch": "main", "commit": "148ee2ca8b06d83fd9bf6f9b9497724ad39a07d6" }, "nvim-tree.lua": { "branch": "master", "commit": "68fc4c20f5803444277022c681785c5edd11916d" }, - "nvim-treesitter": { "branch": "master", "commit": "e947d35bbf919ea88a24c21cb8afa4621e3cf547" }, + "nvim-treesitter": { "branch": "master", "commit": "4b222913486ec0a5983efa82b0649a2ab87cf1f0" }, "nvim-treesitter-context": { "branch": "master", "commit": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-treesitter-textsubjects": { "branch": "master", "commit": "a8d2844bba925d9450ef7ab215f3b054028288ca" }, @@ -86,7 +87,7 @@ "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, "satellite.nvim": { "branch": "main", "commit": "bce591cb5e379bd989623993c604c774633e7ed9" }, "smear-cursor.nvim": { "branch": "main", "commit": "051fe67e0081da273e07cd33ab8357d6b720f08f" }, - "snacks.nvim": { "branch": "main", "commit": "d312053f78b4fb55523def179ac502438dd93193" }, + "snacks.nvim": { "branch": "main", "commit": "98df370703b3c47a297988f3e55ce99628639590" }, "sniprun": { "branch": "master", "commit": "67ac2d84d03f3b857d59571ff5fefb6080dffa2d" }, "sonokai": { "branch": "master", "commit": "1d7ca954792dfddd9e73c53563d85adaeb8c8437" }, "stabilize.nvim": { "branch": "master", "commit": "eeb1873daffaba67246188a5668b366e45ed1de1" }, @@ -97,6 +98,7 @@ "telescope-project.nvim": { "branch": "master", "commit": "1d7920e799fc5001dffc7bd10909a86e0358eaf4" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, + "timerly": { "branch": "main", "commit": "fa7c53a106b481bd58af5b766c566dc4507f1e65" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, "treesj": { "branch": "main", "commit": "94f6df623f2d15630b1b617abff39962024cb501" }, @@ -106,6 +108,7 @@ "vim-fugitive": { "branch": "master", "commit": "174230d6a7f2df94705a7ffd8d5413e27ec10a80" }, "vim-matchup": { "branch": "master", "commit": "aca23ce53ebfe34e02c4fe07e29e9133a2026481" }, "vim-slash": { "branch": "master", "commit": "31aee09b7ea8893a18fa34f65e63e364fc998444" }, + "volt": { "branch": "main", "commit": "b7582c8e2ab3a411a72ab058251ba22d24e70f4a" }, "vscode.nvim": { "branch": "main", "commit": "18097b7aa47538afa780c821309c8b992972d726" }, "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" }, "windline.nvim": { "branch": "master", "commit": "bef735787bef64697036774eca6418e7a786100b" }, diff --git a/lua/config/core/config.type.lua b/lua/config/core/config.type.lua index 72a7e1c..9190e5e 100644 --- a/lua/config/core/config.type.lua +++ b/lua/config/core/config.type.lua @@ -25,6 +25,11 @@ ---@field ui ConfigUi the ui config ---@field plugins ConfigPlugins the plugin config ---@field mappings MapModes the mapping config +---@field ai_options? ConfigAi the ai config + +---@class ConfigAi +---@field openai_key? string +---@field copilot_key? string ---@alias StatuslineThemes ---| '"slanted_lsp"' diff --git a/lua/config/core/default_config.lua b/lua/config/core/default_config.lua index 3d2ee2b..370b029 100644 --- a/lua/config/core/default_config.lua +++ b/lua/config/core/default_config.lua @@ -49,4 +49,9 @@ default_config.plugins = { }, } +default_config.ai_options = { + openai_key = nil, + copilot_key = nil, +} + return default_config diff --git a/lua/config/plugins/modules/completion.lua b/lua/config/plugins/modules/completion.lua index d82181f..b309648 100644 --- a/lua/config/plugins/modules/completion.lua +++ b/lua/config/plugins/modules/completion.lua @@ -7,9 +7,9 @@ M.completion = { -- TODO: manage config of this by user cfg ["jackMort/ChatGPT.nvim"] = { event = "VeryLazy", - enabled = true, + enabled = require("config.core.config").config.ai_options.openai_key == nil or require("config.core.config").config.ai_options.openai_key == "", opts = { - api_key_cmd = "op read op://Employee/openai/password --no-newline", + api_key_cmd = require("config.core.config").config.ai_options.openai_key, openai_params = { model = "gpt-4-1106-preview", frequency_penalty = 0, diff --git a/lua/config/plugins/modules/utility.lua b/lua/config/plugins/modules/utility.lua index 8aa53bb..ef6ce15 100644 --- a/lua/config/plugins/modules/utility.lua +++ b/lua/config/plugins/modules/utility.lua @@ -8,6 +8,15 @@ local config_path = vim.fn.stdpath("config") ---@field utility table local M = {} M.utility = { + ["nvzone/timerly"] = { + cmd = "TimerlyToggle", + }, + ["nvzone/minty"] = { + cmd = { "Shades", "Huefy" }, + dependencies = { + "nvzone/volt" + } + }, ["echasnovski/mini.pairs"] = { event = "VeryLazy", opts = {},