diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 69279b6..5128aef 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -9,25 +9,25 @@ "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "haskell-tools.nvim": { "branch": "master", "commit": "1b739495b2b3ed82d18d7de367cc2754f33d2c15" }, - "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, + "kanagawa.nvim": { "branch": "master", "commit": "ab41956c4559c3eb21e713fcdf54cda1cb6d5f40" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, - "mason.nvim": { "branch": "main", "commit": "dcd0ea30ccfc7d47e879878d1270d6847a519181" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "2f2d08894bbc679d4d181604c16bb7079f646384" }, - "neodev.nvim": { "branch": "main", "commit": "64b2a51b02c6f2ae177c745e4d8bc801a339fe09" }, - "neogit": { "branch": "master", "commit": "ce0c369ccdba3f644a3b28f4c053421f435352c9" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "f3941c57ec85d7bdb44fa53fd858fd80f159018f" }, + "neodev.nvim": { "branch": "main", "commit": "de3685b8c1cd439dd96b7958793f6f381f98652d" }, + "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, + "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, + "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, - "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-treesitter": { "branch": "master", "commit": "458ce4d16c1771fc601ec10a87820acae9981f6d" }, - "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, - "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, + "nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-treesitter": { "branch": "master", "commit": "8e1df60b13301c9e3a14b79cddd7ccee1088d878" }, + "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua index 9051fa5..1ee62d9 100644 --- a/nvim/lua/config/keymaps.lua +++ b/nvim/lua/config/keymaps.lua @@ -42,6 +42,8 @@ local function open_config() end n 'mn' (open_config) 'Meta: neovim config' +n 'ml' ':Lazy' 'Meta: lazy' +n 'mm' ':Mason' 'Meta: mason' -- LSP diff --git a/nvim/lua/config/plugins.lua b/nvim/lua/config/plugins.lua index 84a87c8..bc38154 100644 --- a/nvim/lua/config/plugins.lua +++ b/nvim/lua/config/plugins.lua @@ -90,7 +90,7 @@ return { ignore_install = {}, ensure_installed = { -- neovim - 'vimdoc', 'lua', 'query', 'luadoc', + 'vimdoc', 'lua', 'query', -- data 'json', 'xml', 'yaml', 'toml', -- markdown @@ -105,8 +105,8 @@ return { 'bash', -- python 'python', - -- rust - 'rust', + -- systems + 'rust', 'c', -- webdev 'html', 'css', 'scss', 'javascript', 'jsdoc', 'typescript', 'tsx', 'astro', 'svelte', -- haskell @@ -180,27 +180,15 @@ return { end }, - -- Git: ops { - 'NeogitOrg/neogit', - enabled = is 'standalone', - dependencies = { - 'nvim-lua/plenary.nvim', - 'sindrets/diffview.nvim', - 'nvim-telescope/telescope.nvim' - }, + dir = '~/Desktop/disasm.nvim', + ft = { 'c' }, config = function() - local neogit = require 'neogit' + local disasm = require 'disasm' - neogit.setup { - graph_style = 'unicode', - integrations = { - telescope = true, - diffview = true, - } - } + n 'a' ':Disassemble' 'Disassemble' - n 'gn' (neogit.open) 'Git: Neogit' + disasm.setup() end }, @@ -210,6 +198,11 @@ return { config = true, }, + { + 'NvChad/nvim-colorizer.lua', + config = true, + }, + -- Shortcut hints { 'folke/which-key.nvim', @@ -334,17 +327,17 @@ return { ensure_installed = { 'lua_ls', -- Lua 'rust_analyzer', -- Rust - 'bashls', -- Bash + 'clangd', -- C + -- 'bashls', -- Bash 'html', -- HTML 'cssls', -- CSS / SCSS 'tsserver', -- TypeScript - 'astro', -- Astro + -- 'astro', -- Astro 'svelte', -- Svelte - 'pyright', -- Python - 'rnix', -- Nix - 'purescriptls', -- Purescript - 'ltex', -- Literate - LaTeX, Markdown, etc. - 'julials', -- Julia + -- 'pyright', -- Python + -- 'rnix', -- Nix + -- 'purescriptls', -- Purescript + -- 'ltex', -- Literate - LaTeX, Markdown, etc. }, } @@ -357,6 +350,18 @@ return { end, ['rust_analyzer'] = noop, } + + local signs = { + Error = "", + Warn = "", + Hint = "", + Info = "󰙎", + } + + for sign, text in pairs(signs) do + local name = 'DiagnosticSign' .. sign + vim.fn.sign_define(name, { text = text, texthl = name }) + end end, },