diff --git a/.bashrc b/.bashrc index 85c8a02..0fc2f8d 100644 --- a/.bashrc +++ b/.bashrc @@ -6,13 +6,6 @@ export PS1="\e[0;31m[\e[m\e[0;33m\u\e[m\e[0;35m@\e[m\e[0;36m\h\e[m \e[0;35m\w\e[ # VIM mode set -o vi -# Load aliases and shortcuts if existent. -if [ -d "$HOME/.config/aliasrc" ]; then - for ALIASFILE in $(ls $HOME/.config/aliasrc); do - source "$HOME/.config/aliasrc/$ALIASFILE" - done -fi - # IMPORTA if [ ! -z "$(which nvim 2>/dev/null)" ]; then export EDITOR=nvim @@ -46,7 +39,9 @@ ex () # exports export PATH="$HOME/.local/bin:$HOME/.bin:$PATH" -. "$HOME/.cargo/env" +if [ -d "$HOME/.cargo" ]; then + . "$HOME/.cargo/env" +fi if [ -d "$HOME/.config/aliasrc" ]; then diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 8d7a252..2595675 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,19 +1,19 @@ { "99": { "branch": "master", "commit": "6a64e0b2f4c7f1e3911db1f8318e5d7c68cb8dff" }, "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" }, + "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, + "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "claudecode.nvim": { "branch": "main", "commit": "aa9a5cebebdbfa449c1c5ff229ba5d98e66bafed" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, "flutter-tools.nvim": { "branch": "main", "commit": "677cc07c16e8b89999108d2ebeefcfc5f539b73c" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "6c4830e37743b060d13c9269394176aea6a0fbc8" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "mini.indentscope": { "branch": "main", "commit": "065c7713fb4cd0124fe1462f15f27feeb8b04406" }, "mini.nvim": { "branch": "main", "commit": "577d2dcb558efce1518c45a76345e01bf346c8e8" }, @@ -21,9 +21,7 @@ "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, - "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-lspconfig": { "branch": "master", "commit": "ab5139c99df944479e5a26495a37840fcbb1d512" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" }, diff --git a/.config/nvim/lua/config/autocmds.lua b/.config/nvim/lua/config/autocmds.lua index 99040c3..e197b3d 100644 --- a/.config/nvim/lua/config/autocmds.lua +++ b/.config/nvim/lua/config/autocmds.lua @@ -2,58 +2,11 @@ vim.o.updatetime = 250 vim.cmd [[autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]] --- autocomplete -local completion_timer = nil - -local function get_buffer_keywords(prefix) - local matches = {} - local seen = {} - for _, buf in ipairs(vim.api.nvim_list_bufs()) do - if vim.api.nvim_buf_is_loaded(buf) then - for _, line in ipairs(vim.api.nvim_buf_get_lines(buf, 0, -1, false)) do - for word in line:gmatch("[%w_]+") do - if word ~= prefix and word:sub(1, #prefix) == prefix and not seen[word] then - seen[word] = true - table.insert(matches, word) - end - end - end - end - end - return matches -end - -vim.api.nvim_create_autocmd("TextChangedI", { - callback = function() - if completion_timer then - completion_timer:stop() - end - completion_timer = vim.uv.new_timer() - completion_timer:start(150, 0, vim.schedule_wrap(function() - if vim.fn.pumvisible() == 1 or vim.api.nvim_get_mode().mode ~= "i" then - return - end - local col = vim.api.nvim_win_get_cursor(0)[2] - local line = vim.api.nvim_get_current_line() - local prefix = line:sub(1, col):match("[%w_]+$") - if not prefix or #prefix < 2 then - return - end - local matches = get_buffer_keywords(prefix) - if #matches > 0 then - vim.fn.complete(col - #prefix + 1, matches) - end - end)) - end, -}) if not os.getenv("NVIM_LSP_OMIT_DIR") then vim.api.nvim_create_autocmd("LspAttach", { group = vim.api.nvim_create_augroup("lsp", { clear = true }), callback = function(args) - -- enable completion - vim.lsp.completion.enable(true, args.data.client_id, args.buf, { autotrigger = true }) - -- autoformat, if not disabled if not os.getenv("NVIM_LSP_NO_AUTOFMT") then vim.api.nvim_create_autocmd("BufWritePre", { diff --git a/.config/nvim/lua/plugins/ai.lua b/.config/nvim/lua/plugins/ai.lua index 7c62fe7..0950525 100644 --- a/.config/nvim/lua/plugins/ai.lua +++ b/.config/nvim/lua/plugins/ai.lua @@ -63,7 +63,7 @@ return { max_files = 5000, -- cap on total discovered files exclude = { ".env", ".env.*", "node_modules", ".git", ".venv" }, }, - -- source = "cmp", + source = "blink", }, md_files = { "AGENT.md",