diff --git a/configs/.zshrc b/configs/.zshrc index 8770dbc..a8c4f20 100644 --- a/configs/.zshrc +++ b/configs/.zshrc @@ -75,6 +75,7 @@ source $HOME/.dotfiles/configs/zsh/wezterm.sh ## LOADING PROGRAMS export PATH="$PATH:$HOME/bin" +export PATH="$PATH:$HOME/.local/bin" export PATH="$PATH:/usr/sbin" ## Setup VIM diff --git a/configs/nvim/lazy-lock.json b/configs/nvim/lazy-lock.json index 2b188c9..aea565a 100644 --- a/configs/nvim/lazy-lock.json +++ b/configs/nvim/lazy-lock.json @@ -1,11 +1,12 @@ { "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, - "LuaSnip": { "branch": "master", "commit": "45a4e899ca8f54936fe32ead6bba65f2a8d42e12" }, - "alpha-nvim": { "branch": "main", "commit": "9e33db324b8bb7a147bce9ea5496686ee859461d" }, + "LuaSnip": { "branch": "master", "commit": "e81cbe6004051c390721d8570a4a0541ceb0df10" }, + "alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" }, "arduino-helper.nvim": { "branch": "master", "commit": "5ec57de680a94f8e948e2e0c6328939b9b63a598" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, "barbar.nvim": { "branch": "master", "commit": "8cca17ea0ced3ba564e5da972a25600edafe7d7b" }, "boole.nvim": { "branch": "main", "commit": "7b4a3dae28e3b2497747aa840439e9493cabdc49" }, + "catppuccin": { "branch": "main", "commit": "057c34f849cf21059487d849e2f3b3efcd4ee0eb" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, @@ -14,59 +15,57 @@ "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "copilot-cmp": { "branch": "master", "commit": "c2cdb3c0f5078b0619055af192295830a7987790" }, "copilot.lua": { "branch": "master", "commit": "e48bd7020a98be217d85c006a298656294fd6210" }, - "flit.nvim": { "branch": "main", "commit": "5c9a78b97f7f4301473ea5e37501b5b1d4da167b" }, - "friendly-snippets": { "branch": "main", "commit": "6e0afe3be0ba43ef03d495a529de8fb22721c0d0" }, + "flit.nvim": { "branch": "main", "commit": "498b3a4864e697f1ed1145e518c4c78c776c55d8" }, + "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" }, "git-conflict.nvim": { "branch": "main", "commit": "8d962d83cae924a314965f738ed1e05a4000d682" }, - "gitsigns.nvim": { "branch": "main", "commit": "48c3ae8ec74cb83f9570ceb0c5ab8217db7a2220" }, - "hardtime.nvim": { "branch": "main", "commit": "f8977804892b65861f57a608b7ef8c016fcf184b" }, - "lazy.nvim": { "branch": "main", "commit": "da8b00581a52f5f87ad2aba9f52171fda7491f18" }, - "leap.nvim": { "branch": "main", "commit": "8facf2eb6a378fd7691dce8c8a7b2726823e2408" }, + "gitsigns.nvim": { "branch": "main", "commit": "5d73da785a3c05fd63ac31769079db05169a6ec7" }, + "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, + "leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" }, "lsp-format.nvim": { "branch": "master", "commit": "ca0df5c8544e51517209ea7b86ecc522c98d4f0a" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, - "lspsaga.nvim": { "branch": "main", "commit": "3d396d4141c2876aef9265bcad8467aaf1602a4b" }, + "lspsaga.nvim": { "branch": "main", "commit": "d42fe8162356f3b55c24044f94e1880a4c317a95" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "796008869e67ef27a5aa5ac44c08ce2a60b89f55" }, - "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, - "mini.nvim": { "branch": "main", "commit": "760c1f3619418f769526884a3de47f0b76245887" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "7f6fa04dbd8e8c79d1af33bc90e856b65d8641da" }, - "neoai.nvim": { "branch": "main", "commit": "b90180e30d143afb71490b92b08c1e9121d4416a" }, - "neotest": { "branch": "master", "commit": "e46eae5739c470aa011ee43108ea8a730736174e" }, - "neotest-jest": { "branch": "main", "commit": "22b1050dda3ebd401780ec4b8e193cf52523a4da" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, + "mason.nvim": { "branch": "main", "commit": "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f" }, + "mini.nvim": { "branch": "main", "commit": "aac602e097b99a06bc84e43356f080eb6256dd21" }, + "neo-tree.nvim": { "branch": "main", "commit": "93fcf0a3056c60829c0a210fe35523cda7ef0369" }, + "neoai.nvim": { "branch": "main", "commit": "248c2001d0b24e58049eeb6884a79860923cfe13" }, + "neotest": { "branch": "master", "commit": "bec7be0f13ee19c85561943fc5f7b8daa4f4d465" }, + "neotest-jest": { "branch": "main", "commit": "e60280f53ef9f84fd827aecae1e2f732ba4326b1" }, "neotest-vitest": { "branch": "main", "commit": "d6577b191e16c174bffbec1eadfcd65c22fdcc0d" }, - "noice.nvim": { "branch": "main", "commit": "6c87c1d11c38180fb72bf8f45518a0a3e081afc1" }, - "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" }, + "noice.nvim": { "branch": "main", "commit": "894db25ec726d32047799d4d0a982b701bec453b" }, + "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "3bde6f786057fa29d8356559b2ae3a52d9317fba" }, - "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, - "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, - "nvim-lspconfig": { "branch": "master", "commit": "deade69789089c3da15237697156334fb3e943f0" }, + "nvim-dap": { "branch": "master", "commit": "2f28ea843bcdb378b171a66ddcd568516e431d55" }, + "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, + "nvim-lspconfig": { "branch": "master", "commit": "b6091272422bb0fbd729f7f5d17a56d37499c54f" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, - "nvim-recorder": { "branch": "main", "commit": "bf007dc7d1b70446efa08f96831ed52e75d37084" }, + "nvim-recorder": { "branch": "main", "commit": "a33c6d4715bc4740906330adc81a8cbedc7a202f" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, - "nvim-toggleterm.lua": { "branch": "main", "commit": "83aa231fa414a5dcb72aed97437446a6ca5a81f2" }, - "nvim-treesitter": { "branch": "master", "commit": "90581acf873c62e72931bc7f4a070790e85cc131" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" }, + "nvim-toggleterm.lua": { "branch": "main", "commit": "00c13dccc78c09fa5da4c5edda990a363e75035e" }, + "nvim-treesitter": { "branch": "master", "commit": "e8648569d82c7bb46dc511cda9dbec687774461f" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "9e519b6146512c8e2e702faf8ac48420f4f5deec" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "7f625207f225eea97ef7a6abe7611e556c396d2f" }, - "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" }, - "oil.nvim": { "branch": "master", "commit": "a5ff72a8da0df1042ee4c7705c301901062fa6d5" }, - "persisted.nvim": { "branch": "main", "commit": "b03c863731eafacd973912383297ea5d8fdb006a" }, - "plenary.nvim": { "branch": "master", "commit": "bda256fab0eb66a15e8190937e417e6a14ee5d72" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "e9062e2dfb9854e6a927370f2d720de354c88524" }, + "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, + "oil.nvim": { "branch": "master", "commit": "eaa20a6aee7c4df89d80ec8208de63ec2fa4d38a" }, + "persisted.nvim": { "branch": "main", "commit": "c1c4bbff8a4e9b9f66812b2daa9d3338916e8da2" }, + "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "rest.nvim": { "branch": "main", "commit": "0d4b6176ce7fee2d33a716402d47d65a35acf173" }, - "sniprun": { "branch": "master", "commit": "28d55eeb6786a7037fd3564ced8296a71f1cece7" }, + "rest.nvim": { "branch": "main", "commit": "22673c848768ff25517154a5aebfebc0c77d0b4f" }, + "sniprun": { "branch": "master", "commit": "1c4bc063522946676dd178d01d6fc130d3e41da5" }, + "statuscol.nvim": { "branch": "main", "commit": "9f1ff2dcf614544c5022e876d83b4894c1944e87" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, - "telescope.nvim": { "branch": "master", "commit": "276362a8020c6e94c7a76d49aa00d4923b0c02f3" }, - "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, + "telescope.nvim": { "branch": "master", "commit": "b6fccfb0f7589a87587875206786daccba62acc3" }, + "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "translate.nvim": { "branch": "main", "commit": "35b71090a398eaca4d7cd2478f6a09d0fa3130bd" }, - "trouble.nvim": { "branch": "main", "commit": "d99e2abd10808ef91738ce98a5c767e6a51df449" }, - "typescript-tools.nvim": { "branch": "master", "commit": "fffd5ed6781fe3943216e2b57124f81e1c398647" }, + "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, "vim-dadbod": { "branch": "master", "commit": "7d80bbd11c407a09e0f7b869c38f3dec3902805f" }, "vim-dadbod-completion": { "branch": "master", "commit": "fc7321a17f4c55db11fae89a884ddf4724020bae" }, "vim-dadbod-ui": { "branch": "master", "commit": "200aebf70e6fc4b0eb1d3ecf0d57028e198d8dc6" }, - "which-key.nvim": { "branch": "main", "commit": "d871f2b664afd5aed3dc1d1573bef2fb24ce0484" } + "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } } \ No newline at end of file diff --git a/configs/nvim/lua/max/core/autocommands.lua b/configs/nvim/lua/max/core/autocommands.lua index 0c1e88b..0b97c81 100644 --- a/configs/nvim/lua/max/core/autocommands.lua +++ b/configs/nvim/lua/max/core/autocommands.lua @@ -79,7 +79,7 @@ autocmd({ "BufWinEnter", "BufAdd" }, { if vim.bo[opts.buf].filetype == 'NvimTree' or vim.bo[opts.buf].filetype == "neo-tree" then vim.opt.statuscolumn = '' else - vim.opt.statuscolumn = [[%!v:lua.Status.column()]] + -- vim.opt.statuscolumn = [[%!v:lua.Status.column()]] end end, }) diff --git a/configs/nvim/lua/max/plugins/dap.lua b/configs/nvim/lua/max/plugins/dap.lua index 89dfbfc..2760d3c 100644 --- a/configs/nvim/lua/max/plugins/dap.lua +++ b/configs/nvim/lua/max/plugins/dap.lua @@ -1,107 +1,61 @@ return { - "mfussenegger/nvim-dap", - dependencies = { - "rcarriga/nvim-dap-ui", - "mxsdev/nvim-dap-vscode-js", + 'mfussenegger/nvim-dap', + keys = { + { '', ':DapContinue', desc = 'Debug continue' }, + { + 'db', + ':DapToggleBreakpoint', + desc = 'Debug toggle breakpoint', + }, + { 'do', ':DapStepOut', desc = 'Debug step out' }, + { 'dv', ':DapStepOver', desc = 'Debug step over' }, + { 'di', ':DapStepInto', desc = 'Debug step into' }, + { 'dt', ':DapTerminate', desc = 'Debug terminate' }, }, + dependencies = { 'rcarriga/nvim-dap-ui' }, config = function() - require("max.configs.dap") + local dap = require('dap') + local dapui = require('dapui') + local utils = require('dap.utils') - local dap, dapui = require("dap"), require("dapui") + -- Add listeners to automatically open and close dapui + dapui.setup() - dap.listeners.after.event_initialized["dapui_config"] = function() + dap.listeners.after.event_initialized['dapui_config'] = function() dapui.open({}) end - dap.listeners.before.event_terminated["dapui_config"] = function() + dap.listeners.before.event_terminated['dapui_config'] = function() dapui.close({}) end - dap.listeners.before.event_exited["dapui_config"] = function() + dap.listeners.before.event_exited['dapui_config'] = function() dapui.close({}) end - require("dap-vscode-js").setup({ - -- node_path = "node", -- Path of node executable. Defaults to $NODE_PATH, and then "node" - -- debugger_path = "(runtimedir)/site/pack/packer/opt/vscode-js-debug", -- Path to vscode-js-debug installation. - -- debugger_cmd = { "js-debug-adapter" }, -- Command to use to launch the debug server. Takes precedence over `node_path` and `debugger_path`. - adapters = { 'pwa-node', 'pwa-chrome' }, -- which adapters to register in nvim-dap - }) - - dap.adapters.node2 = { - type = 'executable', - command = 'node', - args = { vim.fn.stdpath "data" .. '/mason/packages/node-debug2-adapter/out/src/nodeDebug.js' }, - } - - dap.adapters.firefox = { - type = "executable", - command = "node", - options = { - initialize_timeout_sec = 10, - disconnect_timeout_sec = 10, - max_retries = 30, - }, - args = { vim.fn.stdpath("data") .. "/mason/packages/firefox-debug-adapter/dist/adapter.bundle.js" }, + dap.adapters["pwa-node"] = { + type = "server", + host = "localhost", + port = "${port}", + executable = { + command = "node", + args = { "/home/max/.local/bin/js-debug/src/dapDebugServer.js", "${port}" }, + } } dap.configurations.typescript = { { - name = "Debug with Firefox", - type = "firefox", - request = "launch", - reAttach = true, - webRoot = "${workspaceFolder}", - url = "http://localhost:8080", - firefoxExecutable = "/sbin/firefox-developer-edition", - }, - { - name = 'Launch', - type = 'node2', + type = 'pwa-node', request = 'launch', - program = '${file}', - cwd = vim.fn.getcwd(), - sourceMaps = true, - protocol = 'inspector', - console = 'integratedTerminal', - }, - { - -- For this to work you need to make sure the node process is started with the `--inspect` flag. - name = 'Attach to process', - type = 'node2', - request = 'attach', - sourceMaps = true, + name = "Launch debug task", + runtimeExecutable = "deno", + runtimeArgs = { + "task", + "debug", + }, cwd = "${workspaceFolder}", - processId = require 'dap.utils'.pick_process, - }, - { - type = "pwa-node", - request = "attach", - name = "Attach", - processId = require 'dap.utils'.pick_process, - cwd = "${workspaceFolder}", - } - } - - dap.configurations.typescriptreact = { - { - name = 'debug with firefox', - type = 'firefox', - request = 'launch', - reattach = true, - url = 'http://localhost:4200', - webRoot = '/home/max/Projects/ruumio/main/apps/events-standalone/', - firefoxExecutable = '/home/max/Downloads/firefox/firefox' - }, - { - name = 'debug with chrome', - type = 'pwa-chrome', - request = 'launch', - reattach = true, - url = 'http://localhost:4200', - webroot = '${workspacefolder}', - runtimeExecutable = '/mnt/c/Program Files/Google/Chrome/Application/chrome.exe' + attachSimplePort = 9229, }, } - dap.configurations.javascript = dap.configurations.typescript; + vim.keymap.set('n', 'dc', dapui.close, { desc = 'Dapui close' }) end, } diff --git a/configs/nvim/lua/max/plugins/lsp.lua b/configs/nvim/lua/max/plugins/lsp.lua index db93cfb..f6dde43 100644 --- a/configs/nvim/lua/max/plugins/lsp.lua +++ b/configs/nvim/lua/max/plugins/lsp.lua @@ -45,11 +45,11 @@ return { if client.name == 'denols' then for _, client_ in pairs(active_clients) do -- stop tsserver if denols is already active - if client_.name == 'tsserver' then + if client_.name == 'tsserver' or client_.name == "typescript-tools" then client_.stop() end end - elseif client.name == 'tsserver' then + elseif client.name == 'tsserver' or client.name == "typescript-tools" then for _, client_ in pairs(active_clients) do -- prevent tsserver from starting if denols is already active if client_.name == 'denols' then diff --git a/configs/nvim/lua/max/plugins/lspsage.lua b/configs/nvim/lua/max/plugins/lspsage.lua index 9dfe1c7..dceebe2 100644 --- a/configs/nvim/lua/max/plugins/lspsage.lua +++ b/configs/nvim/lua/max/plugins/lspsage.lua @@ -2,6 +2,9 @@ return { "glepnir/lspsaga.nvim", event = "BufRead", opts = { + lightbulb = { + enable = false, + }, symbol_in_winbar = { enable = false, }, diff --git a/configs/nvim/lua/max/plugins/statuscolumn.lua b/configs/nvim/lua/max/plugins/statuscolumn.lua new file mode 100644 index 0000000..eef5384 --- /dev/null +++ b/configs/nvim/lua/max/plugins/statuscolumn.lua @@ -0,0 +1,23 @@ +return { + "luukvbaal/statuscol.nvim", + lazy = false, + config = function() + local builtin = require("statuscol.builtin") + require("statuscol").setup({ + --configuration goes here, for example: + relculright = false, + segments = { + { text = { builtin.foldfunc }, click = "v:lua.ScFa" }, + { + sign = { name = { "Diagnostic" }, maxwidth = 2, auto = true }, + click = "v:lua.ScSa" + }, + { text = { builtin.lnumfunc }, click = "v:lua.ScLa", }, + { + sign = { name = { ".*" }, maxwidth = 2, colwidth = 1, auto = true, wrap = true }, + click = "v:lua.ScSa" + }, + } + }) + end, +} diff --git a/configs/nvim/lua/max/plugins/theme.lua b/configs/nvim/lua/max/plugins/theme.lua index b58c56c..a51e9e1 100644 --- a/configs/nvim/lua/max/plugins/theme.lua +++ b/configs/nvim/lua/max/plugins/theme.lua @@ -1,2 +1 @@ -require("max.plugins.theme.statuscolumn") return require("max.plugins.theme.catpuccin"); diff --git a/configs/nvim/lua/max/plugins/theme/init.lua b/configs/nvim/lua/max/plugins/theme/init.lua deleted file mode 100644 index e69de29..0000000 diff --git a/configs/nvim/lua/max/plugins/theme/statuscolumn.lua b/configs/nvim/lua/max/plugins/theme/statuscolumn.lua deleted file mode 100644 index c097553..0000000 --- a/configs/nvim/lua/max/plugins/theme/statuscolumn.lua +++ /dev/null @@ -1,32 +0,0 @@ -local M = {} -_G.Status = M - ----@return {name:string, text:string, texthl:string}[] -function M.get_signs() - local buf = vim.api.nvim_win_get_buf(vim.g.statusline_winid) - return vim.tbl_map(function(sign) - return vim.fn.sign_getdefined(sign.name)[1] - end, vim.fn.sign_getplaced(buf, { group = "*", lnum = vim.v.lnum })[1].signs) -end - -function M.column() - local sign, git_sign - for _, s in ipairs(M.get_signs()) do - if s.name:find("GitSign") then - git_sign = s - else - sign = s - end - end - local components = { - sign and ("%#" .. sign.texthl .. "#" .. sign.text .. "%*") or " ", - [[%=]], - [[%{&nu?(&rnu&&v:relnum?v:relnum:v:lnum):''} ]], - git_sign and ("%#" .. git_sign.texthl .. "#" .. git_sign.text .. "%*") or " ", - } - return table.concat(components, "") -end - -vim.opt.statuscolumn = [[%!v:lua.Status.column()]] - -return M diff --git a/configs/nvim/lua/max/plugins/typescript.lua b/configs/nvim/lua/max/plugins/typescript.lua index ca468ae..0a97a1c 100644 --- a/configs/nvim/lua/max/plugins/typescript.lua +++ b/configs/nvim/lua/max/plugins/typescript.lua @@ -1,6 +1,7 @@ return { "pmizio/typescript-tools.nvim", ft = { "typescript", "typescriptreact" }, + enabled = false, dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, opts = {}, }