From f019d65aced8c95222e0c7097b23e2f2203c50e4 Mon Sep 17 00:00:00 2001 From: Raoul Branten Date: Tue, 13 May 2025 21:37:22 +0200 Subject: [PATCH] Formatting --- init.lua | 2 +- lazy-lock.json | 3 ++- lua/config/plugin/init.lua | 5 +++-- lua/plugins/init.lua | 38 +++++++++++++++++++++++++++++++------- 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/init.lua b/init.lua index cd7f6b0..0928b3e 100644 --- a/init.lua +++ b/init.lua @@ -1,9 +1,9 @@ vim.opt.termguicolors = true +require("config.functions") require("config.keymaps") require("config.lazy") require("config.options") -require("config.functions") --require("core.plugins") require("config.aliases") require("config.plugin") diff --git a/lazy-lock.json b/lazy-lock.json index 6f82fba..ccdf39e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,12 +2,13 @@ "SyntaxAttr.vim": { "branch": "master", "commit": "8debed49d8df762fd89f540996d9e9a5016ec0a3" }, "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" }, "deadcolumn.nvim": { "branch": "master", "commit": "8f5f8610fda22ff7a3937bc72d0e7d41faaceeaa" }, + "gruvbox": { "branch": "master", "commit": "697c00291db857ca0af00ec154e5bd514a79191f" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, "marks.nvim": { "branch": "master", "commit": "bb25ae3f65f504379e3d08c8a02560b76eaf91e8" }, "neo-tree.nvim": { "branch": "main", "commit": "56f383aa157f1ff20a59154907cc5f9fe26e4db9" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-tree.lua": { "branch": "master", "commit": "e7d1b7dadc62fe2eccc17d814354b0a5688621ce" }, + "nvim-tree.lua": { "branch": "master", "commit": "be5b788f2dc1522c73fb7afad9092331c8aebe80" }, "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, diff --git a/lua/config/plugin/init.lua b/lua/config/plugin/init.lua index 2c6c880..668e2c8 100644 --- a/lua/config/plugin/init.lua +++ b/lua/config/plugin/init.lua @@ -1,4 +1,3 @@ ---require("config.plugin.gruvbox") require("config.plugin.catppuccin") require("config.plugin.lualine") require("config.plugin.nvim-tree") @@ -12,6 +11,8 @@ require("config.plugin.colorizer") require("config.plugin.synattr") require("config.plugin.rainbow-delimiters") require("config.plugin.marks") +require("config.plugin.vim-indentwise") + +--require("config.plugin.gruvbox") --require("config.plugin.lsp_config") --require("config.plugin.indent-blankline") -require("config.plugin.vim-indentwise") diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 012722b..60d6f6c 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -1,17 +1,31 @@ return { + --# plenary, handles multitasking and program effeciency "nvim-lua/plenary.nvim", + --# telescope, open a windows to fuzzy find in for files or strings in files { 'nvim-telescope/telescope.nvim', tag = '0.1.8', dependencies = { 'nvim-lua/plenary.nvim' } }, + --# treesitter, uses language parsers for highlighting 'nvim-treesitter/nvim-treesitter', + --# lualine, creates nice looking status bar 'nvim-lualine/lualine.nvim', + --# web-devicons, generates icons for nerd font { "nvim-tree/nvim-web-devicons", opts = {} }, - "nvim-tree/nvim-web-devicons", + --# nvim-tree, a filebrowser + { + "nvim-tree/nvim-tree.lua", + version = "*", + lazy = false, + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + }, + --# neo-tree, a filebrowser { "nvim-neo-tree/neo-tree.nvim", keys = { @@ -19,24 +33,34 @@ return { }, opts = {}, }, - 'nvim-tree/nvim-tree.lua', - --'morhetz/gruvbox', + --# gruvbox, a style + 'morhetz/gruvbox', + --# catppuccin, a style { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, + --# fugitive, a git wrapper 'tpope/vim-fugitive', + --# tagbar, opens a view to see properties and methods of file 'majutsushi/tagbar', + --# gitgutter, shows git info in gutter 'airblade/vim-gitgutter', + --# deadcolumn, shows line limit when coming close 'Bekaboo/deadcolumn.nvim', - --"williamboman/mason.nvim", - --"williamboman/mason-lspconfig.nvim", - --"neovim/nvim-lspconfig", + --# colorizer, show hex and other colors e.g: #ADADBF 'norcalli/nvim-colorizer.lua', + --# SyntaxAttr, display syntax highlighting 'vim-scripts/SyntaxAttr.vim', + --# rainbow-delimiters, colors braces etc 'HiPhish/rainbow-delimiters.nvim', + --# marks, shows where marks are placed in gutter 'chentoast/marks.nvim', - --"lukas-reineke/indent-blankline.nvim", + --# indentwise, helps with indentation formatting "jeetsukumaran/vim-indentwise", } +--"lukas-reineke/indent-blankline.nvim", +--"williamboman/mason.nvim", +--"williamboman/mason-lspconfig.nvim", +--"neovim/nvim-lspconfig",