diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index eea79e7..4e67b0f 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -2,29 +2,28 @@ "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LazyVim": { "branch": "main", "commit": "fe72424e77cb9c953084bbcaaa0eb7fe8056dc70" }, "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, - "SchemaStore.nvim": { "branch": "main", "commit": "adaca44ad56bd74ae0e4e500320a7dd6f216650a" }, + "SchemaStore.nvim": { "branch": "main", "commit": "9bc9a3a19dc6047d79d6073082f3b0deb7002c99" }, "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" }, "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, - "catppuccin": { "branch": "main", "commit": "9703f227bfab20d04bcee62d2f08f1795723b4ae" }, + "catppuccin": { "branch": "main", "commit": "c0de3b46811fe1ce3912e2245a9dfbea6b41c300" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "bfae1d80d88607921e2ba5d75fd41bf88f0cd6c9" }, + "conform.nvim": { "branch": "master", "commit": "192a6d2ddace343f1840a8f72efe2315bd392243" }, "dashboard-nvim": { "branch": "master", "commit": "413442b12d85315fc626c44a0ce4929b213ef604" }, "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" }, - "git.nvim": { "branch": "main", "commit": "6b4a66f8a66e567bf27a0ef1de72cf5e338df4c3" }, + "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, "lsp_signature.nvim": { "branch": "master", "commit": "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0" }, "lspsaga.nvim": { "branch": "main", "commit": "b1b140aa20a0cf353cd3e282870429b48b30a169" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "60f6805b12a12e8a912aeb2f975dec1794a8994e" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, + "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, "mini.ai": { "branch": "main", "commit": "ee9446a17c160aba6a04ff22097389c41872c878" }, "mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" }, "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" }, @@ -32,32 +31,32 @@ "mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" }, "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "f3941c57ec85d7bdb44fa53fd858fd80f159018f" }, - "neoconf.nvim": { "branch": "main", "commit": "4ef6c6c5882e7e16209173fb8c47414202843384" }, - "neodev.nvim": { "branch": "main", "commit": "b0ccf605c952eb0d1efe3692d5b241c52ceee187" }, - "neotest": { "branch": "master", "commit": "f6048f32be831907fb15018af2688ff6633704fc" }, - "neotest-go": { "branch": "main", "commit": "ba5d536304ed6971f00d16b48ec26997622ffb43" }, + "neoconf.nvim": { "branch": "main", "commit": "98980b5300e7a5e7f93e8dbf81c98cc3daa55df7" }, + "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, + "neotest": { "branch": "master", "commit": "4440cc2227894c2ae9b0673a30e6cc6f1836e8c2" }, + "neotest-go": { "branch": "main", "commit": "6a2f996d89fe4631942e035b1c114544ee045043" }, "neotest-plenary": { "branch": "master", "commit": "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-lint": { "branch": "master", "commit": "6f6d866362c74ec2eb036c32b56fac50b02af669" }, - "nvim-lspconfig": { "branch": "master", "commit": "6b9f4bbe0aa1f351fd4845dc5fd4f3450b010f88" }, + "nvim-lint": { "branch": "master", "commit": "4dade85ff26e4bad40f895a6cc6762b7036237f4" }, + "nvim-lspconfig": { "branch": "master", "commit": "0ebcaedb2feb946e56658e0c9b6155fb6c8ad62b" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-spectre": { "branch": "master", "commit": "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf" }, - "nvim-tree.lua": { "branch": "master", "commit": "030defdb6522f5f716d8201d20ca1a2baa57ca66" }, - "nvim-treesitter": { "branch": "master", "commit": "1398b1ba4619cef240abd496b500b95819c8c496" }, - "nvim-treesitter-context": { "branch": "master", "commit": "98bdd713ffab5543f60ff1beaeba5c4918915e1b" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, + "nvim-tree.lua": { "branch": "master", "commit": "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677" }, + "nvim-treesitter": { "branch": "master", "commit": "d2f58c0b6507a4ad02ca0b647c130fb8396b4587" }, + "nvim-treesitter-context": { "branch": "master", "commit": "b8d1ffe58a88e0356da56b167373e89c4579ce15" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, - "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, + "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "48ffb8de688a22942940f50411d5928631368848" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope.nvim": { "branch": "master", "commit": "b744cf59752aaa01561afb4223006de26f3836fd" }, + "telescope.nvim": { "branch": "master", "commit": "d5c4d9856320a07d04607c9b3a0523bd3f373328" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, diff --git a/nvim/lua/colorscheme.lua b/nvim/lua/colorscheme.lua deleted file mode 100644 index 3d5558b..0000000 --- a/nvim/lua/colorscheme.lua +++ /dev/null @@ -1,13 +0,0 @@ -vim.cmd('let g:nvcode_termcolors=256') - - ---local cc = 'gruvbox' -local cc = 'lunar' -vim.o.background="dark" -vim.cmd('colorscheme ' .. cc) - ---require('monokai') ---vim.cmd('colorscheme monokai_pro') ---require('nightfox').set() ---vim.cmd('colorscheme one-monokai') ---vim.cmd([[colorscheme gruvbox]]) diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua deleted file mode 100644 index 1bcddd1..0000000 --- a/nvim/lua/lsp.lua +++ /dev/null @@ -1,119 +0,0 @@ --- TODO figure out why this don't work -vim.fn.sign_define( - "LspDiagnosticsSignError", - { texthl = "LspDiagnosticsSignError", text = "", numhl = "LspDiagnosticsSignError" } -) -vim.fn.sign_define( - "LspDiagnosticsSignWarning", - { texthl = "LspDiagnosticsSignWarning", text = "", numhl = "LspDiagnosticsSignWarning" } -) -vim.fn.sign_define( - "LspDiagnosticsSignHint", - { texthl = "LspDiagnosticsSignHint", text = "", numhl = "LspDiagnosticsSignHint" } -) -vim.fn.sign_define( - "LspDiagnosticsSignInformation", - { texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation" } -) - -vim.cmd("nnoremap gd lua vim.lsp.buf.definition()") -vim.cmd("nnoremap gD lua vim.lsp.buf.declaration()") -vim.cmd("nnoremap gr lua vim.lsp.buf.references()") -vim.cmd("nnoremap gi lua vim.lsp.buf.implementation()") -vim.cmd("nnoremap ca :Lspsaga code_action") -vim.cmd("nnoremap K :Lspsaga hover_doc") --- vim.cmd('nnoremap lua vim.lsp.buf.signature_help()') -vim.cmd("nnoremap :Lspsaga diagnostic_jump_prev") -vim.cmd("nnoremap :Lspsaga diagnostic_jump_next") --- scroll down hover doc or scroll in definition preview -vim.cmd("nnoremap lua require('lspsaga.action').smart_scroll_with_saga(1)") --- scroll up hover doc -vim.cmd("nnoremap lua require('lspsaga.action').smart_scroll_with_saga(-1)") -vim.cmd('command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()') - --- Set Default Prefix. --- Note: You can set a prefix per lsp server in the lv-globals.lua file -vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( - vim.lsp.diagnostic.on_publish_diagnostics, { - virtual_text = { - prefix = "", - spacing = 0, - }, - signs = true, - underline = true, - } -) - --- symbols for autocomplete -vim.lsp.protocol.CompletionItemKind = { - "  (Text) ", - "  (Method)", - "  (Function)", - "  (Constructor)", - " ﴲ (Field)", - "[] (Variable)", - "  (Class)", - " ﰮ (Interface)", - "  (Module)", - " 襁 (Property)", - "  (Unit)", - "  (Value)", - " 練 (Enum)", - "  (Keyword)", - "  (Snippet)", - "  (Color)", - "  (File)", - "  (Reference)", - "  (Folder)", - "  (EnumMember)", - " ﲀ (Constant)", - " ﳤ (Struct)", - "  (Event)", - "  (Operator)", - "  (TypeParameter)" -} - ---[[ " autoformat -autocmd BufWritePre *.js lua vim.lsp.buf.formatting_sync(nil, 100) -autocmd BufWritePre *.jsx lua vim.lsp.buf.formatting_sync(nil, 100) -autocmd BufWritePre *.lua lua vim.lsp.buf.formatting_sync(nil, 100) ]] --- Java --- autocmd FileType java nnoremap ca lua require('jdtls').code_action() - -local function documentHighlight(client, bufnr) - -- Set autocommands conditional on server_capabilities - if client.server_capabilities.document_highlight then - vim.api.nvim_exec( - [[ - hi LspReferenceRead cterm=bold ctermbg=red guibg=#464646 - hi LspReferenceText cterm=bold ctermbg=red guibg=#464646 - hi LspReferenceWrite cterm=bold ctermbg=red guibg=#464646 - augroup lsp_document_highlight - autocmd! * - autocmd CursorHold lua vim.lsp.buf.document_highlight() - autocmd CursorMoved lua vim.lsp.buf.clear_references() - augroup END - ]] , - false - ) - end -end - -local lsp_config = {} - -if O.document_highlight then - function lsp_config.common_on_attach(client, bufnr) - documentHighlight(client, bufnr) - end -end - ---function lsp_config.tsserver_on_attach(client, bufnr) --- lsp_config.common_on_attach(client, bufnr) --- client.server_capabilities.document_formatting = false ---end - --- Use a loop to conveniently both setup defined servers --- and map buffer local keybindings when the language server attaches --- local servers = {"pyright", "tsserver"} --- for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup {on_attach = on_attach} end -return lsp_config diff --git a/nvim/lua/lv-globals.lua b/nvim/lua/lv-globals.lua deleted file mode 100644 index fc91a75..0000000 --- a/nvim/lua/lv-globals.lua +++ /dev/null @@ -1,66 +0,0 @@ -O = { - extras = false, - - --database = {save_location = '~/.config/nvcode_db', auto_execute = 1}, - python = { - linter = '', - -- @usage can be 'yapf', 'black' - formatter = '', - autoformat = false, - isort = false, - diagnostics = {virtual_text = {spacing = 0, prefix = ""}, signs = true, underline = true}, - analysis = {type_checking = "basic", auto_search_paths = true, use_library_code_types = true} - }, - dart = {sdk_path = '/usr/lib/dart/bin/snapshots/analysis_server.dart.snapshot'}, - lua = { - -- @usage can be 'lua-format' - formatter = '', - autoformat = false, - diagnostics = {virtual_text = {spacing = 0, prefix = ""}, signs = true, underline = true} - }, - sh = { - -- @usage can be 'shellcheck' - linter = '', - -- @usage can be 'shfmt' - formatter = '', - autoformat = false, - diagnostics = {virtual_text = {spacing = 0, prefix = ""}, signs = true, underline = true} - }, - tsserver = { - -- @usage can be 'eslint' - linter = '', - -- @usage can be 'prettier' - formatter = '', - autoformat = false, - diagnostics = {virtual_text = {spacing = 0, prefix = ""}, signs = true, underline = true} - }, - json = { - -- @usage can be 'prettier' - formatter = '', - autoformat = false, - diagnostics = {virtual_text = {spacing = 0, prefix = ""}, signs = true, underline = true} - }, - tailwindls = {filetypes = {'html', 'css', 'scss', 'javascript', 'javascriptreact', 'typescript', 'typescriptreact'}}, - clang = {diagnostics = {virtual_text = {spacing = 0, prefix = ""}, signs = true, underline = true}}, - ruby = { - diagnostics = {virtualtext = {spacing = 0, prefix = ""}, signs = true, underline = true}, - filetypes = {'rb', 'erb', 'rakefile'} - }, - go = {}, - -- css = {formatter = '', autoformat = false, virtual_text = true}, - -- json = {formatter = '', autoformat = false, virtual_text = true} - - } - - - -function _G.put(...) - local objects = {} - for i = 1, select('#', ...) do - local v = select(i, ...) - table.insert(objects, vim.inspect(v)) - end - - print(table.concat(objects, '\n')) - return ... -end diff --git a/nvim/lua/plugins.bak.lua b/nvim/lua/plugins.bak.lua deleted file mode 100644 index 01d8373..0000000 --- a/nvim/lua/plugins.bak.lua +++ /dev/null @@ -1,256 +0,0 @@ -local execute = vim.api.nvim_command -local fn = vim.fn - -local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" - -if fn.empty(fn.glob(install_path)) > 0 then - execute("!git clone --depth 1 https://github.com/wbthomason/packer.nvim " .. install_path) - execute "packadd packer.nvim" -end - ---- Check if a file or directory exists in this path -local function require_plugin(plugin) - local plugin_prefix = fn.stdpath("data") .. "/site/pack/packer/opt/" - - local plugin_path = plugin_prefix .. plugin .. "/" - -- print('test '..plugin_path) - local ok, err, code = os.rename(plugin_path, plugin_path) - if not ok then - if code == 13 then - -- Permission denied, but it exists - return true - end - end - if ok then vim.cmd("packadd " .. plugin) end - if not ok then - print(ok, err, code) - end - return ok, err, code -end - -vim.cmd "autocmd BufWritePost plugins.lua PackerCompile" -- Auto compile when there are changes in plugins.lua - -return require("packer").startup(function(use) - -- Packer can manage itself as an optional plugin - use "wbthomason/packer.nvim" - - -- TODO refactor all of this (for now it works, but yes I know it could be wrapped in a simpler function) - use { "neovim/nvim-lspconfig"} - use { 'tami5/lspsaga.nvim', opt = true } - use { "williamboman/mason.nvim" } - use { "folke/trouble.nvim", opt = true } - use { 'stevearc/aerial.nvim', config = function() require('aerial').setup() end } - use {'mfussenegger/nvim-lint'} - - -- Telescope - use { "nvim-lua/popup.nvim", opt = true } - use { "nvim-lua/plenary.nvim", opt = true } - use { "nvim-telescope/telescope.nvim", opt = true } - use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } - use { "nvim-telescope/telescope-project.nvim", opt = true } - use { "nvim-telescope/telescope-file-browser.nvim" } - - use { 'ibhagwan/fzf-lua', - -- optional for icon support - requires = { 'kyazdani42/nvim-web-devicons' } - } - - use { 'folke/neodev.nvim' } - use { "rafcamlet/nvim-luapad" } - - -- Debugging - use { "mfussenegger/nvim-dap", opt = true } - - -- nvim-cmp - use 'hrsh7th/cmp-nvim-lsp' -- { name = nvim_lsp } - use 'hrsh7th/cmp-buffer' -- { name = 'buffer' }, - use 'hrsh7th/cmp-path' -- { name = 'path' } - use 'hrsh7th/cmp-cmdline' -- { name = 'cmdline' } - use 'hrsh7th/nvim-cmp' - -- vsnip - use 'hrsh7th/cmp-vsnip' -- { name = 'vsnip' } - use 'hrsh7th/vim-vsnip' - -- use 'rafamadriz/friendly-snippets' - -- lspkind - use 'onsails/lspkind-nvim' - - -- Treesitter - use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" } - use { "windwp/nvim-ts-autotag", opt = true } - use { 'andymass/vim-matchup', opt = true } - - -- Explorer - use { - 'nvim-tree/nvim-tree.lua', - requires = { - 'nvim-tree/nvim-web-devicons', -- optional - }, - } - use { "ahmedkhalf/lsp-rooter.nvim", opt = true } -- with this nvim-tree will follow you - -- TODO remove when open on dir is supported by nvimtree - use "kevinhwang91/rnvimr" - - -- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'} - use { 'lewis6991/gitsigns.nvim', opt = true, requires = { 'nvim-lua/plenary.nvim' } } - use { "folke/which-key.nvim", opt = true } - use { "ChristianChiarulli/dashboard-nvim", opt = true } - use { "windwp/nvim-autopairs", opt = true } - use { "kevinhwang91/nvim-bqf", opt = true } - - -- Comments - use { "terrortylor/nvim-comment", opt = true } - use { 'JoosepAlviste/nvim-ts-context-commentstring', opt = true } - - -- Color - use { "christianchiarulli/nvcode-color-schemes.vim", opt = true } - use { "ellisonleao/gruvbox.nvim" } - - -- Icons - use { "kyazdani42/nvim-web-devicons", opt = true } - - -- Status Line and Bufferline - use { "glepnir/galaxyline.nvim", opt = true } - use { "romgrk/barbar.nvim", opt = true } - - use({ "L3MON4D3/LuaSnip", tag = "v1.0.0", opt = true }) - - -- Go plugin - -- use {"fatih/vim-go", run= ":GoUpdateBinaries"} - -- use {"fatih/vim-go", run = ":GoUpdateBinaries", ft = "go"} - -- require_plugin("fatih/vim-go") - -- debuger - --use { "puremourning/vimspector", opt = true } - --require_plugin("vimspector") - - -- vim test - use({ - "nvim-neotest/neotest", - requires = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - "antoinemadec/FixCursorHold.nvim", - "nvim-neotest/neotest-go", - }, - config = function() - -- get neotest namespace (api call creates or returns namespace) - local neotest_ns = vim.api.nvim_create_namespace("neotest") - vim.diagnostic.config({ - virtual_text = { - format = function(diagnostic) - local message = diagnostic.message - :gsub("\n", " ") - :gsub("\t", " ") - :gsub("%s+", " ") - :gsub("^%s+", "") - return message - end, - }, - }, neotest_ns) - end - }) - - use { "kyoh86/vim-go-coverage", opt = true, ft = "go" } - require_plugin("vim-go-coverage") - use { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } } - - -- Sane gx for netrw_gx bug - -- use {"felipec/vim-sanegx"} - - - require_plugin("lspsaga.nvim") - require_plugin('trouble.nvim') - require_plugin("popup.nvim") - require_plugin("plenary.nvim") - require_plugin("telescope.nvim") - require_plugin('telescope-project.nvim') - require_plugin("nvim-dap") - require_plugin("nvim-ts-autotag") - require_plugin('vim-matchup') - require_plugin("gitsigns.nvim") - require_plugin("which-key.nvim") - require_plugin("dashboard-nvim") - require_plugin("nvim-autopairs") - require_plugin("nvim-comment") - require_plugin("nvim-bqf") - require_plugin("nvcode-color-schemes.vim") - require_plugin("nvim-web-devicons") - require_plugin("galaxyline.nvim") - require_plugin("barbar.nvim") - require_plugin('lsp-rooter.nvim') - require_plugin("nvim-ts-context-commentstring") - - use { 'nvim-telescope/telescope-dap.nvim', opt = true } - require_plugin("telescope-dap.nvim") - use { 'theHamsta/nvim-dap-virtual-text', opt = true } - require_plugin("nvim-dap-virtual-text") - - use { "ray-x/lsp_signature.nvim" } - use 'tanvirtin/monokai.nvim' - use 'fratajczak/one-monokai-vim' - use { "npxbr/glow.nvim", run = "GlowInstall" } - - use { "akinsho/toggleterm.nvim", tag = '*', config = function() - require("toggleterm").setup() - end } - - use { - 'phaazon/hop.nvim', - branch = 'v1', -- optional but strongly recommended - config = function() - -- you can configure Hop the way you like here; see :h hop-config - require 'hop'.setup { keys = 'etovxqpdygfblzhckisuran' } - end - } - - -- markdown - -- use { 'godlygeek/tabular' } - -- use { 'preservim/vim-markdown' } - - -- use { - -- 'iamcco/markdown-preview.nvim', - -- run = function() vim.fn['mkdp#util#install']() end, - -- ft = { 'markdown' } - -- } - - use {'tpope/vim-fugitive'} - - --use 'EdenEast/nightfox.nvim' - -- use {'godlygeek/tabular', opt=true} - -- use {'plasticboy/vim-markdown', opt=true} - -- require_plugin("tabular") - -- require_plugin("vim-markdown") - - -- Extras - if O.extras then - use { 'metakirby5/codi.vim', opt = true } - require_plugin('codi.vim') - --use {'iamcco/markdown-preview.nvim', run = 'cd app && npm install', opt = true} - --require_plugin('markdown-preview.nvim') - use { 'numToStr/FTerm.nvim', opt = true } - require_plugin('FTerm.nvim') - use { 'nacro90/numb.nvim', opt = true } - require_plugin('numb.nvim') - use { 'turbio/bracey.vim', run = 'npm install --prefix server', opt = true } - require_plugin('bracey.vim') - - use { 'norcalli/nvim-colorizer.lua', opt = true } - require_plugin('nvim-colorizer.lua') - use { 'nvim-treesitter/playground', opt = true } - require_plugin('playground') - -- folke/todo-comments.nvim - -- gennaro-tedesco/nvim-jqx - -- TimUntersberger/neogit - -- folke/lsp-colors.nvim - -- simrat39/symbols-outline.nvim - use 'simrat39/symbols-outline.nvim' - - -- Git - -- use {'tpope/vim-rhubarb', opt = true} - -- pwntester/octo.nvim - - -- Easily Create Gists - -- use {'mattn/vim-gist', opt = true} - -- use {'mattn/webapi-vim', opt = true} - end - -end) diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua deleted file mode 100644 index 9c919ed..0000000 --- a/nvim/lua/settings.lua +++ /dev/null @@ -1,56 +0,0 @@ -vim.cmd('set iskeyword+=-') -- treat dash separated words as a word text object" -vim.cmd('set shortmess+=c') -- Don't pass messages to |ins-completion-menu|. -vim.cmd('set inccommand=split') -- Make substitution work in realtime -vim.o.hidden = true -- Required to keep multiple buffers open multiple buffers -vim.o.title = true -TERMINAL = vim.fn.expand('$TERMINAL') -vim.cmd('let &titleold="'..TERMINAL..'"') -vim.o.titlestring="%<%F%=%l/%L - nvim" -vim.wo.wrap = true -- Display long lines as just one line -vim.cmd('set whichwrap+=<,>,[,],h,l') -- move to next line with theses keys -vim.cmd('syntax on') -- syntax highlighting -vim.o.pumheight = 10 -- Makes popup menu smaller -vim.o.fileencoding = "utf-8" -- The encoding written to file -vim.o.cmdheight = 2 -- More space for displaying messages -vim.cmd('set colorcolumn=99999') -- fix indentline for now -vim.o.mouse = "a" -- Enable your mouse -vim.o.splitbelow = true -- Horizontal splits will automatically be below -vim.o.termguicolors = true -- set term gui colors most terminals support this -vim.o.splitright = true -- Vertical splits will automatically be to the right --- vim.o.t_Co = "256" -- Support 256 colors -vim.o.conceallevel = 0 -- So that I can see `` in markdown files --- vim.cmd('set ts=4') -- Insert 2 spaces for a tab --- vim.cmd('set sw=4') -- Change the number of space characters inserted for indentation --- vim.cmd('set expandtab') -- Converts tabs to spaces -vim.bo.smartindent = true -- Makes indenting smart -vim.wo.number = true -- set numbered lines -vim.wo.relativenumber = true -- set relative number -vim.wo.cursorline = true -- Enable highlighting of the current line -vim.o.showtabline = 2 -- Always show tabs -vim.o.showmode = false -- We don't need to see things like -- INSERT -- anymore -vim.o.backup = false -- This is recommended by coc -vim.o.writebackup = false -- This is recommended by coc -vim.wo.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shift the text each time -vim.o.updatetime = 300 -- Faster completion -vim.o.timeoutlen = 100 -- By default timeoutlen is 1000 ms -vim.o.clipboard = "unnamedplus" -- Copy paste between vim and everything else -vim.cmd('filetype plugin on') -- filetype detection --- vim.o.guifont = "JetBrainsMono\\ Nerd\\ Font\\ Mono:h18" --- vim.o.guifont = "Hack\\ Nerd\\ Font\\ Mono" --- vim.o.guifont = "SauceCodePro Nerd Font:h17" -vim.o.guifont = "FiraCode Nerd Font:h17" - --- vim.o.guifont = "JetBrains\\ Mono\\ Regular\\ Nerd\\ Font\\ Complete" -vim.g.vim_markdown_folding_disabled = 1 - -vim.g.vimspector_enable_mappings = 'HUMAN' -vim.g['test#go#rspec#options'] = { nearest= '--v', suite= '--v' } - --- git blame -vim.cmd('highlight default link gitblame SpecialComment') -vim.g.gitblame_enabled = 0 - --- last position jump -vim.cmd([[ -autocmd BufReadPost * if line("'\"") >= 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif -]])