From 856a5e866bc5a2678709cf401402078113b94dde Mon Sep 17 00:00:00 2001 From: jannawro Date: Mon, 9 Oct 2023 19:52:40 +0200 Subject: [PATCH] v2 --- init.lua | 24 +++++++++--------------- lazy-lock.json | 10 +++++----- lua/custom/plugins/indent.lua | 3 +++ 3 files changed, 17 insertions(+), 20 deletions(-) create mode 100644 lua/custom/plugins/indent.lua diff --git a/init.lua b/init.lua index be462edb..e00397db 100644 --- a/init.lua +++ b/init.lua @@ -43,12 +43,6 @@ P.S. You can delete this when you're done too. It's your config now :) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' --- set tabs -vim.opt.tabstop = 4 -vim.opt.shiftwidth = 4 -vim.opt.expandtab = true -vim.bo.softtabstop = 4 - -- Install package manager -- https://github.com/folke/lazy.nvim -- `:help lazy.nvim.txt` for more info @@ -179,15 +173,6 @@ require('lazy').setup({ }, }, - { - -- Add indentation guides even on blank lines - 'lukas-reineke/indent-blankline.nvim', - -- Enable `lukas-reineke/indent-blankline.nvim` - -- See `:help indent_blankline.txt` - main = 'ibl', - opts = {}, - }, - -- "gc" to comment visual regions/lines { 'numToStr/Comment.nvim', opts = {} }, @@ -277,6 +262,15 @@ vim.o.completeopt = 'menuone,noselect' -- NOTE: You should make sure your terminal supports this vim.o.termguicolors = true +-- Set tabs +vim.opt.tabstop = 4 +vim.opt.shiftwidth = 4 +vim.opt.expandtab = true +vim.bo.softtabstop = 4 + +-- Override filetypes +vim.cmd('autocmd BufNewFile,BufRead Jenkinsfile set filetype=groovy') + -- [[ Basic Keymaps ]] -- Keymaps for better default experience diff --git a/lazy-lock.json b/lazy-lock.json index 2e3e1a25..7727798a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -6,20 +6,20 @@ "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, "gitsigns.nvim": { "branch": "main", "commit": "ff01d34daaed72f271a8ffa088a7e839a60c640f" }, - "indent-blankline.nvim": { "branch": "master", "commit": "877c1db2bf957300097dd5348a665666a4d900cb" }, - "lazy.nvim": { "branch": "main", "commit": "9d92e65fd17d35f97bed43dc92810576a57376fc" }, + "indentLine": { "branch": "master", "commit": "b96a75985736da969ac38b72a7716a8c57bdde98" }, + "lazy.nvim": { "branch": "main", "commit": "f0cfbf995238a42064e119bd1daa694fd1683ea3" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "e2705063f395b44f676cd26596a11007a2cbd3bd" }, "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" }, "neo-tree.nvim": { "branch": "main", "commit": "6f8c49956c89e9fefae6acdfe1d57c6293b0a03d" }, "neodev.nvim": { "branch": "main", "commit": "f8592cc143a5512b98a2c3683aa43c73f98e34f7" }, - "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" }, + "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, "nvim-autopairs": { "branch": "master", "commit": "748e72c05495a3d30e88a6ef04b21697019a9aa9" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-lspconfig": { "branch": "master", "commit": "2b361e043810d5587d9af0787f8ce40da92ec5e9" }, - "nvim-treesitter": { "branch": "master", "commit": "a102053352bd958d84a3e1be3de0203d2af92984" }, + "nvim-treesitter": { "branch": "master", "commit": "51372f1d4e728539c6243e96c6b657f633e81e29" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "76c7a89b41de77a4f83fb77fa072c5ad7605fe3b" }, - "nvim-web-devicons": { "branch": "master", "commit": "56b3a6ce6d69329cbf603dd38ac59fb4d7774b01" }, + "nvim-web-devicons": { "branch": "master", "commit": "a1e6268779411048a87f767a27380089362a0ce2" }, "onedark.nvim": { "branch": "master", "commit": "826fb77e9ca92d3c0f3d937328663d4a6dc7fee1" }, "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, diff --git a/lua/custom/plugins/indent.lua b/lua/custom/plugins/indent.lua new file mode 100644 index 00000000..53d6eef9 --- /dev/null +++ b/lua/custom/plugins/indent.lua @@ -0,0 +1,3 @@ +return { + 'Yggdroot/indentLine' +}