From 31c56297f6c284298c867329b941b0630da6c95c Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Thu, 28 Nov 2024 06:48:26 +0100 Subject: Import NeoVim configuration --- nvim/dot-config/nvim/init.lua | 28 ++++++++++++++++++++++ nvim/dot-config/nvim/lazy-lock.json | 13 ++++++++++ nvim/dot-config/nvim/lua/plugins/catppuccin.lua | 9 +++++++ nvim/dot-config/nvim/lua/plugins/lualine.lua | 11 +++++++++ nvim/dot-config/nvim/lua/plugins/neo-tree.lua | 13 ++++++++++ .../dot-config/nvim/lua/plugins/nvim-lspconfig.lua | 3 +++ nvim/dot-config/nvim/lua/plugins/telescope.lua | 10 ++++++++ nvim/dot-config/nvim/lua/plugins/treesitter.lua | 12 ++++++++++ nvim/dot-config/nvim/lua/plugins/vim-glsl.lua | 3 +++ 9 files changed, 102 insertions(+) create mode 100644 nvim/dot-config/nvim/init.lua create mode 100644 nvim/dot-config/nvim/lazy-lock.json create mode 100644 nvim/dot-config/nvim/lua/plugins/catppuccin.lua create mode 100644 nvim/dot-config/nvim/lua/plugins/lualine.lua create mode 100644 nvim/dot-config/nvim/lua/plugins/neo-tree.lua create mode 100644 nvim/dot-config/nvim/lua/plugins/nvim-lspconfig.lua create mode 100644 nvim/dot-config/nvim/lua/plugins/telescope.lua create mode 100644 nvim/dot-config/nvim/lua/plugins/treesitter.lua create mode 100644 nvim/dot-config/nvim/lua/plugins/vim-glsl.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua new file mode 100644 index 0000000..ac27001 --- /dev/null +++ b/nvim/dot-config/nvim/init.lua @@ -0,0 +1,28 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +vim.opt.expandtab = true +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.shiftwidth = 2 +vim.opt.relativenumber = true +vim.opt.number = true + +vim.g.mapleader = " " + +vim.keymap.set("n", "", "w") + +require("lazy").setup("plugins") + +require("lspconfig").pyright.setup({}) +require("lspconfig").ruby_lsp.setup({}) diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json new file mode 100644 index 0000000..9bac8bf --- /dev/null +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -0,0 +1,13 @@ +{ + "catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" }, + "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, + "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, + "nvim-lspconfig": { "branch": "master", "commit": "830ec3893eeb2b21d182864b56931ca6d23d3e29" }, + "nvim-treesitter": { "branch": "master", "commit": "efb2e9c607cab1e4f7171493b7c6f63bd39073fc" }, + "nvim-web-devicons": { "branch": "master", "commit": "f09be61d05bebcba85bb47be1931322d51b95644" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "vim-glsl": { "branch": "master", "commit": "40dd0b143ef93f3930a8a409f60c1bb85e28b727" } +} diff --git a/nvim/dot-config/nvim/lua/plugins/catppuccin.lua b/nvim/dot-config/nvim/lua/plugins/catppuccin.lua new file mode 100644 index 0000000..504fa2f --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/catppuccin.lua @@ -0,0 +1,9 @@ +return { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + config = function() + require("catppuccin").setup() + vim.cmd.colorscheme "catppuccin" + end +} diff --git a/nvim/dot-config/nvim/lua/plugins/lualine.lua b/nvim/dot-config/nvim/lua/plugins/lualine.lua new file mode 100644 index 0000000..55693b9 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/lualine.lua @@ -0,0 +1,11 @@ +return { + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + require("lualine").setup({ + options = { + theme = "catppuccin" + } + }) + end +} diff --git a/nvim/dot-config/nvim/lua/plugins/neo-tree.lua b/nvim/dot-config/nvim/lua/plugins/neo-tree.lua new file mode 100644 index 0000000..4772f45 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/neo-tree.lua @@ -0,0 +1,13 @@ +return { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim" + }, + config = function() + vim.keymap.set("n", "df", ":Neotree toggle right") + end +} + diff --git a/nvim/dot-config/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/dot-config/nvim/lua/plugins/nvim-lspconfig.lua new file mode 100644 index 0000000..3657f57 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/nvim-lspconfig.lua @@ -0,0 +1,3 @@ +return { + "neovim/nvim-lspconfig" +} diff --git a/nvim/dot-config/nvim/lua/plugins/telescope.lua b/nvim/dot-config/nvim/lua/plugins/telescope.lua new file mode 100644 index 0000000..d25f8d3 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/telescope.lua @@ -0,0 +1,10 @@ +return { + "nvim-telescope/telescope.nvim", + tag = "0.1.8", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local builtin = require("telescope.builtin") + vim.keymap.set("n", "ff", builtin.find_files, {}) + vim.keymap.set("n", "fg", builtin.live_grep, {}) -- requires ripgrep + end +} diff --git a/nvim/dot-config/nvim/lua/plugins/treesitter.lua b/nvim/dot-config/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..e88fb1e --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,12 @@ +return { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + local configs = require("nvim-treesitter.configs") + configs.setup({ + ensure_installed = {"lua", "c", "cpp", "python", "ruby", "java", "haskell"}, + highlight = { enable = true }, + indent = { enable = true }, + }) + end +} diff --git a/nvim/dot-config/nvim/lua/plugins/vim-glsl.lua b/nvim/dot-config/nvim/lua/plugins/vim-glsl.lua new file mode 100644 index 0000000..ede8a34 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/vim-glsl.lua @@ -0,0 +1,3 @@ +return { + "tikhomirov/vim-glsl" +} -- cgit v1.2.3 From 745f4ec7e21f873fcf99756626c64dc93a0508a7 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Thu, 28 Nov 2024 14:41:15 +0100 Subject: Add Git plugins for NeoVim --- nvim/dot-config/nvim/lazy-lock.json | 13 ++++++++----- nvim/dot-config/nvim/lua/plugins/neogit.lua | 8 ++++++++ nvim/dot-config/nvim/lua/plugins/vim-gitgutter.lua | 3 +++ 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 nvim/dot-config/nvim/lua/plugins/neogit.lua create mode 100644 nvim/dot-config/nvim/lua/plugins/vim-gitgutter.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index 9bac8bf..f17d045 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -1,13 +1,16 @@ { - "catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" }, - "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, + "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, + "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, + "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, + "neogit": { "branch": "master", "commit": "c3a1e8f1b568c7ea844645bc327c22908ea3df68" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-lspconfig": { "branch": "master", "commit": "830ec3893eeb2b21d182864b56931ca6d23d3e29" }, - "nvim-treesitter": { "branch": "master", "commit": "efb2e9c607cab1e4f7171493b7c6f63bd39073fc" }, - "nvim-web-devicons": { "branch": "master", "commit": "f09be61d05bebcba85bb47be1931322d51b95644" }, + "nvim-lspconfig": { "branch": "master", "commit": "d651732cecfc77be1b3727512bec0438c22410d1" }, + "nvim-treesitter": { "branch": "master", "commit": "8d4fdc5e47e2a4e00179e43f56221250ce365973" }, + "nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" }, "vim-glsl": { "branch": "master", "commit": "40dd0b143ef93f3930a8a409f60c1bb85e28b727" } } diff --git a/nvim/dot-config/nvim/lua/plugins/neogit.lua b/nvim/dot-config/nvim/lua/plugins/neogit.lua new file mode 100644 index 0000000..1323236 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/neogit.lua @@ -0,0 +1,8 @@ +return { + "NeogitOrg/neogit", + dependencies = { + "nvim-lua/plenary.nvim", + "sindrets/diffview.nvim" + } +} + diff --git a/nvim/dot-config/nvim/lua/plugins/vim-gitgutter.lua b/nvim/dot-config/nvim/lua/plugins/vim-gitgutter.lua new file mode 100644 index 0000000..c484a70 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/vim-gitgutter.lua @@ -0,0 +1,3 @@ +return { + "airblade/vim-gitgutter" +} -- cgit v1.2.3 From 0934ba51c24aede66d6932b8e56a4916f3de542f Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sat, 30 Nov 2024 10:06:46 +0100 Subject: Update NeoVim plugins --- nvim/dot-config/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index f17d045..3b815c6 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -1,14 +1,14 @@ { "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, + "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "c3a1e8f1b568c7ea844645bc327c22908ea3df68" }, + "neogit": { "branch": "master", "commit": "d7772bca4ac00c02282b0d02623f2f8316c21f32" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-lspconfig": { "branch": "master", "commit": "d651732cecfc77be1b3727512bec0438c22410d1" }, - "nvim-treesitter": { "branch": "master", "commit": "8d4fdc5e47e2a4e00179e43f56221250ce365973" }, - "nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" }, + "nvim-lspconfig": { "branch": "master", "commit": "e869c7e6af0a3c40a2b344a9765779d74dd12720" }, + "nvim-treesitter": { "branch": "master", "commit": "454354e5998edb448111574e58d5f5f2d6a940bd" }, + "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" }, -- cgit v1.2.3 From ae035dac779f498ab545cb8a1ae4ab9b66b840e4 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sun, 1 Dec 2024 18:15:21 +0100 Subject: Add keymaps for NeoTree buffers and Git status --- nvim/dot-config/nvim/lua/plugins/neo-tree.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lua/plugins/neo-tree.lua b/nvim/dot-config/nvim/lua/plugins/neo-tree.lua index 4772f45..2210d18 100644 --- a/nvim/dot-config/nvim/lua/plugins/neo-tree.lua +++ b/nvim/dot-config/nvim/lua/plugins/neo-tree.lua @@ -7,7 +7,9 @@ return { "MunifTanjim/nui.nvim" }, config = function() - vim.keymap.set("n", "df", ":Neotree toggle right") + vim.keymap.set("n", "df", ":Neotree toggle filesystem float") + vim.keymap.set("n", "db", ":Neotree toggle buffers float") + vim.keymap.set("n", "dg", ":Neotree toggle git_status float") end } -- cgit v1.2.3 From c47a859fbee246164e9e963463a3175a42fc0950 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sun, 1 Dec 2024 18:25:52 +0100 Subject: Add GH Coplilot plugin --- nvim/dot-config/nvim/lazy-lock.json | 1 + nvim/dot-config/nvim/lua/plugins/copilot.lua | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 nvim/dot-config/nvim/lua/plugins/copilot.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index 3b815c6..647f89d 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -1,5 +1,6 @@ { "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, + "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, diff --git a/nvim/dot-config/nvim/lua/plugins/copilot.lua b/nvim/dot-config/nvim/lua/plugins/copilot.lua new file mode 100644 index 0000000..1ffa970 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/copilot.lua @@ -0,0 +1,3 @@ +return { + "github/copilot.vim" +} -- cgit v1.2.3 From 92907372a3b99338cde67c6b3014639a90d510d1 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sun, 1 Dec 2024 18:29:27 +0100 Subject: Extract LSP configuration into a separate file --- nvim/dot-config/nvim/init.lua | 3 +-- nvim/dot-config/nvim/lua/lsp.lua | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 nvim/dot-config/nvim/lua/lsp.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua index ac27001..58beafc 100644 --- a/nvim/dot-config/nvim/init.lua +++ b/nvim/dot-config/nvim/init.lua @@ -24,5 +24,4 @@ vim.keymap.set("n", "", "w") require("lazy").setup("plugins") -require("lspconfig").pyright.setup({}) -require("lspconfig").ruby_lsp.setup({}) +require("lsp") diff --git a/nvim/dot-config/nvim/lua/lsp.lua b/nvim/dot-config/nvim/lua/lsp.lua new file mode 100644 index 0000000..83447d3 --- /dev/null +++ b/nvim/dot-config/nvim/lua/lsp.lua @@ -0,0 +1,4 @@ +local lspconfig = require("lspconfig") + +lspconfig.pyright.setup({}) +lspconfig.ruby_lsp.setup({}) -- cgit v1.2.3 From 7d37761e35d20e9495d962718099b3526f6324b8 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sun, 1 Dec 2024 20:25:15 +0100 Subject: Improve LSP configuration --- nvim/dot-config/nvim/lazy-lock.json | 2 ++ nvim/dot-config/nvim/lua/plugins/lspconfig.lua | 25 ++++++++++++++++++++++ .../dot-config/nvim/lua/plugins/nvim-lspconfig.lua | 3 --- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 nvim/dot-config/nvim/lua/plugins/lspconfig.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/nvim-lspconfig.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index 647f89d..5bf9201 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -4,6 +4,8 @@ "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "neogit": { "branch": "master", "commit": "d7772bca4ac00c02282b0d02623f2f8316c21f32" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, diff --git a/nvim/dot-config/nvim/lua/plugins/lspconfig.lua b/nvim/dot-config/nvim/lua/plugins/lspconfig.lua new file mode 100644 index 0000000..90b88e7 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/lspconfig.lua @@ -0,0 +1,25 @@ +return { + { + "williamboman/mason.nvim", + lazy = false, + config = function() + require("mason").setup() + end + }, + { + "williamboman/mason-lspconfig.nvim", + config = function() + require("mason-lspconfig").setup({ + ensure_installed = { "pyright", "ruby_lsp" } + }) + end + }, + { + "neovim/nvim-lspconfig", + config = function() + local lspconfig = require("lspconfig") + lspconfig.pyright.setup({}) + lspconfig.ruby_lsp.setup({}) + end + } +} diff --git a/nvim/dot-config/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/dot-config/nvim/lua/plugins/nvim-lspconfig.lua deleted file mode 100644 index 3657f57..0000000 --- a/nvim/dot-config/nvim/lua/plugins/nvim-lspconfig.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "neovim/nvim-lspconfig" -} -- cgit v1.2.3 From abb99005ccca250f31036108f54fcc119295a173 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sun, 1 Dec 2024 20:34:58 +0100 Subject: Improve LSP configuration, take 2 --- nvim/dot-config/nvim/init.lua | 2 -- nvim/dot-config/nvim/lua/lsp.lua | 4 ---- nvim/dot-config/nvim/lua/plugins/lspconfig.lua | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 nvim/dot-config/nvim/lua/lsp.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua index 58beafc..29d1b94 100644 --- a/nvim/dot-config/nvim/init.lua +++ b/nvim/dot-config/nvim/init.lua @@ -23,5 +23,3 @@ vim.g.mapleader = " " vim.keymap.set("n", "", "w") require("lazy").setup("plugins") - -require("lsp") diff --git a/nvim/dot-config/nvim/lua/lsp.lua b/nvim/dot-config/nvim/lua/lsp.lua deleted file mode 100644 index 83447d3..0000000 --- a/nvim/dot-config/nvim/lua/lsp.lua +++ /dev/null @@ -1,4 +0,0 @@ -local lspconfig = require("lspconfig") - -lspconfig.pyright.setup({}) -lspconfig.ruby_lsp.setup({}) diff --git a/nvim/dot-config/nvim/lua/plugins/lspconfig.lua b/nvim/dot-config/nvim/lua/plugins/lspconfig.lua index 90b88e7..85853be 100644 --- a/nvim/dot-config/nvim/lua/plugins/lspconfig.lua +++ b/nvim/dot-config/nvim/lua/plugins/lspconfig.lua @@ -10,7 +10,7 @@ return { "williamboman/mason-lspconfig.nvim", config = function() require("mason-lspconfig").setup({ - ensure_installed = { "pyright", "ruby_lsp" } + ensure_installed = { "pyright", "ruby_lsp", "html" } }) end }, -- cgit v1.2.3 From fcd1ae6e582a1a889bc8f66b3dcb03dd2c84c367 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Tue, 3 Dec 2024 15:56:06 +0100 Subject: Update NeoVim packages --- nvim/dot-config/nvim/lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index 5bf9201..f90dc68 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -7,10 +7,10 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "d7772bca4ac00c02282b0d02623f2f8316c21f32" }, + "neogit": { "branch": "master", "commit": "dc36aa4b1172189a2e80cbdbd4be2e884e60c09e" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-lspconfig": { "branch": "master", "commit": "e869c7e6af0a3c40a2b344a9765779d74dd12720" }, - "nvim-treesitter": { "branch": "master", "commit": "454354e5998edb448111574e58d5f5f2d6a940bd" }, + "nvim-lspconfig": { "branch": "master", "commit": "1aa9f36b6d542dafc0b4a38c48969d036003b00a" }, + "nvim-treesitter": { "branch": "master", "commit": "b31188671d8a060022dbbeb6905019e69e310108" }, "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, -- cgit v1.2.3 From 979937a85e189078a4e9260aa74cd3d4f66b7325 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sat, 7 Dec 2024 17:39:53 +0100 Subject: nvim: Add zen-mode plugin --- nvim/dot-config/nvim/lazy-lock.json | 9 +++++---- nvim/dot-config/nvim/lua/plugins/zen-mode.lua | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 nvim/dot-config/nvim/lua/plugins/zen-mode.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index f90dc68..9b9a257 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -7,13 +7,14 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "dc36aa4b1172189a2e80cbdbd4be2e884e60c09e" }, + "neogit": { "branch": "master", "commit": "d7772bca4ac00c02282b0d02623f2f8316c21f32" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-lspconfig": { "branch": "master", "commit": "1aa9f36b6d542dafc0b4a38c48969d036003b00a" }, - "nvim-treesitter": { "branch": "master", "commit": "b31188671d8a060022dbbeb6905019e69e310108" }, + "nvim-lspconfig": { "branch": "master", "commit": "e869c7e6af0a3c40a2b344a9765779d74dd12720" }, + "nvim-treesitter": { "branch": "master", "commit": "454354e5998edb448111574e58d5f5f2d6a940bd" }, "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" }, - "vim-glsl": { "branch": "master", "commit": "40dd0b143ef93f3930a8a409f60c1bb85e28b727" } + "vim-glsl": { "branch": "master", "commit": "40dd0b143ef93f3930a8a409f60c1bb85e28b727" }, + "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } } diff --git a/nvim/dot-config/nvim/lua/plugins/zen-mode.lua b/nvim/dot-config/nvim/lua/plugins/zen-mode.lua new file mode 100644 index 0000000..0ab2cbf --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/zen-mode.lua @@ -0,0 +1,6 @@ +return { + "folke/zen-mode.nvim", + config = function() + vim.keymap.set("n", "zz", ":ZenMode") + end +} -- cgit v1.2.3 From 0c245fac9e09b35035623db4449814dbe721c403 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sat, 7 Dec 2024 17:49:55 +0100 Subject: nvim: Disable swap files and enable spell checking --- nvim/dot-config/nvim/init.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nvim') diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua index 29d1b94..44c11bd 100644 --- a/nvim/dot-config/nvim/init.lua +++ b/nvim/dot-config/nvim/init.lua @@ -17,6 +17,8 @@ vim.opt.softtabstop = 2 vim.opt.shiftwidth = 2 vim.opt.relativenumber = true vim.opt.number = true +vim.opt.swapfile = false +vim.opt.spell = true vim.g.mapleader = " " -- cgit v1.2.3 From 60875fd8a53fbc2af609ed099ca4c9a8522c918a Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sat, 7 Dec 2024 17:55:23 +0100 Subject: nvim: Add editorconfig plugin --- nvim/dot-config/nvim/lazy-lock.json | 1 + nvim/dot-config/nvim/lua/plugins/editorconfig.lua | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 nvim/dot-config/nvim/lua/plugins/editorconfig.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index 9b9a257..570d6cc 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -2,6 +2,7 @@ "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, + "editorconfig-vim": { "branch": "master", "commit": "3c2813f2566d9392ff3614248c5db43c3fda9d5f" }, "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, diff --git a/nvim/dot-config/nvim/lua/plugins/editorconfig.lua b/nvim/dot-config/nvim/lua/plugins/editorconfig.lua new file mode 100644 index 0000000..772cea6 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/editorconfig.lua @@ -0,0 +1,3 @@ +return { + "editorconfig/editorconfig-vim" +} -- cgit v1.2.3 From a42e78e08c2e3bd6c149190331306d37d739cfe3 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sat, 7 Dec 2024 18:04:19 +0100 Subject: nvim: Add oil.nvim plugin --- nvim/dot-config/nvim/lazy-lock.json | 1 + nvim/dot-config/nvim/lua/plugins/oil.lua | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 nvim/dot-config/nvim/lua/plugins/oil.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index 570d6cc..82f0b0d 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -13,6 +13,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "e869c7e6af0a3c40a2b344a9765779d74dd12720" }, "nvim-treesitter": { "branch": "master", "commit": "454354e5998edb448111574e58d5f5f2d6a940bd" }, "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" }, + "oil.nvim": { "branch": "master", "commit": "9a59256c8e88b29d2150e99b5960b2f111e51f75" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" }, diff --git a/nvim/dot-config/nvim/lua/plugins/oil.lua b/nvim/dot-config/nvim/lua/plugins/oil.lua new file mode 100644 index 0000000..ed8045f --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/oil.lua @@ -0,0 +1,8 @@ +return { + "stevearc/oil.nvim", + config = function() + require("oil").setup({ + default_file_explorer = true + }) + end, +} -- cgit v1.2.3 From ca19d8fc4d186221d06ec470e0d09a6208f4fe09 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sat, 7 Dec 2024 18:22:38 +0100 Subject: nvim: Add key mappings for LSP actions --- nvim/dot-config/nvim/lua/plugins/lspconfig.lua | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lua/plugins/lspconfig.lua b/nvim/dot-config/nvim/lua/plugins/lspconfig.lua index 85853be..b976d9e 100644 --- a/nvim/dot-config/nvim/lua/plugins/lspconfig.lua +++ b/nvim/dot-config/nvim/lua/plugins/lspconfig.lua @@ -18,8 +18,16 @@ return { "neovim/nvim-lspconfig", config = function() local lspconfig = require("lspconfig") + lspconfig.pyright.setup({}) lspconfig.ruby_lsp.setup({}) + + vim.keymap.set("n", "K", vim.lsp.buf.hover, {}) + vim.keymap.set("n", "gd", vim.lsp.buf.definition, {}) + vim.keymap.set("n", "gr", vim.lsp.buf.references, {}) + vim.keymap.set("n", "gf", vim.lsp.buf.format, {}) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, {}) + vim.keymap.set("n", "rn", vim.lsp.buf.rename, {}) end } } -- cgit v1.2.3 From 0696636e46dd7b3f64b4a126231a067211c14fbc Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sat, 7 Dec 2024 18:32:05 +0100 Subject: nvim: Add LazyGit plugin --- nvim/dot-config/nvim/lazy-lock.json | 1 + nvim/dot-config/nvim/lua/plugins/lazygit.lua | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 nvim/dot-config/nvim/lua/plugins/lazygit.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index 82f0b0d..21ff69f 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -4,6 +4,7 @@ "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "editorconfig-vim": { "branch": "master", "commit": "3c2813f2566d9392ff3614248c5db43c3fda9d5f" }, "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, + "lazygit.nvim": { "branch": "main", "commit": "02a7a2789fe9e660ef72bec27df342b15bcca6b7" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, diff --git a/nvim/dot-config/nvim/lua/plugins/lazygit.lua b/nvim/dot-config/nvim/lua/plugins/lazygit.lua new file mode 100644 index 0000000..d91ed41 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/lazygit.lua @@ -0,0 +1,17 @@ +return { + "kdheepak/lazygit.nvim", + lazy = true, + cmd = { + "LazyGit", + "LazyGitConfig", + "LazyGitCurrentFile", + "LazyGitFilter", + "LazyGitFilterCurrentFile", + }, + dependencies = { + "nvim-lua/plenary.nvim", + }, + keys = { + { "lg", "LazyGit", desc = "LazyGit" } + } +} -- cgit v1.2.3 From fc1354d82a3a96b7998bc7c2714edfa7c463e68e Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sat, 7 Dec 2024 18:34:09 +0100 Subject: nvim: Add vim-rails plugin --- nvim/dot-config/nvim/lazy-lock.json | 11 ++++++----- nvim/dot-config/nvim/lua/plugins/vim-rails.lua | 3 +++ 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 nvim/dot-config/nvim/lua/plugins/vim-rails.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index 21ff69f..63e5661 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -3,21 +3,22 @@ "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "editorconfig-vim": { "branch": "master", "commit": "3c2813f2566d9392ff3614248c5db43c3fda9d5f" }, - "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, + "lazy.nvim": { "branch": "main", "commit": "656cf4309396b7b8b62984e923bf8d8a0013f7d7" }, "lazygit.nvim": { "branch": "main", "commit": "02a7a2789fe9e660ef72bec27df342b15bcca6b7" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "d7772bca4ac00c02282b0d02623f2f8316c21f32" }, + "neogit": { "branch": "master", "commit": "a38945a585794c716b2ff9b25668bb5c089e8cd7" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-lspconfig": { "branch": "master", "commit": "e869c7e6af0a3c40a2b344a9765779d74dd12720" }, - "nvim-treesitter": { "branch": "master", "commit": "454354e5998edb448111574e58d5f5f2d6a940bd" }, - "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" }, + "nvim-lspconfig": { "branch": "master", "commit": "47f236c058f0511702286a21ba53bbf42abbd8a8" }, + "nvim-treesitter": { "branch": "master", "commit": "894cb3cebbad0535fb4e319ada5d875dbc48d8b9" }, + "nvim-web-devicons": { "branch": "master", "commit": "87c34abe5d1dc7c1c0a95aaaf888059c614c68ac" }, "oil.nvim": { "branch": "master", "commit": "9a59256c8e88b29d2150e99b5960b2f111e51f75" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" }, "vim-glsl": { "branch": "master", "commit": "40dd0b143ef93f3930a8a409f60c1bb85e28b727" }, + "vim-rails": { "branch": "master", "commit": "d3954dfe3946c9330dc91b4fbf79ccacb2c626c0" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } } diff --git a/nvim/dot-config/nvim/lua/plugins/vim-rails.lua b/nvim/dot-config/nvim/lua/plugins/vim-rails.lua new file mode 100644 index 0000000..50a7481 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/vim-rails.lua @@ -0,0 +1,3 @@ +return { + "tpope/vim-rails" +} -- cgit v1.2.3 From 82277a3ba85a24ee354495570bde01af47b3a14f Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sat, 7 Dec 2024 18:44:21 +0100 Subject: nvim: Add Lua language server --- nvim/dot-config/nvim/lua/plugins/lspconfig.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lua/plugins/lspconfig.lua b/nvim/dot-config/nvim/lua/plugins/lspconfig.lua index b976d9e..474f777 100644 --- a/nvim/dot-config/nvim/lua/plugins/lspconfig.lua +++ b/nvim/dot-config/nvim/lua/plugins/lspconfig.lua @@ -10,7 +10,7 @@ return { "williamboman/mason-lspconfig.nvim", config = function() require("mason-lspconfig").setup({ - ensure_installed = { "pyright", "ruby_lsp", "html" } + ensure_installed = { "pyright", "ruby_lsp", "html", "lua_ls" } }) end }, @@ -21,6 +21,8 @@ return { lspconfig.pyright.setup({}) lspconfig.ruby_lsp.setup({}) + lspconfig.html.setup({}) + lspconfig.lua_ls.setup({}) vim.keymap.set("n", "K", vim.lsp.buf.hover, {}) vim.keymap.set("n", "gd", vim.lsp.buf.definition, {}) -- cgit v1.2.3 From 8f355cbff5d0bff4cb5ecb93b103d03b39650b2e Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Thu, 12 Dec 2024 15:01:07 +0100 Subject: nvim: Update plugins --- nvim/dot-config/nvim/lazy-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index 63e5661..79597a3 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -3,22 +3,22 @@ "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "editorconfig-vim": { "branch": "master", "commit": "3c2813f2566d9392ff3614248c5db43c3fda9d5f" }, - "lazy.nvim": { "branch": "main", "commit": "656cf4309396b7b8b62984e923bf8d8a0013f7d7" }, - "lazygit.nvim": { "branch": "main", "commit": "02a7a2789fe9e660ef72bec27df342b15bcca6b7" }, + "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" }, + "lazygit.nvim": { "branch": "main", "commit": "77a0d42943d8265271e6e6beaed72da54eeb17e7" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "a38945a585794c716b2ff9b25668bb5c089e8cd7" }, - "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-lspconfig": { "branch": "master", "commit": "47f236c058f0511702286a21ba53bbf42abbd8a8" }, - "nvim-treesitter": { "branch": "master", "commit": "894cb3cebbad0535fb4e319ada5d875dbc48d8b9" }, - "nvim-web-devicons": { "branch": "master", "commit": "87c34abe5d1dc7c1c0a95aaaf888059c614c68ac" }, - "oil.nvim": { "branch": "master", "commit": "9a59256c8e88b29d2150e99b5960b2f111e51f75" }, + "neogit": { "branch": "master", "commit": "40038473707c54a846bd11ecaf5933dd45858972" }, + "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, + "nvim-lspconfig": { "branch": "master", "commit": "124be12d782d656b3c75b513a44d9e4728406078" }, + "nvim-treesitter": { "branch": "master", "commit": "2a496fa4e89034014dd054f04c061ba7d6023a0c" }, + "nvim-web-devicons": { "branch": "master", "commit": "e73d2774d12d0ecf9e05578d692ba1ea50508cf2" }, + "oil.nvim": { "branch": "master", "commit": "dba037598843973b8c54bc5ce0318db4a0da439d" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" }, "vim-glsl": { "branch": "master", "commit": "40dd0b143ef93f3930a8a409f60c1bb85e28b727" }, "vim-rails": { "branch": "master", "commit": "d3954dfe3946c9330dc91b4fbf79ccacb2c626c0" }, - "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } + "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } } -- cgit v1.2.3 From 09ccb63b74894a39b041ac159452b4f970083c39 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Sun, 15 Dec 2024 19:08:38 +0100 Subject: nvim: Update indent settings and disable relative numbers --- nvim/dot-config/nvim/init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nvim') diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua index 44c11bd..0115b5d 100644 --- a/nvim/dot-config/nvim/init.lua +++ b/nvim/dot-config/nvim/init.lua @@ -15,10 +15,11 @@ vim.opt.expandtab = true vim.opt.tabstop = 2 vim.opt.softtabstop = 2 vim.opt.shiftwidth = 2 -vim.opt.relativenumber = true vim.opt.number = true vim.opt.swapfile = false vim.opt.spell = true +vim.opt.autoindent = true +vim.opt.smartindent = true vim.g.mapleader = " " -- cgit v1.2.3 From d73d2d3dd249cf73fca41583d7a167355a006ffc Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Wed, 5 Feb 2025 12:16:47 +0100 Subject: Add AsciiDoc preview functionality --- nvim/dot-config/nvim/lua/asciidoc-preview/init.lua | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 nvim/dot-config/nvim/lua/asciidoc-preview/init.lua (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lua/asciidoc-preview/init.lua b/nvim/dot-config/nvim/lua/asciidoc-preview/init.lua new file mode 100644 index 0000000..9061888 --- /dev/null +++ b/nvim/dot-config/nvim/lua/asciidoc-preview/init.lua @@ -0,0 +1,84 @@ +local api = vim.api +local fn = vim.fn + +local augroup = api.nvim_create_augroup('AsciiDocPreview', { clear = true }) + +local config = { + convert_cmd = 'asciidoctor -o %html %adoc', + preview_cmd = 'xdg-open %html', + refresh_interval = 2000, +} + +local function get_html_path() + return fn.expand('%:p'):gsub('%.adoc$', '.html') +end + +local function convert_to_html() + local adoc_path = fn.expand('%:p') + local html_path = get_html_path() + + local cmd = config.convert_cmd + :gsub('%%adoc', adoc_path) + :gsub('%%html', html_path) + + fn.system(cmd) + + return html_path +end + +local function open_preview() + local html_path = get_html_path() + local cmd = string.format('%s %s', config.preview_cmd, html_path) + + fn.system(cmd) +end + +local refresh_timer = nil + +local function start_auto_refresh() + if refresh_timer then + refresh_timer:stop() + end + + refresh_timer = vim.loop.new_timer() + refresh_timer:start(0, config.refresh_interval, vim.schedule_wrap(function() + if api.nvim_buf_get_option(0, 'modified') then + api.nvim_command('write') + convert_to_html() + end + end)) +end + +local function stop_auto_refresh() + if refresh_timer then + refresh_timer:stop() + refresh_timer = nil + end +end + +api.nvim_create_user_command('AsciiDocPreviewStart', function() + convert_to_html() + open_preview() + start_auto_refresh() +end, {}) + +api.nvim_create_user_command('AsciiDocPreviewStop', function() + stop_auto_refresh() +end, {}) + +api.nvim_create_autocmd('VimLeave', { + group = augroup, + callback = function() + stop_auto_refresh() + end, +}) + +return { + start_preview = function() + convert_to_html() + open_preview() + start_auto_refresh() + end, + stop_preview = stop_auto_refresh, + config = config +} -- cgit v1.2.3 From 995e88c574ac01243327d53e2a1936301bc02f8e Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Wed, 5 Feb 2025 12:17:14 +0100 Subject: Update plugins --- nvim/dot-config/nvim/lazy-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'nvim') diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index 79597a3..51dfdad 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -1,21 +1,21 @@ { - "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, + "catppuccin": { "branch": "main", "commit": "4965db2d6155c25db4e8417465fc2703fdf4c2b7" }, "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "editorconfig-vim": { "branch": "master", "commit": "3c2813f2566d9392ff3614248c5db43c3fda9d5f" }, - "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" }, - "lazygit.nvim": { "branch": "main", "commit": "77a0d42943d8265271e6e6beaed72da54eeb17e7" }, + "editorconfig-vim": { "branch": "master", "commit": "91bd0b0a2c6a72a110ab9feae335e1224480c233" }, + "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" }, + "lazygit.nvim": { "branch": "main", "commit": "adc37c5a6d7d6e8d0a039f08f3c7837971a1c77a" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "40038473707c54a846bd11ecaf5933dd45858972" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "5d172e8315444dbc32867d1c7b04d8e7e68ec4e1" }, + "neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-lspconfig": { "branch": "master", "commit": "124be12d782d656b3c75b513a44d9e4728406078" }, - "nvim-treesitter": { "branch": "master", "commit": "2a496fa4e89034014dd054f04c061ba7d6023a0c" }, - "nvim-web-devicons": { "branch": "master", "commit": "e73d2774d12d0ecf9e05578d692ba1ea50508cf2" }, - "oil.nvim": { "branch": "master", "commit": "dba037598843973b8c54bc5ce0318db4a0da439d" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "nvim-lspconfig": { "branch": "master", "commit": "66bc018936c6ff76beb75f89d986af6442db4001" }, + "nvim-treesitter": { "branch": "master", "commit": "cced713b4993ddbfba8f82e9e60fcab7cbee8101" }, + "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" }, + "oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" }, + "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" }, "vim-glsl": { "branch": "master", "commit": "40dd0b143ef93f3930a8a409f60c1bb85e28b727" }, -- cgit v1.2.3