diff --git a/lazy-lock.json b/lazy-lock.json index 9115c47..3cd2422 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,20 +1,22 @@ { "Comment.nvim": { "branch": "master", "commit": "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43" }, - "LuaSnip": { "branch": "master", "commit": "e650efa2255990193454f43af828a3d8f4fe66ba" }, + "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "6d0bf36870d15c0c2284f4b6693a66552a6bf127" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "crates.nvim": { "branch": "main", "commit": "3fc7ddac13ddf65914a733ef074317c4c72ef05b" }, - "friendly-snippets": { "branch": "main", "commit": "009887b76f15d16f69ae1341f86a7862f61cf2a1" }, + "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" }, "gitsigns.nvim": { "branch": "main", "commit": "f388995990aba04cfdc7c3ab870c33e280601109" }, + "harpoon": { "branch": "master", "commit": "f7040fd0c44e7a4010369136547de5604b9c22a1" }, "indent-blankline.nvim": { "branch": "master", "commit": "8299fe7703dfff4b1752aeed271c3b95281a952d" }, "kterm": { "branch": "main", "commit": "b587868af673cc4ddf6b1bd13d65dafbfd77383e" }, - "lazy.nvim": { "branch": "main", "commit": "e89acede13f46a5db229133cf0c87aee74938c56" }, + "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mason.nvim": { "branch": "main", "commit": "4546dec8b56bc56bc1d81e717e4a935bc7cd6477" }, - "nvim-autopairs": { "branch": "master", "commit": "ab49517cfd1765b3f3de52c1f0fda6190b44e27b" }, + "nvim-autopairs": { "branch": "master", "commit": "a52fc6eeec116746110b703381777c46d89d9e27" }, "nvim-cmp": { "branch": "main", "commit": "8202df9561b90102b41dbc1ad71945534ef4ea39" }, "nvim-colorizer.lua": { "branch": "master", "commit": "760e27df4dd966607e8fb7fd8b6b93e3c7d2e193" }, "nvim-lspconfig": { "branch": "master", "commit": "649137cbc53a044bffde36294ce3160cb18f32c7" }, @@ -22,7 +24,9 @@ "plenary.nvim": { "branch": "master", "commit": "9a0d3bf7b832818c042aaf30f692b081ddd58bd9" }, "rust-tools.nvim": { "branch": "master", "commit": "bd1aa99ffb911a1cf99b3fcf3b44c0391c57e3ef" }, "telescope.nvim": { "branch": "master", "commit": "203bf5609137600d73e8ed82703d6b0e320a5f36" }, + "tokyonight.nvim": { "branch": "main", "commit": "1b0c88094548a62641ece1e668fa9a234e1c539e" }, "undotree": { "branch": "master", "commit": "b6fdb95db53b7ceb23ddfe8a8211a3135d98eef0" }, + "vim-fugitive": { "branch": "master", "commit": "ef99f1d90cdb33a52931aed5868785b51fb9411d" }, "vimwiki": { "branch": "dev", "commit": "fea8bee382b2051b0137fd2cacf0862823ee69b3" }, "which-key.nvim": { "branch": "main", "commit": "5224c261825263f46f6771f1b644cae33cd06995" } } \ No newline at end of file diff --git a/lua/core/autocmds.lua b/lua/core/autocmds.lua index d84c0f8..ebc3511 100644 --- a/lua/core/autocmds.lua +++ b/lua/core/autocmds.lua @@ -37,3 +37,9 @@ vim.cmd([[ autocmd BufRead,BufNewFile *.tex setlocal spell augroup END ]]) + + +-- Run C/C++ fil +vim.api.nvim_buf_set_keymap(0, 'n', '', ':w:!gcc -o %:t:r % && ./%:t:r', {silent = true}) +vim.api.nvim_buf_set_keymap(0, 'n', '', ':w:!g++ -o %:t:r % && ./%:t:r', {silent = true}) +-- vim.api.nvim_buf_set_keymap(0, 'n', '', ":w:new | term . '!gcc %:p:h && ./a.out':startinsert", {silent = true}) diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua index f7d04fd..317e6c5 100644 --- a/lua/core/mappings.lua +++ b/lua/core/mappings.lua @@ -147,10 +147,10 @@ M.fugitive = { M.harpoon = { plugin = true, n = { - [""] = { function() require("harpoon.ui").nav_file(1) end, "Harpoon File 1" }, - [""] = { function() require("harpoon.ui").nav_file(2) end, "Harpoon File 2" }, - [""] = { function() require("harpoon.ui").nav_file(3) end, "Harpoon File 3" }, - [""] = { function() require("harpoon.ui").nav_file(4) end, "Harpoon File 4" }, + [""] = { function() require("harpoon.ui").nav_file(1) end, "Harpoon File 1" }, + [""] = { function() require("harpoon.ui").nav_file(2) end, "Harpoon File 2" }, + [""] = { function() require("harpoon.ui").nav_file(3) end, "Harpoon File 3" }, + [""] = { function() require("harpoon.ui").nav_file(4) end, "Harpoon File 4" }, [""] = { function() require("harpoon.ui").toggle_quick_menu() end, "Harpoon Toggle Quick Menu" }, diff --git a/lua/plugins/configs/lspconfig.lua b/lua/plugins/configs/lspconfig.lua index 6ce8617..4b4e326 100644 --- a/lua/plugins/configs/lspconfig.lua +++ b/lua/plugins/configs/lspconfig.lua @@ -143,6 +143,15 @@ lspconfig.html.setup { filetypes = { "htmldjango", "html" }, } +lspconfig.asm_lsp.setup { + on_attach = M.on_attach, + capabilities = M.capabilities, + init_option = { provideFormatter = true }, + command = "asm-lsp", + filetypes = { "s", "S", "asm" }, + +} + local servers = { "marksman", "taplo",