summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lua/binds.lua2
-rw-r--r--lua/misc.lua2
-rw-r--r--lua/plugins/10_ide.lua40
-rw-r--r--lua/plugins/50_ui.lua10
-rw-r--r--lua/ui.lua1
5 files changed, 32 insertions, 23 deletions
diff --git a/lua/binds.lua b/lua/binds.lua
index f705eb7..3d22f6c 100644
--- a/lua/binds.lua
+++ b/lua/binds.lua
@@ -28,7 +28,6 @@ ct.map('n', '<Leader>wq', '<cmd>w<CR><cmd>bd<CR>')
-- netrw
ct.map('n', '<Leader>e', '<cmd>Explore<CR>')
-
--
-- LSP
--
@@ -78,6 +77,7 @@ ct.map('n', '<Leader>h', '<cmd>lua vim.lsp.buf.hover()<CR>')
--
-- Commands
--
+ct.defcmd('CdMe', ':lcd %:p:h')
-- ct.defcmd('Xrdb', '!xrdb %')
-- ct.defcmd('ExTerm', '!' .. defs.external_term .. '&<CR><CR>')
-- ct.defcmd('ExFileMgr', '!' .. defs.external_filemgr .. '. &<CR><CR>')
diff --git a/lua/misc.lua b/lua/misc.lua
index bbf603b..3681024 100644
--- a/lua/misc.lua
+++ b/lua/misc.lua
@@ -45,7 +45,7 @@ vim.opt.autowrite = true
vim.opt.foldmethod = "indent"
vim.opt.foldlevelstart = 99
-- auto cd to the current file's location
-vim.cmd('autocmd BufEnter * silent! lcd %:p:h')
+-- vim.cmd('autocmd BufEnter * silent! lcd %:p:h')
-- highlighting for other langs in markdown docs
vim.g.markdown_fenced_languages = {'html', 'vim', 'python', 'c', 'bash=sh'}
-- auto close delimiters (eg. parentheses, brackets)
diff --git a/lua/plugins/10_ide.lua b/lua/plugins/10_ide.lua
index 9d03c50..a72a08e 100644
--- a/lua/plugins/10_ide.lua
+++ b/lua/plugins/10_ide.lua
@@ -97,23 +97,23 @@ return {
},
},
},
- {
- "tzachar/cmp-ai",
- dependencies = "nvim-lua/plenary.nvim",
- config = function()
- local cmp_ai = require("cmp_ai.config")
-
- cmp_ai:setup({
- max_lines = 1000,
- provider = "Ollama", -- Change to 'Ollama', 'HF', etc. as needed
- provider_options = {
- model = "qwen2.5-coder:latest",
- },
- notify = true,
- run_on_every_keystroke = true,
- })
- end,
- },
+ -- {
+ -- "tzachar/cmp-ai",
+ -- dependencies = "nvim-lua/plenary.nvim",
+ -- config = function()
+ -- local cmp_ai = require("cmp_ai.config")
+ --
+ -- cmp_ai:setup({
+ -- max_lines = 1000,
+ -- provider = "Ollama", -- Change to 'Ollama', 'HF', etc. as needed
+ -- provider_options = {
+ -- model = "qwen2.5-coder:latest",
+ -- },
+ -- notify = true,
+ -- run_on_every_keystroke = true,
+ -- })
+ -- end,
+ -- },
{
"hrsh7th/nvim-cmp",
event = { "InsertEnter", "CmdlineEnter" },
@@ -125,7 +125,7 @@ return {
"hrsh7th/cmp-nvim-lsp-document-symbol",
"hrsh7th/cmp-cmdline",
"amarz45/nvim-cmp-fonts",
- "tzachar/cmp-ai",
+ -- "tzachar/cmp-ai",
"garymjr/nvim-snippets", -- Ensure the snippet source is loaded
},
config = function()
@@ -147,13 +147,13 @@ return {
["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.abort(),
- ["<CR>"] = cmp.mapping.confirm({ select = true }),
+ ["<Right>"] = cmp.mapping.confirm({ select = true }),
}),
sources = cmp.config.sources({
{ name = "nvim_lsp" },
{ name = "snippets" }, -- This comes from nvim-snippets
{ name = "nvim_lsp_signature_help" },
- { name = "cmp_ai" },
+ -- { name = "cmp_ai" },
}, {
{ name = "buffer" },
{ name = "path" },
diff --git a/lua/plugins/50_ui.lua b/lua/plugins/50_ui.lua
index 9d19a3b..ed439b1 100644
--- a/lua/plugins/50_ui.lua
+++ b/lua/plugins/50_ui.lua
@@ -4,8 +4,16 @@ return {
'wuelnerdotexe/vim-enfocado',
lazy = false,
config = function()
- vim.g.enfocad_style = 'nature'
+ vim.g.enfocado_style = 'nature'
vim.cmd 'colo enfocado'
+ vim.cmd [[highlight Normal ctermbg=NONE guibg=NONE]]
+
+
+ local ct = require('conftool')
+ ct.augroup('templates', {
+ 'ColorScheme', 'enfocado',
+ 'highlight', 'Normal', 'ctermbg=NONE', 'guibg=NONE'
+ })
end,
keys = {
{
diff --git a/lua/ui.lua b/lua/ui.lua
index d752626..2aed930 100644
--- a/lua/ui.lua
+++ b/lua/ui.lua
@@ -35,5 +35,6 @@ vim.api.nvim_create_autocmd({'BufEnter'}, {
callback = function(ev) ct.set 'wrap' end,
desc = 'set wrap text',
})
+
-- turn on mouse
vim.opt.mouse = 'a'