From d8a0641fb832e3c5032b60791d85cf9ed818885c Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Tue, 5 Nov 2024 22:27:59 -0500 Subject: [PATCH 01/10] Add taplo and some snips --- init.lua | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 694cea1..c3d23ff 100644 --- a/init.lua +++ b/init.lua @@ -446,6 +446,7 @@ require("lazy").setup({ "cpp", }, }, + taplo = {}, yamlls = {}, -- gopls = {}, jdtls = { @@ -475,6 +476,7 @@ require("lazy").setup({ }, }, }, + arduino_language_server = {}, ltex = { settings = { ltex = { @@ -681,6 +683,20 @@ require("lazy").setup({ insert(2), text(")"), }), + snip({ + trig = "header", + namr = "header", + dscr = "Yaml header for markdown notes", + }, { + text({ "---", "" }), + text("title: "), + insert(1), + text({ "", "author: Alex Selimov", "" }), + text("tags: ["), + insert(2), + text({ "]", "", "" }), + text({ "---", "" }), + }), }, }) end, @@ -836,7 +852,14 @@ vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { vim.bo.filetype = "scorch" end, }) - +-- +--Testing scorch highlighting +vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { + pattern = "*.sep", + callback = function() + vim.bo.filetype = "sep" + end, +}) -- Commands to disable formatting require("conform").setup({ format_on_save = function(bufnr) From 4b220023f771054aa950b5b0757faa3a67d4ce71 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Wed, 6 Nov 2024 09:01:50 -0500 Subject: [PATCH 02/10] Add rainbow csv plugin --- init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/init.lua b/init.lua index c3d23ff..0716e3e 100644 --- a/init.lua +++ b/init.lua @@ -205,6 +205,7 @@ require("lazy").setup({ }, "christoomey/vim-tmux-navigator", "kana/vim-textobj-user", + "mechatroner/rainbow_csv", { "GCBallesteros/vim-textobj-hydrogen", dependencies = { From 022a8b98001c185baa336ad687601eeb6c805fd7 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Sun, 10 Nov 2024 14:49:50 -0500 Subject: [PATCH 03/10] Change to zenbones colorscheme --- init.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index 0716e3e..b4572d2 100644 --- a/init.lua +++ b/init.lua @@ -556,7 +556,6 @@ require("lazy").setup({ "stylua", -- Used to format lua code "black", "clang-format", - "ormolu", "beautysh", "latexindent", "prettier", @@ -768,12 +767,14 @@ require("lazy").setup({ -- change the command in the config to whatever the name of that colorscheme is -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme` - "morhetz/gruvbox", lazy = false, -- make sure we load this during startup if it is your main colorscheme priority = 1000, -- make sure to load this before all the other start plugins + --"morhetz/gruvbox", + "zenbones-theme/zenbones.nvim", + dependencies = "rktjmp/lush.nvim", config = function() -- Load the colorscheme here - vim.cmd.colorscheme("gruvbox") + vim.cmd.colorscheme("zenbones") end, }, From 41d85c9f70a99de40dd15915fad6506a9b4ed34d Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Mon, 11 Nov 2024 19:27:19 -0500 Subject: [PATCH 04/10] Update to zenwritten --- init.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index b4572d2..889affa 100644 --- a/init.lua +++ b/init.lua @@ -271,6 +271,7 @@ require("lazy").setup({ repl_open_cmd = "horizontal bot 20 split" end, }, + "norcalli/nvim-colorizer.lua", "ixru/nvim-markdown", "KeitaNakamura/tex-conceal.vim", "christoomey/vim-tmux-navigator", @@ -774,7 +775,7 @@ require("lazy").setup({ dependencies = "rktjmp/lush.nvim", config = function() -- Load the colorscheme here - vim.cmd.colorscheme("zenbones") + vim.cmd.colorscheme("zenwritten") end, }, @@ -840,6 +841,8 @@ require("lazy").setup({ }, "airblade/vim-gitgutter", }) + +require("colorizer").setup() --Set rustfmt command vim.g["rustfmt_command"] = "rustfmt +nightly" --Disable semantic highlights From 98bc388c4acc64e587682003081c333dbdcdd396 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Mon, 11 Nov 2024 21:59:14 -0500 Subject: [PATCH 05/10] Add toggle to keep light mode based on terminal colorscheme --- init.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/init.lua b/init.lua index 889affa..6635e21 100644 --- a/init.lua +++ b/init.lua @@ -893,3 +893,12 @@ vim.api.nvim_create_user_command("FormatEnable", function() end, { desc = "Re-enable autoformat-on-save", }) + +function file_exists(name) + local f = io.open(name, "r") + return f ~= nil and io.close(f) +end + +if file_exists("/home/aselimov/.config/.stlight") then + vim.opt.background = "light" +end From f77edb01638945867f2abbaf25f2ac5ea60b9ed8 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Thu, 12 Dec 2024 19:49:35 -0500 Subject: [PATCH 06/10] Add trouble.nvim --- ftplugin/markdown.vim | 3 ++- init.lua | 52 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim index 56631db..99d0d3e 100644 --- a/ftplugin/markdown.vim +++ b/ftplugin/markdown.vim @@ -11,7 +11,8 @@ map : w % AsyncRun md2pdf "%" map : w % AsyncRun md2beamer "%" map : w % AsyncRun md2docx % map : !zathura %:r.pdf & -inoremap ;b ****hi +inoremap b ****hi +inoremap i **i command Stab Tabularize /\s\+\zs\s/l1c0 nnoremap ;t :Tabularize /\s\+\zs\s/l1c0 set tw=1000 diff --git a/init.lua b/init.lua index 6635e21..ef66b4c 100644 --- a/init.lua +++ b/init.lua @@ -770,7 +770,6 @@ require("lazy").setup({ -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme` lazy = false, -- make sure we load this during startup if it is your main colorscheme priority = 1000, -- make sure to load this before all the other start plugins - --"morhetz/gruvbox", "zenbones-theme/zenbones.nvim", dependencies = "rktjmp/lush.nvim", config = function() @@ -840,6 +839,57 @@ require("lazy").setup({ end, }, "airblade/vim-gitgutter", + "tpope/vim-abolish", + { + "danymat/neogen", + setup = { + snippet_engine = "luasnip", + }, + config = function() + require("neogen").setup({}) + local opts = { noremap = true, silent = true } + vim.api.nvim_set_keymap("n", "dg", ":lua require('neogen').generate()", opts) + end, + version = "*", + }, + "dhruvasagar/vim-table-mode", + { + "folke/trouble.nvim", + opts = {}, -- for default options, refer to the configuration section for custom setup. + cmd = "Trouble", + keys = { + { + "xx", + "Trouble diagnostics toggle", + desc = "Diagnostics (Trouble)", + }, + { + "xX", + "Trouble diagnostics toggle filter.buf=0", + desc = "Buffer Diagnostics (Trouble)", + }, + { + "cs", + "Trouble symbols toggle focus=false", + desc = "Symbols (Trouble)", + }, + { + "cl", + "Trouble lsp toggle focus=false win.position=right", + desc = "LSP Definitions / references / ... (Trouble)", + }, + { + "xL", + "Trouble loclist toggle", + desc = "Location List (Trouble)", + }, + { + "xQ", + "Trouble qflist toggle", + desc = "Quickfix List (Trouble)", + }, + }, + }, }) require("colorizer").setup() From b5e18433a1a07c813c84c3c04d6b685ced5317c0 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Tue, 7 Jan 2025 12:53:00 -0500 Subject: [PATCH 07/10] Add lsp_lines to nvim --- init.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/init.lua b/init.lua index ef66b4c..00d57a0 100644 --- a/init.lua +++ b/init.lua @@ -838,6 +838,12 @@ require("lazy").setup({ -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects end, }, + { + "https://git.sr.ht/~whynothugo/lsp_lines.nvim", + setup = { vim.diagnostic.config({ + virtual_text = false, + }) }, + }, "airblade/vim-gitgutter", "tpope/vim-abolish", { From 28794e5404d0fa1bce4fce148ca3680b23877641 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Wed, 8 Jan 2025 21:24:13 -0500 Subject: [PATCH 08/10] Remove lsp_lines and fix pythong ftplugin --- ftplugin/python.vim | 2 +- init.lua | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ftplugin/python.vim b/ftplugin/python.vim index 0ba4aaa..396f421 100644 --- a/ftplugin/python.vim +++ b/ftplugin/python.vim @@ -1,3 +1,3 @@ set colorcolumn=100 nmap ;x [hv]h]hk$;sc -set tw=100 +set tw=1000 diff --git a/init.lua b/init.lua index 00d57a0..9024d6f 100644 --- a/init.lua +++ b/init.lua @@ -762,7 +762,6 @@ require("lazy").setup({ end, }, }, - { -- You can easily change to a different colorscheme. -- Change the name of the colorscheme plugin below, and then -- change the command in the config to whatever the name of that colorscheme is @@ -839,10 +838,26 @@ require("lazy").setup({ end, }, { - "https://git.sr.ht/~whynothugo/lsp_lines.nvim", - setup = { vim.diagnostic.config({ - virtual_text = false, - }) }, + "folke/snacks.nvim", + priority = 1000, + lazy = false, + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + dashboard = { enabled = true }, + input = { enabled = true }, + terminal = { enabled = true }, + }, + keys = { + { + "T", + function() + Snacks.terminal() + end, + desc = "Toggle Terminal", + }, + }, }, "airblade/vim-gitgutter", "tpope/vim-abolish", From 790cb6846bca0f977e389a8f739498f17c561533 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Thu, 9 Jan 2025 08:58:18 -0500 Subject: [PATCH 09/10] Update iron.nvim settings --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 9024d6f..2f4f089 100644 --- a/init.lua +++ b/init.lua @@ -261,7 +261,7 @@ require("lazy").setup({ highlight = { italic = true, }, - ignore_blank_lines = true, -- ignore blank lines when sending visual select lines + ignore_blank_lines = false, -- ignore blank lines when sending visual select lines }) vim.keymap.set("n", ";rs", "IronRepl") vim.keymap.set("n", ";rr", "IronRestart") From f1c82d8b8b593a40da7e24a8fd4e11ce1ebe1019 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Wed, 15 Jan 2025 22:09:30 -0500 Subject: [PATCH 10/10] Adjust light mode swapping --- init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 2f4f089..a0b483a 100644 --- a/init.lua +++ b/init.lua @@ -970,6 +970,7 @@ function file_exists(name) return f ~= nil and io.close(f) end -if file_exists("/home/aselimov/.config/.stlight") then +local home = os.getenv("HOME") +if file_exists(home .. "/.config/nvim/light_mode") then vim.opt.background = "light" end