From cc6768cf7f6d6789a3947e4099f52534cb3067fd Mon Sep 17 00:00:00 2001 From: Evaldas Date: Fri, 29 Mar 2024 22:53:56 +0200 Subject: [PATCH 1/4] init my setup changes --- init.lua | 30 ++++++++++++++++++++----- lua/custom/plugins/copilot.lua | 3 +++ lua/custom/plugins/lualine.lua | 12 ++++++++++ lua/custom/plugins/typescript-tools.lua | 5 +++++ 4 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 lua/custom/plugins/copilot.lua create mode 100644 lua/custom/plugins/lualine.lua create mode 100644 lua/custom/plugins/typescript-tools.lua diff --git a/init.lua b/init.lua index db55a9e8..a2835d2a 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true -- [[ Setting options ]] -- See `:help vim.opt` @@ -118,6 +118,12 @@ vim.opt.clipboard = 'unnamedplus' -- Enable break indent vim.opt.breakindent = true +-- Tab behaviour +vim.opt.expandtab = false +vim.opt.smartindent = true +vim.opt.tabstop = 4 +vim.opt.shiftwidth = 4 + -- Save undo history vim.opt.undofile = true @@ -551,6 +557,20 @@ require('lazy').setup({ -- tsserver = {}, -- + clangd = {}, + gopls = {}, + pyright = {}, + rust_analyzer = {}, + omnisharp = {}, + html = {}, + htmx = {}, + svelte = {}, + tailwindcss = {}, + cssls = {}, + -- tsserver = {}, + jsonls = {}, + eslint = {}, + lua_ls = { -- cmd = {...}, -- filetypes = { ...}, @@ -827,16 +847,16 @@ require('lazy').setup({ -- Here are some example plugins that I've included in the Kickstart repository. -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- - -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.lint', + require 'kickstart.plugins.debug', + require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.lint', -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins` - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, }, { ui = { -- If you are using a Nerd Font: set icons to an empty table which will use the diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua new file mode 100644 index 00000000..50c2eb88 --- /dev/null +++ b/lua/custom/plugins/copilot.lua @@ -0,0 +1,3 @@ +return { + 'github/copilot.vim', +} \ No newline at end of file diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua new file mode 100644 index 00000000..445d1138 --- /dev/null +++ b/lua/custom/plugins/lualine.lua @@ -0,0 +1,12 @@ +return { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require('lualine').setup { + options = { + icons_enabled = true, + theme = 'auto', + }, + } + end, +} \ No newline at end of file diff --git a/lua/custom/plugins/typescript-tools.lua b/lua/custom/plugins/typescript-tools.lua new file mode 100644 index 00000000..eb021e37 --- /dev/null +++ b/lua/custom/plugins/typescript-tools.lua @@ -0,0 +1,5 @@ +return { + "pmizio/typescript-tools.nvim", + dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, + opts = {}, +} \ No newline at end of file From b45f33027b00369f48b3b164e21e573e50edc1d6 Mon Sep 17 00:00:00 2001 From: Evaldas Date: Sat, 30 Mar 2024 00:05:07 +0200 Subject: [PATCH 2/4] vim-test and vim-tmux-navigator added --- lua/custom/plugins/copilot.lua | 5 +++-- lua/custom/plugins/lualine.lua | 23 ++++++++++++----------- lua/custom/plugins/typescript-tools.lua | 9 +++++---- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua index 50c2eb88..640fd57a 100644 --- a/lua/custom/plugins/copilot.lua +++ b/lua/custom/plugins/copilot.lua @@ -1,3 +1,4 @@ return { - 'github/copilot.vim', -} \ No newline at end of file + 'github/copilot.vim', +} + diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua index 445d1138..d0e7466a 100644 --- a/lua/custom/plugins/lualine.lua +++ b/lua/custom/plugins/lualine.lua @@ -1,12 +1,13 @@ return { - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = function() - require('lualine').setup { - options = { - icons_enabled = true, - theme = 'auto', - }, - } - end, -} \ No newline at end of file + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require('lualine').setup { + options = { + icons_enabled = true, + theme = 'auto', + }, + } + end, +} + diff --git a/lua/custom/plugins/typescript-tools.lua b/lua/custom/plugins/typescript-tools.lua index eb021e37..6248b7d7 100644 --- a/lua/custom/plugins/typescript-tools.lua +++ b/lua/custom/plugins/typescript-tools.lua @@ -1,5 +1,6 @@ return { - "pmizio/typescript-tools.nvim", - dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, - opts = {}, -} \ No newline at end of file + 'pmizio/typescript-tools.nvim', + dependencies = { 'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig' }, + opts = {}, +} + From 3e6ad1de85174372cc1565390e61228f3af3c1f6 Mon Sep 17 00:00:00 2001 From: Evaldas Date: Sat, 30 Mar 2024 00:06:26 +0200 Subject: [PATCH 3/4] vim-test and vim-tmux-navigator added --- lua/custom/plugins/vim-test.lua | 10 ++++++++++ lua/custom/plugins/vim-tmux-navigator.lua | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 lua/custom/plugins/vim-test.lua create mode 100644 lua/custom/plugins/vim-tmux-navigator.lua diff --git a/lua/custom/plugins/vim-test.lua b/lua/custom/plugins/vim-test.lua new file mode 100644 index 00000000..b78fe0a4 --- /dev/null +++ b/lua/custom/plugins/vim-test.lua @@ -0,0 +1,10 @@ +return { + 'vim-test/vim-test', + vim.keymap.set('n', 't', ':TestNearest'), + vim.keymap.set('n', 'T', ':TestFile'), + vim.keymap.set('n', 'a', ':TestSuite'), + vim.keymap.set('n', 'l', ':TestLast'), + vim.keymap.set('n', 'g', ':TestVisit'), + + vim.cmd 'let test#strategy = "neovim_sticky"', +} diff --git a/lua/custom/plugins/vim-tmux-navigator.lua b/lua/custom/plugins/vim-tmux-navigator.lua new file mode 100644 index 00000000..a63ac994 --- /dev/null +++ b/lua/custom/plugins/vim-tmux-navigator.lua @@ -0,0 +1,7 @@ +return { + 'christoomey/vim-tmux-navigator', + vim.keymap.set('n', '', ':TmuxNavigateLeft'), + vim.keymap.set('n', '', ':TmuxNavigateDown'), + vim.keymap.set('n', '', ':TmuxNavigateUp'), + vim.keymap.set('n', '', ':TmuxNavigateRight'), +} From 1dd5961c8be2446a49646fa39050641a7a5776c4 Mon Sep 17 00:00:00 2001 From: Evaldas Date: Tue, 9 Apr 2024 13:36:50 +0300 Subject: [PATCH 4/4] ts-error-translator --- lua/custom/plugins/ts-error-translator.lua | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 lua/custom/plugins/ts-error-translator.lua diff --git a/lua/custom/plugins/ts-error-translator.lua b/lua/custom/plugins/ts-error-translator.lua new file mode 100644 index 00000000..3673729d --- /dev/null +++ b/lua/custom/plugins/ts-error-translator.lua @@ -0,0 +1,3 @@ +return { + 'dmmulroy/ts-error-translator.nvim', +}