update config

This commit is contained in:
2026-06-02 21:09:06 +02:00
parent e306d12c1f
commit 7d2daa9f06
8 changed files with 219 additions and 150 deletions
+15
View File
@@ -56,3 +56,18 @@ end)
require('configs.lspconfig')
require('configs.neoscroll')
-- local pywal16 = require('pywal16')
--
-- pywal16.setup()
os.execute("python3 ~/.config/nvim/pywal/chadwal.py &> /dev/null &")
local autocmd = vim.api.nvim_create_autocmd
autocmd("Signal", {
pattern = "SIGUSR1",
callback = function()
require('nvchad.utils').reload()
end
})
+43 -42
View File
@@ -1,52 +1,53 @@
{
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
"CopilotChat.nvim": { "branch": "main", "commit": "76cc41653d63cfdb653f584624b4bf5e721f9514" },
"LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
"NvChad": { "branch": "v2.5", "commit": "29ebe31ea6a4edf351968c76a93285e6e108ea08" },
"base46": { "branch": "v3.0", "commit": "13a8a258da6ca87ce46014084063d5b846afd3bc" },
"cmp-async-path": { "branch": "main", "commit": "0ed1492f59e730c366d261a5ad822fa37e44c325" },
"CopilotChat.nvim": { "branch": "main", "commit": "137d3bc527518f5ea982c43c43084496732365c3" },
"LuaSnip": { "branch": "master", "commit": "73813308abc2eaeff2bc0d3f2f79270c491be9d7" },
"NvChad": { "branch": "v2.5", "commit": "d042cc975247c2aa55fcb228e5d146dc1dc6c648" },
"base16-nvim": { "branch": "master", "commit": "23e5128eb5f629c29532c24a1e733cbe019f05bb" },
"base46": { "branch": "v3.0", "commit": "884b990dcdbe07520a0892da6ba3e8d202b46337" },
"boole.nvim": { "branch": "main", "commit": "7b4a3dae28e3b2497747aa840439e9493cabdc49" },
"cmp-async-path": { "branch": "main", "commit": "f8af3f726e07f2e9d37672eaa9102581aefce149" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
"cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
"copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
"copilot.lua": { "branch": "master", "commit": "0f2fd3829dd27d682e46c244cf48d9715726f612" },
"crates.nvim": { "branch": "main", "commit": "a49df0f70171adc77704eac70dd2c0d179065933" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
"mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
"conform.nvim": { "branch": "master", "commit": "18aeab3d63d350dcf44d64c462cc489a3412af40" },
"copilot-cmp": { "branch": "master", "commit": "d0c70ddb8d0c3d012d4331a50000cd2e3c7d561c" },
"copilot.lua": { "branch": "master", "commit": "407349117f176789df6ec1c23bca72f34e15b4e8" },
"cord.nvim": { "branch": "master", "commit": "0be090969e978f7442870ef227e09eff7bf3480d" },
"crates.nvim": { "branch": "main", "commit": "694357861ec9ebf12475ddcdd04ea45a0923c32d" },
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
"gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" },
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "7b01e2974a47d489bb92f47a41e4c0088ea8f86e" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
"mason.nvim": { "branch": "main", "commit": "8e921c2b68571e978db5d4d3fef9c9a7f8755473" },
"menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" },
"minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" },
"neocord": { "branch": "main", "commit": "2ebf3792a8100376bb65fd66d5dbf60f50af7529" },
"neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" },
"nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
"nvim-dap": { "branch": "master", "commit": "a479e25ed5b5d331fb46ee4b9e160ff02ac64310" },
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
"nvim-lspconfig": { "branch": "master", "commit": "45ff1914044de7dbd4cd85053dc09f47312a2f4d" },
"neogit": { "branch": "master", "commit": "99326a1310fb2d616b455d2fd16d01bf00682f06" },
"neoscroll.nvim": { "branch": "master", "commit": "c8d29979cb0cb3a2437a8e0ae683fd82f340d3b8" },
"nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" },
"nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
"nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" },
"nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" },
"nvim-lspconfig": { "branch": "master", "commit": "3de240997fc3208eb29df5e5c17ba4665961bd84" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-tree.lua": { "branch": "master", "commit": "65bae449224b8a3bc149471b96587b23b13a9946" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" },
"persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"render-markdown.nvim": { "branch": "main", "commit": "e76eb2e4262f0f0a1a7bd7a454dd7d44f1299afd" },
"ripgrep": { "branch": "master", "commit": "119a58a400ea948c2d2b0cd4ec58361e74478641" },
"nvim-tree.lua": { "branch": "master", "commit": "07f541fcaa4a5ae019598240362449ab7e9812b3" },
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
"nvim-web-devicons": { "branch": "master", "commit": "7d8dad2c837fcdf2e65997e68657c1a21c568074" },
"oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" },
"persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
"render-markdown.nvim": { "branch": "main", "commit": "629eb9533ec989d9d5c6cab8f3ad5372422c24e0" },
"rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
"rustaceanvim": { "branch": "master", "commit": "eb606eb3785f6c6e31ef675c32b706694b76923b" },
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
"suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
"rustaceanvim": { "branch": "master", "commit": "ec517a0d223060b79e040e4a187e031b76b307ea" },
"snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
"suda.vim": { "branch": "master", "commit": "c492741b4679b3cdd4d9e34138209784e061d916" },
"telescope.nvim": { "branch": "master", "commit": "7d324792b7943e4aa16ad007212e6acc6f9fe335" },
"transparent.nvim": { "branch": "main", "commit": "8ac59883de84e9cd1850ea25cf087031c5ba7d54" },
"ui": { "branch": "v3.0", "commit": "af4407decaf6528cb21a7b0fd8925664c8e573c0" },
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
"volt": { "branch": "main", "commit": "7b8c5e790120d9f08c8487dcb80692db6d2087a1" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
"ui": { "branch": "v3.0", "commit": "3e67e9d5325fd47fdbc90ca00a147db2f3525754" },
"vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
"volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" },
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
}
+3 -5
View File
@@ -6,12 +6,10 @@
local M = {}
M.base46 = {
theme = "tokyonight",
-- theme = "chadwal",
theme = "tokyodark",
transparency = true,
-- hl_override = {
-- Comment = { italic = true },
-- ["@comment"] = { italic = true },
-- },
}
return M
+61 -25
View File
@@ -1,41 +1,77 @@
-- Mason setup
require("mason").setup()
require("mason-lspconfig").setup({
ensure_installed = { "pyright", "html", "cssls", "quick_lint_js" }, -- Ensure pyright is installed
ensure_installed = {
"basedpyright",
"html",
"cssls",
"quick_lint_js",
"clangd",
"ts_ls",
"lua_ls",
},
})
-- Load lspconfig
local lspconfig = require("lspconfig")
local nvlsp = require "nvchad.configs.lspconfig"
require("mason-tool-installer").setup({
ensure_installed = {
"black",
"debugpy",
"flake8",
"isort",
"mypy",
"pylint",
},
})
-- Set up servers
local servers = { "html", "cssls", "pyright", "quick_lint_js" }
-- NvChad LSP defaults
local nvlsp = require("nvchad.configs.lspconfig")
require("lspconfig").qmlls.setup {}
-- Define servers
local servers = { "html", "cssls", "basedpyright", "quick_lint_js", "qmlls" }
vim.lsp.enable(servers)
for _, lsp in ipairs(servers) do
lspconfig[lsp].setup({
-- Use the new Neovim 0.11 LSP config API
for _, server in ipairs(servers) do
vim.lsp.config(server, {
on_attach = nvlsp.on_attach,
on_init = nvlsp.on_init,
capabilities = nvlsp.capabilities,
})
end
lspconfig.pyright.setup({
on_attach = function(client, bufnr)
-- You can add custom on_attach behavior here, such as keymaps or other actions.
end,
capabilities = require('cmp_nvim_lsp').default_capabilities(), -- If you're using nvim-cmp
})
-- Install necessary tools using mason-tool-installer
require('mason-tool-installer').setup({
ensure_installed = {
'black',
'debugpy',
'flake8',
'isort',
'mypy',
'pylint',
vim.lsp.config("lua_ls", {
settings = {
Lua = {
workspace = {
library = {
"/usr/share/hypr/stubs",
},
},
},
},
})
vim.lsp.config("basedpyright", {
settings = {
pyright = {
disableOrganizeImports = true
},
basedpyright = {
analysis = {
typeCheckingMode = "standard"
}
}
}
})
vim.lsp.config("pyright", {
on_attach = function(client, bufnr)
end,
capabilities = require("cmp_nvim_lsp").default_capabilities(),
},
vim.filetype.add({
extension = {
log = "log",
},
}))
-9
View File
@@ -1,9 +0,0 @@
local lspconfig = require('lspconfig')
-- Basic Pyright setup
lspconfig.pyright.setup({
on_attach = function(client, bufnr)
-- Optional: Add keybindings or other configurations
end,
})
+15 -10
View File
@@ -9,17 +9,17 @@ vim.keymap.set("n", "<leader>qs", function() require("persistence").select() end
vim.g.VM_maps = vim.g.VM_maps or {}
vim.g.VM_maps['<C-n>'] = '<Plug>(VM-Find-Subword-Under)'
vim.g.mapleader = " "
vim.keymap.set("n", "<C-o>", ':CopilotChatOpen<CR>', { noremap = true, silent = true })
vim.keymap.set("n", "<C-a>", ':CopilotChatOpen<CR>', { noremap = true, silent = true })
vim.keymap.set("n", "<C-p>", "<C-o>", { noremap = true, silent = true})
vim.keymap.set("n", "<leader>t", function()
local word = vim.fn.expand("<cword>")
if word == "true" then
vim.cmd("normal! ciwfalse")
elseif word == "false" then
vim.cmd("normal! ciwtrue")
end
end, { noremap = true, silent = true })
-- vim.keymap.set("n", "<leader>t", function()
-- local word = vim.fn.expand("<cword>")
-- if word == "true" then
-- vim.cmd("normal! ciwfalse")
-- elseif word == "false" then
-- vim.cmd("normal! ciwtrue")
-- end
-- end, { noremap = true, silent = true })
-- vim.keymap.set('n', '<Tab>', ':tabnext<CR>', { noremap = true, silent = true })
-- vim.keymap.set('n', '<S-Tab>', ':tabprev<CR>', { noremap = true, silent = true })
@@ -31,11 +31,16 @@ vim.keymap.set("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease Window
vim.keymap.set("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase Window Width" })
vim.keymap.set("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease Window Width" })
vim.keymap.set("x", "<", "<gv")
vim.keymap.set("x", ">", ">gv")
-- Make d, dd, x, etc. not copy to register
vim.keymap.set("n", "d", '"_d', { noremap = true })
vim.keymap.set("n", "dd", '"_dd', { noremap = true })
vim.keymap.set("v", "d", '"_d', { noremap = true })
vim.keymap.set("n", "<leader>k", vim.diagnostic.open_float)
-- map({ "n", "i", "v" }, "<C-s>", "<cmd> w <cr>")
map("n", "<leader>rg", "<cmd>Telescope live_grep<CR>", { desc = "telescope live grep" })
+42
View File
@@ -5,3 +5,45 @@ local Snacks = require ("snacks")
--
vim.keymap.del("n", "<leader>e")
vim.keymap.set("n", "<leader>e", function() Snacks.explorer.open() end, { desc = "File Explorer" })
require("oil").setup({
default_file_explorer = true,
})
local alpha = function()
return string.format("%x", math.floor(255 * vim.g.transparency or 0.8))
end
vim.g.neovide_opacity = 0.0
vim.g.transparency = 1.0
vim.g.neovide_background_color = "#0f1117" .. alpha()
vim.g.neovide_scale_factor = 0.8
vim.g.neovide_scroll_animation_length = 0.1
vim.g.neovide_cursor_animation_length = 0.09
vim.api.nvim_create_autocmd('FileType', {
callback = function(ev)
local lang = vim.treesitter.language.get_lang(ev.match)
local available_langs = require('nvim-treesitter').get_available()
local is_available = vim.tbl_contains(available_langs, lang)
if is_available then
local installed_langs = require('nvim-treesitter').get_installed()
local installed = vim.tbl_contains(installed_langs, lang)
if not installed then
require('nvim-treesitter').install(lang):wait()
end
vim.treesitter.start()
require('nvim-treesitter').indentexpr()
end
end,
})
require('boole').setup({
mappings = {
-- increment = '<C-a>',
decrement = '<C-x>'
},
allow_caps_additions = {
{'enable', 'disable'},
{'true', 'false'}
}
})
+40 -59
View File
@@ -1,7 +1,6 @@
return {
-- LSP / Mason
{ "williamboman/mason.nvim", opts = {} },
{ "williamboman/mason-lspconfig.nvim", opts = {} },
{ "WhoIsSethDaniel/mason-tool-installer.nvim"},
{
@@ -12,22 +11,30 @@ return {
-- Misc
{
"IogaMaster/neocord",
opts = {
show_time = true,
buttons = true,
enable_line_number = true,
global_timer = true,
},
"vyfor/cord.nvim",
opts = {
display = {
theme = "atom",
}
}
},
-- Basic plugins
{ "nvim-lualine/lualine.nvim", lazy = false },
{ "nvim-tree/nvim-tree.lua", enabled = false },
{ "nat-418/boole.nvim", lazy = false },
{ "lambdalisue/suda.vim", lazy = false },
{ "numToStr/Comment.nvim", lazy = true },
-- { "mg979/vim-visual-multi", lazy = false},
{ "tpope/vim-fugitive", lazy = false },
{ "stevearc/oil.nvim", lazy = false },
{ "NeogitOrg/neogit", lazy = false },
-- {
-- 'uZer/pywal16.nvim',
-- -- for local dev replace with:
-- -- dir = '~/your/path/pywal16.nvim',
-- config = function()
-- vim.cmd.colorscheme("pywal16")
-- end,
-- },
{ "folke/persistence.nvim",
event = "BufReadPre",
config = true,
@@ -53,7 +60,7 @@ return {
bigfile = { enabled = true },
dashboard = { enabled = true },
explorer = {
enabled = true,
enabled = false,
auto_close = true,
},
indent = { enabled = false },
@@ -70,45 +77,17 @@ return {
{ "nvim-treesitter/nvim-treesitter",
lazy = false,
branch = "main",
build = ':TSUpdate',
opts = {
highlight = {
enable = true,
},
indent = {enable = true},
auto_install = true,
ensure_installed = {
'lua',
},
},
config = function (_, opts)
local configs = require("nvim-treesitter.configs")
configs.setup(opts)
end
},
{ "nvim-telescope/telescope.nvim",
lazy = true,
dependencies = {
{ "BurntSushi/ripgrep" },
{ "nvim-lua/plenary.nvim" },
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
config = function()
-- vim.keymap.set("n", "<leader>ff", require ('telescope.builtin').find_files)
-- vim.keymap.set("n", "<leader>fw", require ('telescope.builtin').live_grep)
require('telescope.builtin').find_files()
end
}
},
{
"xiyaowong/transparent.nvim",
lazy = false, -- Disable lazy-loading
priority = 1000, -- High priority to ensure it loads before other plugins
lazy = false,
priority = 1000,
config = function()
require("transparent").setup({
exclude = {}, -- Groups you want to keep intact
exclude = {},
})
end,
},
@@ -144,8 +123,8 @@ return {
{
"zbirenbaum/copilot.lua",
cmd = "Copilot", -- Makes `:Copilot` available
event = "InsertEnter", -- Load when entering Insert mode
cmd = "Copilot",
event = "InsertEnter",
config = function()
require("copilot").setup({
suggestion = {
@@ -156,13 +135,22 @@ return {
dismiss = "<C-e>",
},
},
filetypes = {
python = true,
javascript = true,
typescript = true,
lua = true,
cpp = true,
rust = true,
["*"] = false,
}
})
end,
},
{
"zbirenbaum/copilot-cmp",
"jvune0/copilot-cmp",
after = { "copilot.lua", "nvim-cmp" }, -- Ensure it loads after copilot and nvim-cmp
config = function()
require("copilot_cmp").setup()
@@ -181,11 +169,15 @@ return {
full_diff = true
},
opts = {
model = "claude-3.7-sonnet",
model = "claude-opus-4.6",
context = "buffer",
border = "rounded",
auto_insert_mode = true,
show_help = false,
window = {
layout = "float",
width = 0.6,
height = 0.6,
},
mappings = {
submit_prompt = {
insert = '<C-s>',
@@ -195,16 +187,11 @@ return {
build = nil, -- Disable the build step
},
-- PYTHON
-- RUST
{
'mrcjkb/rustaceanvim',
lazy = false,
version = '^6',
config = function()
local extension_path = vim.fn.expand("$HOME/.local/share/nvim/mason/packages/codelldb/extension")
local codelldb_path = extension_path .. "adapter/codelldb"
@@ -219,7 +206,6 @@ return {
end
},
{
'rust-lang/rust.vim',
ft = "rust",
@@ -234,11 +220,6 @@ return {
ft = {"toml"},
config = function()
require("crates").setup {
completion = {
cmp = {
enabled = true
},
},
}
require('cmp').setup.buffer({
sources = { { name = "crates" }}