From 62af78a2adecf96588afbc96acd6520f7e62f65b Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Tue, 14 Dec 2021 18:04:23 -0500 Subject: add comments --- lua/user/comment.lua | 22 ++++++++++++++++++++++ lua/user/keymaps.lua | 4 ++++ lua/user/plugins.lua | 2 ++ lua/user/treesitter.lua | 8 ++++++-- 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 lua/user/comment.lua (limited to 'lua/user') diff --git a/lua/user/comment.lua b/lua/user/comment.lua new file mode 100644 index 0000000..2fa4a56 --- /dev/null +++ b/lua/user/comment.lua @@ -0,0 +1,22 @@ +local status_ok, comment = pcall(require, "Comment") +if not status_ok then + return +end + +comment.setup { + pre_hook = function(ctx) + local U = require "Comment.utils" + + local location = nil + if ctx.ctype == U.ctype.block then + location = require("ts_context_commentstring.utils").get_cursor_location() + elseif ctx.cmotion == U.cmotion.v or ctx.cmotion == U.cmotion.V then + location = require("ts_context_commentstring.utils").get_visual_start_location() + end + + return require("ts_context_commentstring.internal").calculate_commentstring { + key = ctx.ctype == U.ctype.line and "__default" or "__multiline", + location = location, + } + end, +} diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index fb8fdb4..9534dec 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -68,3 +68,7 @@ keymap("t", "", "h", term_opts) keymap("t", "", "j", term_opts) keymap("t", "", "k", term_opts) keymap("t", "", "l", term_opts) + +-- Comment +keymap("n", "/", "lua require('Comment').toggle()", opts) +keymap("v", "/", ":lua require(\"Comment.api\").gc(vim.fn.visualmode())", opts) diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 74fcb73..3e2c87c 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -45,6 +45,7 @@ return packer.startup(function(use) use "nvim-lua/popup.nvim" -- An implementation of the Popup API from vim in Neovim use "nvim-lua/plenary.nvim" -- Useful lua functions used ny lots of plugins use "windwp/nvim-autopairs" -- Autopairs, integrates with both cmp and treesitter + use "numToStr/Comment.nvim" -- Easily comment stuff -- Colorschemes -- use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out @@ -75,6 +76,7 @@ return packer.startup(function(use) "nvim-treesitter/nvim-treesitter", run = ":TSUpdate", } + use 'JoosepAlviste/nvim-ts-context-commentstring' -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins diff --git a/lua/user/treesitter.lua b/lua/user/treesitter.lua index b5754d6..6f14cfc 100644 --- a/lua/user/treesitter.lua +++ b/lua/user/treesitter.lua @@ -8,12 +8,16 @@ configs.setup { sync_install = false, -- install languages synchronously (only applied to `ensure_installed`) ignore_install = { "" }, -- List of parsers to ignore installing autopairs = { - enable = true, - }, + enable = true, + }, highlight = { enable = true, -- false will disable the whole extension disable = { "" }, -- list of language that will be disabled additional_vim_regex_highlighting = true, }, indent = { enable = true, disable = { "yaml" } }, + context_commentstring = { + enable = true, + enable_autocmd = false, + }, } -- cgit v1.2.3 From 6fbc8c23123a6b44590a3fa6c656c2f5b98ae89e Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Tue, 14 Dec 2021 18:07:49 -0500 Subject: add gitsigns update --- init.lua | 1 + lua/user/gitsigns.lua | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ lua/user/keymaps.lua | 4 ---- lua/user/plugins.lua | 3 +++ 4 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 lua/user/gitsigns.lua (limited to 'lua/user') diff --git a/init.lua b/init.lua index f1c864d..ba4006d 100644 --- a/init.lua +++ b/init.lua @@ -8,3 +8,4 @@ require "user.telescope" require "user.treesitter" require "user.autopairs" require "user.comment" +require "user.gitsigns" diff --git a/lua/user/gitsigns.lua b/lua/user/gitsigns.lua new file mode 100644 index 0000000..ff72b93 --- /dev/null +++ b/lua/user/gitsigns.lua @@ -0,0 +1,48 @@ +local status_ok, gitsigns = pcall(require, "gitsigns") +if not status_ok then + return +end + +gitsigns.setup { + signs = { + add = { hl = "GitSignsAdd", text = "▎", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" }, + change = { hl = "GitSignsChange", text = "▎", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" }, + delete = { hl = "GitSignsDelete", text = "契", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" }, + topdelete = { hl = "GitSignsDelete", text = "契", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" }, + changedelete = { hl = "GitSignsChange", text = "▎", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" }, + }, + signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` + numhl = false, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + watch_gitdir = { + interval = 1000, + follow_files = true, + }, + attach_to_untracked = true, + current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align' + delay = 1000, + ignore_whitespace = false, + }, + current_line_blame_formatter_opts = { + relative_time = false, + }, + sign_priority = 6, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, + preview_config = { + -- Options passed to nvim_open_win + border = "single", + style = "minimal", + relative = "cursor", + row = 0, + col = 1, + }, + yadm = { + enable = false, + }, +} diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index 9534dec..fb8fdb4 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -68,7 +68,3 @@ keymap("t", "", "h", term_opts) keymap("t", "", "j", term_opts) keymap("t", "", "k", term_opts) keymap("t", "", "l", term_opts) - --- Comment -keymap("n", "/", "lua require('Comment').toggle()", opts) -keymap("v", "/", ":lua require(\"Comment.api\").gc(vim.fn.visualmode())", opts) diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 3e2c87c..24678aa 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -78,6 +78,9 @@ return packer.startup(function(use) } use 'JoosepAlviste/nvim-ts-context-commentstring' + -- Git + use "lewis6991/gitsigns.nvim" + -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins if PACKER_BOOTSTRAP then -- cgit v1.2.3