diff options
Diffstat (limited to '.config/nvim/lua')
| -rw-r--r-- | .config/nvim/lua/keymap.lua | 37 | ||||
| -rw-r--r-- | .config/nvim/lua/plug.lua | 66 | ||||
| -rw-r--r-- | .config/nvim/lua/settings.lua | 10 |
3 files changed, 77 insertions, 36 deletions
diff --git a/.config/nvim/lua/keymap.lua b/.config/nvim/lua/keymap.lua index ccab671..5b709cb 100644 --- a/.config/nvim/lua/keymap.lua +++ b/.config/nvim/lua/keymap.lua @@ -12,18 +12,9 @@ vim.api.nvim_set_keymap("n", "<leader>ec", ":e $MYVIMRC<CR>", {noremap = true}) vim.api.nvim_set_keymap("n", "<leader>tn", ":tabnew<CR>", {noremap = true}) vim.api.nvim_set_keymap("n", "<leader>tc", ":tabclose<CR>", {noremap = true}) vim.api.nvim_set_keymap("n", "<leader>tt", ":tabnew<CR>:term<CR>a", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>Tn", ":tnext<CR>", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>Tp", ":tprevious<CR>", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>Tf", ":tfirst<CR>", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>Tl", ":tlast<CR>", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>tselect", ":tselect<Space>", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>Tc", ":!ctags -R --sort=yes --c++-kins=+p --filed=+iaS --extras=+q . <CR><CR>", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>f", ":Lexplore<CR>", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>F", ":Lexplore %:p:h<CR>", {noremap = true}) - -vim.api.nvim_set_keymap("n", "<leader>zt", ":VZKFindTag<CR>", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>zh", ":VZKHistory<CR>", {noremap = true}) +vim.api.nvim_set_keymap("n", "<leader>f", ":NvimTreeToggle<CR>", {noremap = true}) +vim.api.nvim_set_keymap("n", "<leader>F", ":NvimTreeFindFileToggle<CR>", {noremap = true}) vim.api.nvim_set_keymap("i", "(", "()<Esc>i", {noremap = true}) vim.api.nvim_set_keymap("i", ")", "<ESC>:call brackify#putbracket(')')<CR>la", {noremap = true}) @@ -31,25 +22,27 @@ vim.api.nvim_set_keymap("i", "[", "[]<Esc>i", {noremap = true}) vim.api.nvim_set_keymap("i", "]", "<ESC>:call brackify#putbracket(']')<CR>la", {noremap = true}) vim.api.nvim_set_keymap("i", "{", "{}<Esc>i", {noremap = true}) vim.api.nvim_set_keymap("i", "}", "<ESC>:call brackify#putbracket('}')<CR>la", {noremap = true}) +vim.api.nvim_set_keymap("i", '"', "<ESC>:call brackify#putquotes('\"')<CR>a", {noremap = true}) +vim.api.nvim_set_keymap("i", "'", "<ESC>:call brackify#putquotes(\"'\")<CR>a", {noremap = true}) vim.cmd('autocmd Filetype html inoremap <buffer> < <><ESC>i') vim.cmd('autocmd Filetype html inoremap <buffer> > <ESC>:call brackify#putbracket(">")<CR>la') +vim.cmd('autocmd FileType tex inoremap <buffer> " "') +vim.cmd('autocmd FileType tex inoremap <buffer> \' \'') -vim.api.nvim_set_keymap("i", '"', "<ESC>:call brackify#putquotes('\"')<CR>a", {noremap = true}) -vim.api.nvim_set_keymap("i", "'", "<ESC>:call brackify#putquotes(\"'\")<CR>a", {noremap = true}) vim.api.nvim_set_keymap("v", "(", "s(<ESC>pa)", {noremap = true}) vim.api.nvim_set_keymap("v", "[", "s[<ESC>pa]", {noremap = true}) vim.api.nvim_set_keymap("v", "{", "s{<ESC>pa}", {noremap = true}) vim.api.nvim_set_keymap("v", '"', 's"<ESC>pa"', {noremap = true}) vim.api.nvim_set_keymap("v", "'", "s'<ESC>pa'", {noremap = true}) -vim.cmd('autocmd Filetype c nnoremap <buffer> <tab> :CSelNextArg<Cr>') -vim.cmd('autocmd Filetype rust nnoremap <buffer> <leader>r :!cargo run<Cr>') -vim.cmd('autocmd Filetype rust nnoremap <buffer> <leader>R :!cargo run --release<Cr>') -vim.api.nvim_set_keymap("n", "<leader>dB", ":GdbBreakpointToggle", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>dn", ":GdbNext", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>ds", ":GdbStep", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>dr", ":GdbRun", {noremap = true}) -vim.api.nvim_set_keymap("n", "<leader>dc", ":GdbContinue", {noremap = true}) +vim.api.nvim_set_keymap("i", "<C-u>a", "ä", {noremap = true}) +vim.api.nvim_set_keymap("i", "<C-u>A", "Ä", {noremap = true}) +vim.api.nvim_set_keymap("i", "<C-u>o", "ö", {noremap = true}) +vim.api.nvim_set_keymap("i", "<C-u>O", "Ö", {noremap = true}) +vim.api.nvim_set_keymap("i", "<C-u>u", "ü", {noremap = true}) +vim.api.nvim_set_keymap("i", "<C-u>U", "Ü", {noremap = true}) -vim.cmd("autocmd TextChangedI * lua vim.lsp.omnifunc(1)") +vim.api.nvim_set_keymap("n", "<space>T", ":lua require('cargotest').test_crate()<cr>", {noremap = true}) +vim.api.nvim_set_keymap("n", "<space>t", ":lua require('cargotest').test_module()<cr>", {noremap = true}) +vim.api.nvim_set_keymap("n", "<leader>z", "va{zfzz", {noremap = true}) diff --git a/.config/nvim/lua/plug.lua b/.config/nvim/lua/plug.lua index 904b496..1a78aa8 100644 --- a/.config/nvim/lua/plug.lua +++ b/.config/nvim/lua/plug.lua @@ -4,16 +4,60 @@ -- ┃ ╹ ╹┗━┛ ┗┛ ╹╹ ╹ ╹ ┗━╸┗━┛┗━┛╹╹ ╹┗━┛ ┃ -- ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ -local Plug = vim.fn['plug#'] - - -vim.call('plug#begin', '~/.local/share/nvim/plugged') - -Plug 'neovim/nvim-lspconfig' -Plug 'nvim-treesitter/nvim-treesitter' -Plug('neoclide/coc.nvim', {branch = 'release'}) -Plug("theRealCarneiro/hyprland-vim-syntax", { ft = "hypr" }) - -vim.call('plug#end') +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) +require("lazy").setup({ + { "nvim-treesitter/nvim-treesitter" }, + { "neovim/nvim-lspconfig" }, + { "L3MON4D3/LuaSnip" }, + { "rafamadriz/friendly-snippets" }, + { "saadparwaiz1/cmp_luasnip" }, + { "hrsh7th/cmp-nvim-lua" }, + { "hrsh7th/cmp-nvim-lsp" }, + { "hrsh7th/cmp-path" }, + { + 'hrsh7th/nvim-cmp', + event = "InsertEnter", + dependencies = { + { + -- snippet plugin + "L3MON4D3/LuaSnip", + dependencies = "rafamadriz/friendly-snippets", + opts = { history = true, updateevents = "TextChanged,TextChangedI" }, + config = function(_, opts) + require("luasnip").config.set_config(opts) + end, + }, + }, + { + "saadparwaiz1/cmp_luasnip", + "hrsh7th/cmp-nvim-lua", + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-path", + }, + }, + { 'cargotest.nvim', url = 'https://git.nathanreiner.xyz/cargotest.nvim' }, + { + "nvim-tree/nvim-tree.lua", + version = "*", + lazy = false, + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + config = function() + require("nvim-tree").setup {} + end, + }, +}) diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index 02cc457..ca2b1e8 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -26,7 +26,9 @@ vim.opt.showcmd = true vim.opt.wildmenu = true vim.opt.hlsearch = true vim.opt.conceallevel = 2 -vim.opt.colorcolumn = "80" +vim.opt.colorcolumn = "120" +vim.opt.foldmethod = "manual" +vim.opt.cursorline = true vim.cmd('filetype indent on') vim.opt.completeopt = { "menuone", "menu", "longest", "preview", "noinsert", "noselect" } @@ -40,8 +42,6 @@ vim.g.netrw_keepdir = true vim.g.netrw_winsize = 30 vim.cmd('autocmd Filetype netrw setlocal nolist') -vim.g.airline_powerline_fonts = true - vim.cmd("call statusbar#refresh()") local status_ok, configs = pcall(require, "nvim-treesitter.configs") @@ -63,3 +63,7 @@ configs.setup({ enable = true, }, }) + +vim.filetype.add({ + pattern = { [".*/hypr/.*%.conf"] = "hyprlang" }, +}) |