diff --git a/lazy-lock.json b/lazy-lock.json index 9ef57f5..60c6ce4 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,11 +10,15 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "61cff430c9f15770d0c5e68c1b08067223bd94ab" }, "dashboard-nvim": { "branch": "master", "commit": "413442b12d85315fc626c44a0ce4929b213ef604" }, + "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" }, + "dropbar.nvim": { "branch": "master", "commit": "da63ca9b24f18b814ac75881b1e36199a7676047" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" }, + "fzf-lua": { "branch": "main", "commit": "91ec17b4fd0d810599f054eef08db967a0457fbf" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" }, + "highlight-undo.nvim": { "branch": "main", "commit": "50a6884a8476be04ecce8f1c4ed692c5000ef0a1" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, @@ -30,6 +34,9 @@ "neo-tree.nvim": { "branch": "v3.x", "commit": "f3941c57ec85d7bdb44fa53fd858fd80f159018f" }, "neoconf.nvim": { "branch": "main", "commit": "4ef6c6c5882e7e16209173fb8c47414202843384" }, "neodev.nvim": { "branch": "main", "commit": "de3685b8c1cd439dd96b7958793f6f381f98652d" }, + "neogit": { "branch": "master", "commit": "1c0369a39587054ff473179c1c04e793fb3d6378" }, + "neovim-project": { "branch": "main", "commit": "e7868b38f402be94e859d479002df1418bc1e954" }, + "neovim-session-manager": { "branch": "master", "commit": "07bb62583769abd9d32f88f428ea58248730ac7a" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, @@ -45,9 +52,14 @@ "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "pretty_hover": { "branch": "master", "commit": "392f6f71c6526955fcf510d48930bce7864b6915" }, + "runner.nvim": { "branch": "main", "commit": "237f7b72c10c34f60c55022d2d79a5f8e5a531a5" }, + "sniprun": { "branch": "master", "commit": "0079f9c4675a6825f84e108bbff866f67dd8762f" }, + "substitute.nvim": { "branch": "main", "commit": "17ffaeb5a1dc2dbef39cf0865d8a4b6000836714" }, "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, + "telekasten.nvim": { "branch": "main", "commit": "8c2b3889eb31009ae510a43384d1957b37654176" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope.nvim": { "branch": "master", "commit": "b744cf59752aaa01561afb4223006de26f3836fd" }, + "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, diff --git a/lua/config/options.lua b/lua/config/options.lua index 3ea1454..497ab28 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -1,3 +1,4 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here +vim.opt.wrap = true diff --git a/lua/plugins/dev-container.lua b/lua/plugins/dev-container.lua new file mode 100644 index 0000000..f351605 --- /dev/null +++ b/lua/plugins/dev-container.lua @@ -0,0 +1,4 @@ +return { + "https://codeberg.org/esensar/nvim-dev-container", + dependencies = "nvim-treesitter/nvim-treesitter", +} diff --git a/lua/plugins/dropbar.lua b/lua/plugins/dropbar.lua new file mode 100644 index 0000000..1ec20b8 --- /dev/null +++ b/lua/plugins/dropbar.lua @@ -0,0 +1,7 @@ +return { + "Bekaboo/dropbar.nvim", + -- optional, but required for fuzzy finder support + dependencies = { + "nvim-telescope/telescope-fzf-native.nvim", + }, +} diff --git a/lua/plugins/highlight-undo.lua b/lua/plugins/highlight-undo.lua new file mode 100644 index 0000000..4703f6b --- /dev/null +++ b/lua/plugins/highlight-undo.lua @@ -0,0 +1,8 @@ +return { + { + "tzachar/highlight-undo.nvim", + opts = { + ..., + }, + }, +} diff --git a/lua/plugins/neodev.lua b/lua/plugins/neodev.lua new file mode 100644 index 0000000..f022961 --- /dev/null +++ b/lua/plugins/neodev.lua @@ -0,0 +1,3 @@ +return { + { "folke/neodev.nvim", opts = {} }, +} diff --git a/lua/plugins/neogit.lua b/lua/plugins/neogit.lua new file mode 100644 index 0000000..823573b --- /dev/null +++ b/lua/plugins/neogit.lua @@ -0,0 +1,14 @@ +return { + { + "NeogitOrg/neogit", + dependencies = { + "nvim-lua/plenary.nvim", -- required + "sindrets/diffview.nvim", -- optional - Diff integration + + -- Only one of these is needed, not both. + "nvim-telescope/telescope.nvim", -- optional + "ibhagwan/fzf-lua", -- optional + }, + config = true, + }, +} diff --git a/lua/plugins/pretty-hover.lua b/lua/plugins/pretty-hover.lua new file mode 100644 index 0000000..46e80f4 --- /dev/null +++ b/lua/plugins/pretty-hover.lua @@ -0,0 +1,7 @@ +return { + { + "Fildo7525/pretty_hover", + event = "LspAttach", + opts = {}, + }, +} diff --git a/lua/plugins/projects.lua b/lua/plugins/projects.lua new file mode 100644 index 0000000..c38ab47 --- /dev/null +++ b/lua/plugins/projects.lua @@ -0,0 +1,20 @@ +return { + "coffebar/neovim-project", + opts = { + projects = { -- define project roots + "~/projects/*", + "~/.config/*", + }, + }, + init = function() + -- enable saving the state of plugins in the session + vim.opt.sessionoptions:append("globals") -- save global variables that start with an uppercase letter and contain at least one lowercase letter. + end, + dependencies = { + { "nvim-lua/plenary.nvim" }, + { "nvim-telescope/telescope.nvim", tag = "0.1.4" }, + { "Shatur/neovim-session-manager" }, + }, + lazy = false, + priority = 100, +} diff --git a/lua/plugins/runner.lua b/lua/plugins/runner.lua new file mode 100644 index 0000000..e6cc754 --- /dev/null +++ b/lua/plugins/runner.lua @@ -0,0 +1,10 @@ +return { + "MarcHamamji/runner.nvim", + dependencies = { + "nvim-telescope/telescope.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + }, + config = function() + require("runner").setup() + end, +} diff --git a/lua/plugins/sniprun.lua b/lua/plugins/sniprun.lua new file mode 100644 index 0000000..b1451cf --- /dev/null +++ b/lua/plugins/sniprun.lua @@ -0,0 +1,14 @@ +return { + "michaelb/sniprun", + branch = "master", + + build = "sh install.sh", + -- do 'sh install.sh 1' if you want to force compile locally + -- (instead of fetching a binary from the github release). Requires Rust >= 1.65 + + config = function() + require("sniprun").setup({ + -- your options + }) + end, +} diff --git a/lua/plugins/substitute.lua b/lua/plugins/substitute.lua new file mode 100644 index 0000000..2ca914c --- /dev/null +++ b/lua/plugins/substitute.lua @@ -0,0 +1,8 @@ +return { + "gbprod/substitute.nvim", + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + }, +} diff --git a/lua/plugins/telekasten.lua b/lua/plugins/telekasten.lua new file mode 100644 index 0000000..e510a1c --- /dev/null +++ b/lua/plugins/telekasten.lua @@ -0,0 +1,6 @@ +return { + { + "renerocksai/telekasten.nvim", + dependencies = { "nvim-telescope/telescope.nvim" }, + }, +} diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua new file mode 100644 index 0000000..7263829 --- /dev/null +++ b/lua/plugins/toggleterm.lua @@ -0,0 +1,7 @@ +return { + -- amongst your other plugins + {'akinsho/toggleterm.nvim', version = "*", config = true} + -- or + {'akinsho/toggleterm.nvim', version = "*", opts = {--[[ things you want to change go here]]}} +} + diff --git a/stylua.toml b/stylua.toml index 5d6c50d..421c3d9 100644 --- a/stylua.toml +++ b/stylua.toml @@ -1,3 +1,3 @@ indent_type = "Spaces" indent_width = 2 -column_width = 120 \ No newline at end of file +column_width = 80