From c89d336f5a2dafac860b0afc8823de833152a00d Mon Sep 17 00:00:00 2001 From: mvllow Date: Fri, 13 Jan 2023 13:55:27 -0500 Subject: [PATCH 1/6] ci: add issue templates Thanks to https://github.com/folke/lazy.nvim for the inspiration! --- .github/ISSUE_TEMPLATE/bug_report.yml | 80 ++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.yml | 29 ++++++++ 2 files changed, 109 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 0000000..178ab92 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,80 @@ +name: Bug Report +description: File a bug/issue +title: "bug: " +labels: [bug] +body: + - type: markdown + attributes: + value: | + **Before** reporting an issue, make sure to read the [documentation](https://github.com/rose-pine/neovim) and search [existing issues](https://github.com/rose-pine/neovim/issues). Usage questions such as ***"How do I...?"*** belong in [Discussions](https://github.com/rose-pine/neovim/discussions) and will be closed. + - type: input + attributes: + label: "Neovim version (nvim -v)" + placeholder: "0.8.0 commit db1b0ee3b30f" + validations: + required: true + - type: input + attributes: + label: "Terminal" + placeholder: "Kitty" + validations: + required: true + - type: textarea + attributes: + label: Describe the bug + description: A clear and concise description of what the bug is. Please include any related errors you see in Neovim. + validations: + required: true + - type: textarea + attributes: + label: Steps To Reproduce + description: Steps to reproduce the behavior. + placeholder: | + 1. + 2. + 3. + validations: + required: true + - type: textarea + attributes: + label: Expected Behavior + description: A concise description of what you expected to happen. + validations: + required: true + - type: textarea + attributes: + label: Repro + description: Minimal `init.lua` to reproduce this issue. Save as `repro.lua` and run with `nvim -u repro.lua` + value: | + -- DO NOT change the paths and do not remove the colorscheme + local root = vim.fn.fnamemodify("./.repro", ":p") + + -- Set stdpaths to use .repro + for _, name in ipairs({ "config", "data", "state", "cache" }) do + vim.env[("XDG_%s_HOME"):format(name:upper())] = root .. "/" .. name + end + + -- Bootstrap lazy.nvim + local lazypath = root .. "/plugins/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", lazypath, }) + end + vim.opt.runtimepath:prepend(lazypath) + + -- Install plugins + local plugins = { + "rose-pine/neovim.nvim", + config = function() + -- Add relevant Rosé Pine config below + require("rose-pine").setup({}) + end + } + require("lazy").setup(plugins, { + root = root .. "/plugins", + }) + + vim.cmd.colorscheme("rose-pine") + -- Add anything else here + render: Lua + validations: + required: false diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml new file mode 100644 index 0000000..2b45cdb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -0,0 +1,29 @@ +name: Feature Request +description: Suggest a new feature +title: "feature: " +labels: [enhancement] +body: + - type: textarea + validations: + required: true + attributes: + label: Is your feature request related to a problem? Please describe. + description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + - type: textarea + validations: + required: true + attributes: + label: Describe the solution you'd like + description: A clear and concise description of what you want to happen. + - type: textarea + validations: + required: true + attributes: + label: Describe alternatives you've considered + description: A clear and concise description of any alternative solutions or features you've considered. + - type: textarea + validations: + required: false + attributes: + label: Additional context + description: Add any other context or screenshots about the feature request here. From 02604c92b9fe5e01b9adcd746f274c837a5a673c Mon Sep 17 00:00:00 2001 From: mvllow Date: Fri, 13 Jan 2023 13:58:29 -0500 Subject: [PATCH 2/6] ci: fix template formatting --- .github/ISSUE_TEMPLATE/bug_report.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 178ab92..6a475c5 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -64,10 +64,10 @@ body: -- Install plugins local plugins = { "rose-pine/neovim.nvim", - config = function() + config = function() -- Add relevant Rosé Pine config below - require("rose-pine").setup({}) - end + require("rose-pine").setup({}) + end } require("lazy").setup(plugins, { root = root .. "/plugins", From f967508a5075e19287b2370135dd35fa356db678 Mon Sep 17 00:00:00 2001 From: mvllow Date: Fri, 13 Jan 2023 14:11:12 -0500 Subject: [PATCH 3/6] chore: update editorconfig --- .editorconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 7fc8038..283165a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,6 +7,6 @@ indent_style = tab insert_final_newline = true trim_trailing_whitespace = true -[*.lua] -indent_size = 3 -indent_style = tab +[*.{yaml,yml}] +indent_size = 2 +indent_style = space From e3895d8e76c63d10975b56249445bdc58197f6c3 Mon Sep 17 00:00:00 2001 From: mvllow Date: Mon, 16 Jan 2023 23:42:14 -0500 Subject: [PATCH 4/6] fix: decouple `StatusLine` background from floats --- lua/rose-pine/theme.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index 3a78242..edda7d6 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -70,7 +70,7 @@ function M.get(config) SpellLocal = { sp = p.subtle, style = 'undercurl' }, SpellRare = { sp = p.subtle, style = 'undercurl' }, SignColumn = { fg = p.text, bg = styles.background }, - StatusLine = { fg = p.subtle, bg = styles.float_background }, + StatusLine = { fg = p.subtle, bg = p.surface }, StatusLineNC = { fg = p.muted, bg = styles.background }, StatusLineTerm = { link = 'StatusLine' }, StatusLineTermNC = { link = 'StatusLineNC' }, From 075ed20832863f9635674a6217eb4dcdb8caad12 Mon Sep 17 00:00:00 2001 From: not Date: Tue, 17 Jan 2023 21:07:28 -0500 Subject: [PATCH 5/6] Update bug_report.yml --- .github/ISSUE_TEMPLATE/bug_report.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 6a475c5..c0c3f56 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -63,7 +63,10 @@ body: -- Install plugins local plugins = { - "rose-pine/neovim.nvim", + "rose-pine/neovim", + name = "rose-pine", + lazy = false, + priority = 1000, config = function() -- Add relevant Rosé Pine config below require("rose-pine").setup({}) From 845a6ad5443e3559dde42910c4523a5835c9233b Mon Sep 17 00:00:00 2001 From: not Date: Tue, 17 Jan 2023 21:09:31 -0500 Subject: [PATCH 6/6] Update readme.md --- readme.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/readme.md b/readme.md index 973625b..af2c78a 100644 --- a/readme.md +++ b/readme.md @@ -13,6 +13,21 @@ ## Usage +> With [lazy.nvim](https://github.com/folke/lazy.nvim) + +```lua +{ + 'rose-pine/neovim', + name = 'rose-pine', + lazy = false, + priority = 1000, + config = function() + require("rose-pine").setup() + vim.cmd('colorscheme rose-pine') + end +} +``` + > With [packer.nvim](https://github.com/wbthomason/packer.nvim) ```lua @@ -20,6 +35,7 @@ use({ 'rose-pine/neovim', as = 'rose-pine', config = function() + require("rose-pine").setup() vim.cmd('colorscheme rose-pine') end })