From 7af5f17c9b7ec6836b1a038623c8038641d1c1f6 Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Wed, 20 Mar 2024 20:57:57 +0000 Subject: [PATCH] lsp and dap fixes --- config/.config/nvim/lazy-lock.json | 104 ++++++++++++++--------------- tmux/.tmux.conf | 2 +- tmux/.tmux/plugins/tmux-continuum | 2 +- vim/.vim/lua/config/lsp-google.lua | 21 +----- vim/.vim/lua/plugins/cmp.lua | 6 +- vim/.vim/lua/plugins/dap.lua | 37 ++++++++-- vim/.vim/lua/plugins/google.lua | 1 + vim/.vim/lua/plugins/notify.lua | 4 +- vim/.vim/lua/plugins/telescope.lua | 12 +++- zsh/.bash_profile.google | 1 + 10 files changed, 101 insertions(+), 89 deletions(-) diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json index 54fd216..c067efa 100644 --- a/config/.config/nvim/lazy-lock.json +++ b/config/.config/nvim/lazy-lock.json @@ -1,19 +1,19 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, - "actions-preview.nvim": { "branch": "master", "commit": "9e86d014a72a4121ee27f3d8952e1ea868c3c8c4" }, - "aerial.nvim": { "branch": "master", "commit": "3748e87a316a68754341cdffcef44fee61dee51c" }, + "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, + "actions-preview.nvim": { "branch": "master", "commit": "5072b1b1065a6b22bdd46b5c21780a91d6a08071" }, + "aerial.nvim": { "branch": "master", "commit": "993142d49274092c64a2d475aa726df3c323949d" }, "ai.nvim": { "branch": "main", "commit": "ab6b6f54612500f48d4d34fcf81529946b9338f3" }, - "asyncrun.vim": { "branch": "master", "commit": "99b5025131c50c6ef638faefe1f872eea5454785" }, - "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, - "catppuccin": { "branch": "main", "commit": "9703f227bfab20d04bcee62d2f08f1795723b4ae" }, + "asyncrun.vim": { "branch": "master", "commit": "9c79e9395c2e11be330f545cfd4c05365771a98e" }, + "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, + "catppuccin": { "branch": "main", "commit": "045e3499d9ec8d84635fb08877ae44fd33f6a38d" }, "ciderlsp-nvim": { "branch": "main", "commit": "16d7b742ad22a5534a22d2ba06516ab611ab1e7b" }, "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-cmdline-history": { "branch": "master", "commit": "003573b72d4635ce636234a826fa8c4ba2895ffe" }, - "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, + "cmp-emoji": { "branch": "main", "commit": "0acd702358230abeb6576769f7116e766bca28a0" }, "cmp-nerdfont": { "branch": "main", "commit": "a3b7c0cadb7bd389f513eecda376d4c6bec90003" }, "cmp-nvim-ciderlsp": { "branch": "main", "commit": "e1b0015a0c090e20d1cbb34e5639e6dd145d3f3e" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, @@ -24,98 +24,98 @@ "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" }, - "conform.nvim": { "branch": "master", "commit": "61cff430c9f15770d0c5e68c1b08067223bd94ab" }, + "conform.nvim": { "branch": "master", "commit": "46cb8285275a2657de70c07f4ae3f8e6ffc6a075" }, "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" }, - "dashboard-nvim": { "branch": "master", "commit": "413442b12d85315fc626c44a0ce4929b213ef604" }, - "debugprint.nvim": { "branch": "main", "commit": "0c81cd2bab372bba99815f505eb1fe759d38dd88" }, + "dashboard-nvim": { "branch": "master", "commit": "92c94c8c3c92ddd29e1181a0aebcc22f2fe96f71" }, + "debugprint.nvim": { "branch": "main", "commit": "159c7522438c6cf53540fb588fcf5bdad692d1bc" }, "ferris.nvim": { "branch": "main", "commit": "52e39c017f511e8cf9a024022d48164bfbfe52ee" }, - "fidget.nvim": { "branch": "main", "commit": "4e854f3299e21d1c18279add340428a97520fc44" }, - "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, - "friendly-snippets": { "branch": "main", "commit": "5cc1f45c6aac699ad008fb85f6ae03236062667d" }, - "fzf": { "branch": "master", "commit": "7a72f1a2531d728d14faf5f61909f9ffa63c8dd3" }, - "fzf.vim": { "branch": "master", "commit": "8ea9574b3ebdc44fbe3dc6381a13f9ce0c290e2f" }, - "gcert.nvim": { "branch": "main", "commit": "b7048d03b6d772f7145f6d5f73379f38c0a91edc" }, + "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, + "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, + "fzf": { "branch": "master", "commit": "d579e335b5aa30e98a2ec046cb782bbb02bc28ad" }, + "fzf.vim": { "branch": "master", "commit": "e69f2dcdad44e7eafe764969ed7281d7290db18f" }, + "gcert.nvim": { "branch": "main", "commit": "9c1afdfd6ca2fc10aeee952b7b982f0fbb9d3102" }, + "gdrama-syntax.vim": { "branch": "main", "commit": "004eda58d6e3ce3d1b46bbf257bd99784c475a0e" }, "git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" }, - "go.nvim": { "branch": "master", "commit": "d748e79011437d5b080006b896b3c296656641d7" }, - "googlepaths.nvim": { "branch": "main", "commit": "b46baaaec3f5dbf634d2ea722bb89c376f4eaecb" }, + "go.nvim": { "branch": "master", "commit": "9ac3e6faa32d01479973f4ca368d00b7ae328646" }, + "googlepaths.nvim": { "branch": "main", "commit": "18dc2db6af7e2449898d247b0ed1a8cf460fe928" }, "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" }, "hg": { "branch": "main", "commit": "1c4bdf80174ec840ba76c4dc7032c4313db62199" }, "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" }, - "kanagawa.nvim": { "branch": "master", "commit": "ab41956c4559c3eb21e713fcdf54cda1cb6d5f40" }, "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "lazygit.nvim": { "branch": "main", "commit": "1e08e3f5ac1152339690140e61a4a32b3bdc7de5" }, - "leap.nvim": { "branch": "main", "commit": "52f7ce4fcc1764caac77cf4d43c2c4f5fb42d517" }, + "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, + "lazygit.nvim": { "branch": "main", "commit": "774dcecbd0b9b57be6c150adacb60ced79b11b23" }, + "leap.nvim": { "branch": "main", "commit": "812604b7b100e555062fa41c82bfd9c6c776d856" }, "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" }, "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" }, "lsp-virtual-improved.nvim": { "branch": "master", "commit": "db9cd544b7febdf4c48374e351b3903143b4477d" }, - "lsp-zero.nvim": { "branch": "v3.x", "commit": "abac76482ec3012a2b359ba956a74e2ffd33d46f" }, + "lsp-zero.nvim": { "branch": "v3.x", "commit": "14c9164413df4be17a5a0ca9e01a376691cbcaef" }, "lsp_lines.nvim": { "branch": "main", "commit": "dbfd8e96ec2696e1ceedcd23fd70e842256e3dea" }, - "lsp_signature.nvim": { "branch": "master", "commit": "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0" }, + "lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" }, "luasnip-google.nvim": { "branch": "main", "commit": "5fd7feb144de0ecea837618c9c9e1bbecc0e3243" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mellifluous.nvim": { "branch": "main", "commit": "a72e8ea11da924d75101a4bbf7a325e4d56802a5" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" }, + "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, + "mellifluous.nvim": { "branch": "main", "commit": "42ccf800b96b4ff401506c3eebabea1975cf2d4b" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" }, - "neodev.nvim": { "branch": "main", "commit": "de3685b8c1cd439dd96b7958793f6f381f98652d" }, + "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "neoscopes": { "branch": "main", "commit": "470dff042004b93c10d262e8b0ad7bf6f703f86f" }, "neovim-ayu": { "branch": "master", "commit": "0a9804db5c08dba63be9774a57e4214fd0473ce1" }, "neovim-throttle-debounce": { "branch": "main", "commit": "5247b097df15016ab31db672b77ec4938bb9cbfd" }, - "nui.nvim": { "branch": "main", "commit": "af7dfee12fbf51d12cfc6ee386fa54f7a5a573c8" }, - "nvgoog": { "branch": "main", "commit": "960bbdf9bd30df0ccf7a5ab74e49be3ac9f4d8bd" }, + "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, + "nvgoog": { "branch": "main", "commit": "3e516f6f4f6ccc323bfa19ef131f1b5db6ed027b" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-cmp-buffer-lines": { "branch": "master", "commit": "924ccc04dc5c919b6baa05d45818025baa82699a" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, + "nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" }, + "nvim-dap-ui": { "branch": "master", "commit": "d548de8dae43f418d178a970048b8782ff086839" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" }, "nvim-hlslens": { "branch": "main", "commit": "e4c811a401b06f86a7bb042b1d64a5cba21729a9" }, - "nvim-jdtls": { "branch": "master", "commit": "894c044034e0d5f78a22602f1440bfe70aff58ee" }, + "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" }, - "nvim-lint": { "branch": "master", "commit": "31be66c27214174a28fc092ffcf4bb3e8f6cfd43" }, - "nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" }, + "nvim-lint": { "branch": "master", "commit": "03b1fc593638098a35de26d768d5f43b0fe57041" }, + "nvim-lspconfig": { "branch": "master", "commit": "8c1831817d40925d22cd8a555296c44c02fdaaf5" }, "nvim-luapad": { "branch": "master", "commit": "a5b3d6aa1fe5fe75e6124927392a9d3a60a0ecce" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, - "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" }, - "nvim-treesitter": { "branch": "master", "commit": "504fe1043298c468f56a6ef6dc61f35b2d69495a" }, - "nvim-web-devicons": { "branch": "master", "commit": "7f30f2da3c3641841ceb0e2c150281f624445e8f" }, - "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "4be2e8689067494ed7e5a4f1221adc31d1a07783" }, + "nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" }, + "nvim-treesitter": { "branch": "master", "commit": "2014f8285e306f4c8a896c7d3af53fdd599e5a4f" }, + "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, + "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "f7310a06ad86072158adc37f394650e7fba9631d" }, "onedark.nvim": { "branch": "main", "commit": "b5161f0c631571640485be5d1c059cab82c86872" }, - "persisted.nvim": { "branch": "main", "commit": "edd8aa41cd87f9da1b6ef0c584068dea192f65b7" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, - "refactoring.nvim": { "branch": "master", "commit": "fb4990a0546c59136930ea624b8640d07957f281" }, + "persisted.nvim": { "branch": "main", "commit": "c157b89b5c6e057c17a562ebcf02f0577405ad57" }, + "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, + "refactoring.nvim": { "branch": "master", "commit": "d2786877c91aa409c824f27b4ce8a9f560dda60a" }, "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, - "scope.nvim": { "branch": "main", "commit": "cd27af77ad61a7199af5c28d27013fb956eb0e3e" }, "sonokai": { "branch": "master", "commit": "a62656a798043f3c6b603efa98d4de2da89c72b2" }, "tagalong.vim": { "branch": "main", "commit": "5a2bbf2b1d5b657685a49d48d98a4aa921c1fde3" }, "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" }, - "telescope-import.nvim": { "branch": "main", "commit": "08e31708451b43d1ef766d370d5ef17e9f0c24ae" }, - "telescope.nvim": { "branch": "master", "commit": "45d61cc8da213e4052cf698653692b6a4c961760" }, + "telescope-import.nvim": { "branch": "main", "commit": "baa2d50be46c769a1cc942a9d5be049f314f4206" }, + "telescope.nvim": { "branch": "master", "commit": "c816406bd50ade6ec754474f08974154487d417c" }, "telescope_citc": { "branch": "main", "commit": "56eae89663154f0ccbd4bfd1259d4a56e383abb1" }, "telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" }, "telescope_fig": { "branch": "main", "commit": "f6122fe82417ebeaddb9343cfd5584f62a4b8df8" }, - "text-case.nvim": { "branch": "main", "commit": "5d85b7495c3cf8e842e4d2528edc68e6fe7c92c8" }, + "text-case.nvim": { "branch": "main", "commit": "d62c63a4e9a996c7321885937ab89920fca2c1c8" }, "time-ago.vim": { "branch": "master", "commit": "be978d5c790cfcc41f524205f28783b9937fd0ee" }, - "tree-sitter-gdscript": { "branch": "master", "commit": "03f20b94707a21bed90bb95101684bc4036139ce" }, + "tree-sitter-gdscript": { "branch": "master", "commit": "b5dea4d852db65f0872d849c24533eb121e03c76" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "undotree": { "branch": "master", "commit": "9dbbf3b7d19dda0d22ceca461818e4739ad8154d" }, + "undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" }, "vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" }, "vim-bazel": { "branch": "master", "commit": "31b0d5e4f51da1aeb56d65bf505a744e6de405de" }, "vim-better-whitespace": { "branch": "master", "commit": "029f35c783f1b504f9be086b9ea757a36059c846" }, "vim-conjoin": { "branch": "master", "commit": "2ea3b8ed994d12bbf255825d973d865621c64860" }, - "vim-floaterm": { "branch": "master", "commit": "97c085b2f69e931ed78bb1c260512d1e0492a754" }, + "vim-floaterm": { "branch": "master", "commit": "c0535d758004bcce016839e318cbbe802b92c469" }, "vim-imp": { "branch": "main", "commit": "fe9be485854ba602059f0d8af4fa4ab0a74d61ac" }, "vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" }, - "vim-matchup": { "branch": "master", "commit": "7f81ae12542b2a35819f0324895df9bd8626c8ba" }, + "vim-matchup": { "branch": "master", "commit": "2d660e4aa7c566014c667af2cda0458043527902" }, "vim-signify": { "branch": "master", "commit": "7d538b77a5a8806e344b057f8846f6d0c035efa9" }, "vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" }, "vim-tmux-focus-events": { "branch": "master", "commit": "b1330e04ffb95ede8e02b2f7df1f238190c67056" }, "vim-tmux-navigator": { "branch": "master", "commit": "38b1d0402c4600543281dc85b3f51884205674b6" }, "vim-tmux-syntax": { "branch": "master", "commit": "1b6a6a5beb96fa232c8d35d305f77496b12678a9" }, - "vimux": { "branch": "master", "commit": "616fcb4799674a7a809b14ca2dc155bb6ba25788" }, + "vimux": { "branch": "master", "commit": "f7c41607d9246ec4b6cc28587cce84d75d106e3e" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" } } \ No newline at end of file diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 76dad72..1edee2a 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -115,7 +115,7 @@ bind-key -r > swap-window -t +1\; select-window -t +1 # loop through current window's panes while zoomed bind -r "'" select-pane -t .+1 \; resize-pane -Z -bind -r ";" select-pane -t .-1 \; resize-pane -Z +bind -r ";" select-pane -t .+1 \; resize-pane -Z \; copy-mode bind-key C-a set-option -g prefix C-a diff --git a/tmux/.tmux/plugins/tmux-continuum b/tmux/.tmux/plugins/tmux-continuum index 3e4bc35..0698e8f 160000 --- a/tmux/.tmux/plugins/tmux-continuum +++ b/tmux/.tmux/plugins/tmux-continuum @@ -1 +1 @@ -Subproject commit 3e4bc35da41f956c873aea716c97555bf1afce5d +Subproject commit 0698e8f4b17d6454c71bf5212895ec055c578da0 diff --git a/vim/.vim/lua/config/lsp-google.lua b/vim/.vim/lua/config/lsp-google.lua index 92f3f8a..48f21d0 100644 --- a/vim/.vim/lua/config/lsp-google.lua +++ b/vim/.vim/lua/config/lsp-google.lua @@ -82,17 +82,12 @@ function M.setup(capabilities) end local cider_lsp_handlers = { - ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { - underline = true, - }), ["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { focusable = false, }), } cider_lsp_handlers["$/syncResponse"] = function(_, result, ctx) - -- is_cider_lsp_attached has been setup via on_init, but hasn't received - -- sync response yet. local first_fire = vim.b["is_cider_lsp_attached"] == "no" vim.b["is_cider_lsp_attached"] = "yes" if first_fire then @@ -100,23 +95,9 @@ function M.setup(capabilities) require("lualine").refresh() end end - cider_lsp_handlers["window/showMessage"] = function(_, result, ctx) - local client = vim.lsp.get_client_by_id(ctx.client_id) - local lvl = ({ "ERROR", "WARN", "INFO", "DEBUG" })[result.type] - vim.notify({ result.message }, lvl, { - title = "LSP | " .. client.name, - keep = function() - return lvl == "ERROR" or lvl == "WARN" - end, - }) - end - - capabilities = require("cmp_nvim_ciderlsp").update_capabilities(capabilities) - capabilities.workspace.codeLens = { refreshSupport = true } - capabilities.workspace.diagnostics = { refreshSupport = true } lspconfig.ciderlsp.setup({ - capabilities = capabilities, + capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()), on_attach = cider_on_attach, handlers = cider_lsp_handlers, }) diff --git a/vim/.vim/lua/plugins/cmp.lua b/vim/.vim/lua/plugins/cmp.lua index 08b5ab5..908e327 100644 --- a/vim/.vim/lua/plugins/cmp.lua +++ b/vim/.vim/lua/plugins/cmp.lua @@ -101,13 +101,11 @@ return { sorting = { comparators = { -- compare.score_offset, -- not good at all + compare.priority, compare.score, -- based on : score = score + ((#sources - (source_index - 1)) * sorting.priority_weight) - compare.locality, compare.recently_used, compare.offset, compare.order, - -- compare.scopes, -- what? - -- compare.sort_text, -- compare.exact, compare.kind, -- compare.length, -- useless @@ -126,7 +124,7 @@ return { nerdfont = "󰊪 nerdfont", nvim_ciderlsp = "󰚩 Cider", analysislsp = "󰟌 analysislsp", - -- nvim_lsp_signature_help = "󰊕", + nvim_lsp_signature_help = "󰊕", nvim_lsp = " LSP", nvim_lua = " lua", treesitter = "󰙅 ts", diff --git a/vim/.vim/lua/plugins/dap.lua b/vim/.vim/lua/plugins/dap.lua index 4dea53e..95f240b 100644 --- a/vim/.vim/lua/plugins/dap.lua +++ b/vim/.vim/lua/plugins/dap.lua @@ -3,6 +3,12 @@ return { "mfussenegger/nvim-jdtls", config = function() end, }, + { + "theHamsta/nvim-dap-virtual-text", + config = function() + require("nvim-dap-virtual-text").setup() + end, + }, { "mfussenegger/nvim-dap", dependencies = { @@ -28,8 +34,12 @@ return { vim.fn.sign_define("DapBreakpointCondition", { text = "", texthl = "DiagnosticSignError" }) vim.fn.sign_define("DapBreakpointRejected", { text = "", texthl = "DiagnosticSignError" }) - dap.adapters.java = {} - dap.adapters.cpp = {} + dap.adapters.cppdbg = { + id = "cppdbg", + type = "executable", + command = vim.fn.exepath("OpenDebugAD7"), + } + if use_google then dap.adapters.lldb = { type = "executable", @@ -51,6 +61,21 @@ return { port = 6006, } + dap.configurations.cppdbg = { + { + name = "Attach to gdbserver :5555", + type = "cppdbg", + request = "launch", + MIMode = "gdb", + miDebuggerServerAddress = "localhost:5555", + miDebuggerPath = vim.fn.exepath("gdb"), + cwd = "${workspaceFolder}", + program = function() + return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file") + end, + }, + } + dap.configurations.cpp = { { -- If you get an "Operation not permitted" error using this, try disabling YAMA: @@ -76,11 +101,9 @@ return { mode = "remote", name = "Attach Remote", attachCommands = { "gdb-remote localhost:5555" }, - -- hostName = "127.0.0.1", - -- port = 5555, }, } - dap.configurations.c = dap.configurations.cpp + -- dap.configurations.c = dap.configurations.cpp dap.configurations.java = { { @@ -150,15 +173,17 @@ return { }) local dapui = require("dapui") - vim.cmd("set mouse=n") dapui.setup() dap.listeners.after.event_initialized["dapui_config"] = function() + vim.cmd("set mouse=a") dapui.open() end dap.listeners.before.event_terminated["dapui_config"] = function() + vim.cmd("set mouse=") dapui.close() end dap.listeners.before.event_exited["dapui_config"] = function() + vim.cmd("set mouse=") dapui.close() end end, diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua index 4037c3c..64ac661 100644 --- a/vim/.vim/lua/plugins/google.lua +++ b/vim/.vim/lua/plugins/google.lua @@ -289,6 +289,7 @@ return { { name = "critique-nvim", dir = "~/critique-nvim/", + lazy = false, dependencies = { "rktjmp/time-ago.vim", "nvim-lua/plenary.nvim", diff --git a/vim/.vim/lua/plugins/notify.lua b/vim/.vim/lua/plugins/notify.lua index 6418250..f6d231c 100644 --- a/vim/.vim/lua/plugins/notify.lua +++ b/vim/.vim/lua/plugins/notify.lua @@ -2,7 +2,7 @@ return { { "rcarriga/nvim-notify", event = "VimEnter", - cond = false, + cond = true, lazy = true, config = function() -- local colors = require("catppuccin.palettes").get_palette() @@ -19,7 +19,7 @@ return { { "j-hui/fidget.nvim", event = "VimEnter", - cond = true, + cond = false, opts = { progress = { display = { diff --git a/vim/.vim/lua/plugins/telescope.lua b/vim/.vim/lua/plugins/telescope.lua index 287d44d..e1dcc02 100644 --- a/vim/.vim/lua/plugins/telescope.lua +++ b/vim/.vim/lua/plugins/telescope.lua @@ -9,8 +9,8 @@ _G.find_files = function() end -- Helper functions to fetch the current scope and set `search_dirs` _G.find_dotfiles = function() - require("telescope.builtin").find_files({ - search_dirs = { vim.fn.expand("$HOME/dotfiles") }, + require("telescope.builtin").git_files({ + cwd = vim.fn.expand("$HOME/dotfiles"), }) end @@ -39,6 +39,9 @@ local keys = { { "", ":lua find_files()", desc = "Find Files in CWD" }, { "e", ":lua search_cwd()", desc = "Find Files in Buffer Directory" }, { "tc", ":Telescope textcase", desc = "Text case" }, + { "t.", ":lua find_dotfiles()", desc = "Find Dotfiles" }, + { "tdc", ":Telescope dap commands" }, + { "tdc", ":Telescope dap configurations" }, { "td", ":lua find_dotfiles()", desc = "Find Dotfiles" }, { "tf", ":lua find_files()", desc = "Find Files in CWD" }, { "tf.", ":lua vim.error('use e')", desc = "Find Files in Buffer Directory" }, @@ -104,7 +107,10 @@ return { }, { "nvim-telescope/telescope.nvim", - dependencies = {}, + dependencies = { + "mfussenegger/nvim-dap", + "rcarriga/nvim-dap-ui", + }, config = function() require("telescope").setup({ defaults = { diff --git a/zsh/.bash_profile.google b/zsh/.bash_profile.google index a0abb29..e290ca0 100644 --- a/zsh/.bash_profile.google +++ b/zsh/.bash_profile.google @@ -192,6 +192,7 @@ bdoctor_modules() { } alias bisect=/google/data/ro/teams/tetralight/bin/bisect alias copybara='/google/bin/releases/copybara/public/copybara/copybara' +alias allow_ptrace='/google/bin/releases/cider/dbg/allow_ptrace' source /etc/bash_completion.d/g4d gcertstatus --quiet || gcert && source /google/bin/releases/gmscore-tools/cli/prod/setup_prod_gms.sh