From a723a0482d3d379b945e98a0e633b28fcf722497 Mon Sep 17 00:00:00 2001 From: Tilo Klarenbeek Date: Mon, 27 Mar 2023 02:55:45 +0200 Subject: [PATCH] More stuff --- init.lua | 39 +++++++++++++++++---------- lua/custom/plugins/vim-javascript.lua | 1 + lua/custom/plugins/vim-svelte.lua | 1 + 3 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 lua/custom/plugins/vim-javascript.lua create mode 100644 lua/custom/plugins/vim-svelte.lua diff --git a/init.lua b/init.lua index 4ed8ecd..742bedf 100644 --- a/init.lua +++ b/init.lua @@ -37,7 +37,8 @@ require('lazy').setup({ -- NOTE: This is where your plugins related to LSP can be installed. -- The configuration is done below. Search for lspconfig to find it below. - { -- LSP Configuration & Plugins + { + -- LSP Configuration & Plugins 'neovim/nvim-lspconfig', dependencies = { -- Automatically install LSPs to stdpath for neovim @@ -53,14 +54,16 @@ require('lazy').setup({ }, }, - { -- Autocompletion + { + -- Autocompletion 'hrsh7th/nvim-cmp', dependencies = { 'hrsh7th/cmp-nvim-lsp', 'L3MON4D3/LuaSnip', 'saadparwaiz1/cmp_luasnip' }, }, -- Useful plugin to show you pending keybinds. - { 'folke/which-key.nvim', opts = {} }, - { -- Adds git releated signs to the gutter, as well as utilities for managing changes + { 'folke/which-key.nvim', opts = {} }, + { + -- Adds git releated signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', opts = { -- See `:help gitsigns.txt` @@ -82,7 +85,8 @@ require('lazy').setup({ end, }, - { -- Set lualine as statusline + { + -- Set lualine as statusline 'nvim-lualine/lualine.nvim', -- See `:help lualine.txt` opts = { @@ -95,7 +99,8 @@ require('lazy').setup({ }, }, - { -- Add indentation guides even on blank lines + { + -- Add indentation guides even on blank lines 'lukas-reineke/indent-blankline.nvim', -- Enable `lukas-reineke/indent-blankline.nvim` -- See `:help indent_blankline.txt` @@ -106,7 +111,7 @@ require('lazy').setup({ }, -- "gc" to comment visual regions/lines - { 'numToStr/Comment.nvim', opts = {} }, + { 'numToStr/Comment.nvim', opts = {} }, -- Fuzzy Finder (files, lsp, etc) { 'nvim-telescope/telescope.nvim', version = '*', dependencies = { 'nvim-lua/plenary.nvim' } }, @@ -124,7 +129,8 @@ require('lazy').setup({ end, }, - { -- Highlight, edit, and navigate code + { + -- Highlight, edit, and navigate code 'nvim-treesitter/nvim-treesitter', dependencies = { 'nvim-treesitter/nvim-treesitter-textobjects', @@ -458,13 +464,13 @@ cmp.setup { -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et -- Own Stuff -vim.api.nvim_set_keymap('n', '', ':wincmd k', {silent = true}) -vim.api.nvim_set_keymap('n', '', ':wincmd j', {silent = true}) -vim.api.nvim_set_keymap('n', '', ':wincmd h', {silent = true}) -vim.api.nvim_set_keymap('n', '', ':wincmd l', {silent = true}) +vim.api.nvim_set_keymap('n', '', ':wincmd k', { silent = true }) +vim.api.nvim_set_keymap('n', '', ':wincmd j', { silent = true }) +vim.api.nvim_set_keymap('n', '', ':wincmd h', { silent = true }) +vim.api.nvim_set_keymap('n', '', ':wincmd l', { silent = true }) -vim.api.nvim_set_keymap('n', 'sn', 'lua require("impulse").menu_search()', {noremap = true}) +vim.api.nvim_set_keymap('n', 'sn', 'lua require("impulse").menu_search()', { noremap = true }) vim.api.nvim_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', { noremap = true, silent = true }) @@ -476,4 +482,9 @@ vim.cmd([[ augroup END ]]) -vim.api.nvim_buf_set_keymap(vim.fn.bufnr(), 'n', 'rs', 'lua vim.lsp.buf.rename()', { noremap = true, silent = true }) +vim.api.nvim_buf_set_keymap(vim.fn.bufnr(), 'n', 'rs', 'lua vim.lsp.buf.rename()', + { noremap = true, silent = true }) + + +vim.g.rustfmt_autosave = 1 +vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]] diff --git a/lua/custom/plugins/vim-javascript.lua b/lua/custom/plugins/vim-javascript.lua new file mode 100644 index 0000000..c528212 --- /dev/null +++ b/lua/custom/plugins/vim-javascript.lua @@ -0,0 +1 @@ +return {"pangloss/vim-javascript"} diff --git a/lua/custom/plugins/vim-svelte.lua b/lua/custom/plugins/vim-svelte.lua new file mode 100644 index 0000000..d2110ef --- /dev/null +++ b/lua/custom/plugins/vim-svelte.lua @@ -0,0 +1 @@ +return {"evanleck/vim-svelte"}