Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: liubang/nvimrc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.6.0
Choose a base ref
...
head repository: liubang/nvimrc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.7.0
Choose a head ref
  • 3 commits
  • 8 files changed
  • 3 contributors

Commits on Jan 19, 2023

  1. Copy the full SHA
    7a88bef View commit details
  2. Copy the full SHA
    39bd8ef View commit details
  3. chore(main): release 3.7.0 (#12)

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    github-actions[bot] authored Jan 19, 2023
    Copy the full SHA
    a94f626 View commit details
Showing with 80 additions and 41 deletions.
  1. +1 −0 .github/workflows/ci.yaml
  2. +7 −0 CHANGELOG.md
  3. +55 −22 Dockerfile
  4. +1 −1 doc/nvimrc.txt
  5. +14 −14 lazy-lock.json
  6. +1 −1 lua/plugins/gruvbox-material.lua
  7. +0 −2 lua/plugins/nvim-cmp.lua
  8. +1 −1 lua/plugins/treesitter.lua
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -91,4 +91,5 @@ jobs:
uses: docker/build-push-action@v3
with:
push: true
platforms: linux/amd64,linux/arm64
tags: liubang/nvim:latest,liubang/nvim:${{ steps.release.outputs.tag_name }}
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [3.7.0](https://github.com/liubang/nvimrc/compare/v3.6.0...v3.7.0) (2023-01-19)


### Features

* **ci:** build multi-architecture docker image ([7a88bef](https://github.com/liubang/nvimrc/commit/7a88bef4f9cf6257789ca1a5fff13243c224742b))

## [3.6.0](https://github.com/liubang/nvimrc/compare/v3.5.0...v3.6.0) (2023-01-18)


77 changes: 55 additions & 22 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,43 @@
FROM debian:stable
#======================================================================
#
# Dockerfile -
#
# Created by liubang on 2023/01/18 17:16
# Last Modified: 2023/01/18 17:16
#
#======================================================================
FROM --platform=$TARGETPLATFORM ubuntu:20.04 as builder

ENV NVIM_VERSION="v0.8.1"
ENV HOME=/home/neovim
ARG DEBIAN_FRONTEND=noninteractive
ENV TZ=Asia/Shanghai
ENV NVIM_TAG=0.8.2

RUN apt-get update && \
apt-get install -y \
autoconf \
automake \
build-essential \
gcc-10 \
git \
cmake \
gettext \
libtool-bin \
locales \
ninja-build \
pkg-config \
unzip

RUN mkdir -p /opt/app && \
cd /tmp && \
curl -sLf https://github.com/neovim/neovim/archive/refs/tags/v$NVIM_TAG.tar.gz -o nvim.$NVIM_TAG.tar.gz && \
tar -zxvf nvim.$NVIM_TAG.tar.gz && \
cd neovim-$NVIM_TAG && \
CC=gcc-10 make CMAKE_BUILD_TYPE="Release" CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH=" && \
make DESTDIR="/opt/app/nvim" install

FROM --platform=$TARGETPLATFORM debian:stable

ARG BUILDARCH

RUN apt-get update && \
apt-get install --no-install-recommends -y \
@@ -25,37 +61,34 @@ RUN apt-get update && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

RUN groupdel users \
&& groupadd -r neovim \
&& useradd --create-home --home-dir $HOME \
-r -g neovim \
neovim
RUN mkdir -p /opt/app
COPY --from=builder /opt/app/nvim /opt/app/nvim

RUN mkdir -p /opt/app && \
cd /tmp && \
curl -sLf https://github.com/neovim/neovim/releases/download/${NVIM_VERSION}/nvim-linux64.tar.gz -o nvim-linux64.tar.gz && \
tar -zxvf nvim-linux64.tar.gz && \
mv nvim-linux64 /opt/app/nvim && \
rm nvim-linux64.tar.gz && \
curl -sLf https://go.dev/dl/go1.19.3.linux-amd64.tar.gz -o go1.19.3.linux-amd64.tar.gz && \
tar -zxvf go1.19.3.linux-amd64.tar.gz && \
RUN cd /tmp && \
curl -sLf https://go.dev/dl/go1.19.3.linux-$BUILDARCH.tar.gz -o go1.19.3.linux-$BUILDARCH.tar.gz && \
tar -zxvf go1.19.3.linux-$BUILDARCH.tar.gz && \
mv go /opt/app/go && \
rm -rf /opt/app/go/api && \
rm -rf /opt/app/go/doc && \
rm -rf /opt/app/go/test && \
rm -rf /opt/app/go/lib && \
rm go1.19.3.linux-amd64.tar.gz
rm go1.19.3.linux-$BUILDARCH.tar.gz

USER neovim
ENV HOME=/home/neovim

RUN groupdel users \
&& groupadd -r neovim \
&& useradd --create-home --home-dir $HOME \
-r -g neovim \
neovim

USER neovim
ENV PYTHON3_HOST_PROG="/usr/bin/python3"
ENV PATH=$PATH:/opt/app/nvim/bin:/opt/app/go/bin

RUN mkdir -p $HOME/.config && \
mkdir -p $HOME/workspace && \
cd $HOME && \
git clone --depth 1 https://github.com/wbthomason/packer.nvim \
~/.local/share/nvim/site/pack/packer/opt/packer.nvim && \
git clone --depth 1 https://github.com/liubang/nvimrc.git $HOME/.config/nvim && \
rm -rf $HOME/.config/nvim/.github && \
rm -rf $HOME/.config/nvim/.git && \
@@ -65,8 +98,8 @@ RUN mkdir -p $HOME/.config && \
go env -w GO111MODULE=on && \
go env -w GOPATH=$HOME/.go

WORKDIR $HOME/workspace
RUN nvim --headless +'Lazy! sync' +qa

RUN nvim --headless "+Lazy! sync" +qa
WORKDIR $HOME/workspace

ENTRYPOINT ["/bin/bash", "-c", "nvim"]
2 changes: 1 addition & 1 deletion doc/nvimrc.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*nvimrc.txt* For Neovim >= 0.8.2 Last change: 2023 January 18
*nvimrc.txt* For Neovim >= 0.8.2 Last change: 2023 January 19

==============================================================================
Table of Contents *nvimrc-table-of-contents*
28 changes: 14 additions & 14 deletions lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"Comment.nvim": { "branch": "master", "commit": "e89df176e8b38e931b7e71a470f923a317976d86" },
"Comment.nvim": { "branch": "master", "commit": "eab2c83a0207369900e92783f56990808082eac2" },
"LuaSnip": { "branch": "master", "commit": "45670282dc861b51c4e028e6930c75371fe0b88f" },
"accelerated-jk.nvim": { "branch": "main", "commit": "38bbbf9258aab876906588ea979901ed3ed569c6" },
"aerial.nvim": { "branch": "master", "commit": "3eafbd28ae573fa665121a6e058a450cf3fe8573" },
"aerial.nvim": { "branch": "master", "commit": "4c3ff7554d4853b5b6372c9c4a5077076977ceb7" },
"alpha-nvim": { "branch": "main", "commit": "21a0f2520ad3a7c32c0822f943368dc063a569fb" },
"asyncrun.extra": { "branch": "master", "commit": "8c1f8795aaf1041276657ee868bf3c48c11d5c7d" },
"asyncrun.vim": { "branch": "master", "commit": "ea59f760c223100edcffc52ffe019f502a792039" },
"asyncrun.vim": { "branch": "master", "commit": "bd240b2a2ac5c975216744fda57abe5ff8f39957" },
"asynctasks.vim": { "branch": "master", "commit": "784a4b1f75a913cc6c43dd6c4dbe69d648dbbfa5" },
"bufdelete.nvim": { "branch": "master", "commit": "f79e9d186b42fba5f1b1362006e7c70240db97a4" },
"bufferline.nvim": { "branch": "main", "commit": "c7492a76ce8218e3335f027af44930576b561013" },
@@ -19,36 +19,36 @@
"fidget.nvim": { "branch": "main", "commit": "44585a0c0085765195e6961c15529ba6c5a2a13b" },
"fzy-lua-native": { "branch": "master", "commit": "085c7d262aa35cc55a8523e8c1618d398bf717a7" },
"gitsigns.nvim": { "branch": "main", "commit": "addd6e174a85fc1c4007ab0b65d77e6555b417bf" },
"gruvbox-material": { "branch": "master", "commit": "30e9f4b0fa24c25980df1690a8c47c36e40b6673" },
"hex.nvim": { "branch": "master", "commit": "3e5bfaf25d8d48bbaa1dbc7c4e22f19e1194db94" },
"gruvbox-material": { "branch": "master", "commit": "b63082aeb6e8029be9f0ef806657fed1bec2393d" },
"hex.nvim": { "branch": "master", "commit": "944b9913d7fd39d51a2c2b5539ab138a9f22305a" },
"hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" },
"lazy.nvim": { "branch": "main", "commit": "4f60facf18b34ae06d164485aa2ce879e21e44fc" },
"lazy.nvim": { "branch": "main", "commit": "c389ad552bd5c2050783ac6cd6e54f5fbba3c7bc" },
"lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
"lualine.nvim": { "branch": "master", "commit": "0050b308552e45f7128f399886c86afefc3eb988" },
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "610f5919fe633ac872239a0ab786572059f0d91d" },
"mason.nvim": { "branch": "main", "commit": "5e78970539d937b7aef7a4e10b219d60da0b1425" },
"mason.nvim": { "branch": "main", "commit": "d825d3d1612c31caaff60901e0a6600cab8624d3" },
"mini.align": { "branch": "main", "commit": "19a06c5b6127f358fc8b56be715567e223047192" },
"mini.cursorword": { "branch": "main", "commit": "21af5679b39cf1a6bc6bf4eeaabc35e1b5ee7110" },
"mini.surround": { "branch": "main", "commit": "aeeb1c4ce4d1c66211bdc74b131c11b8fcbae65e" },
"neodev.nvim": { "branch": "main", "commit": "fc20483383dac11b97df43c83db1bbbd35305172" },
"neodev.nvim": { "branch": "main", "commit": "15e9e7c1daa22ce83757cf1c304a038f0549cf47" },
"neogen": { "branch": "main", "commit": "465af9d6c6fb7f360175991dcc23fc10917e3a06" },
"null-ls.nvim": { "branch": "main", "commit": "c02509dc9a5f71ccbfa48fc7d2614686b538f80e" },
"null-ls.nvim": { "branch": "main", "commit": "7bd74a821d991057ca1c0ca569d8252c4f89f860" },
"nvim-autopairs": { "branch": "master", "commit": "f00eb3b766c370cb34fdabc29c760338ba9e4c6c" },
"nvim-cmp": { "branch": "main", "commit": "11a95792a5be0f5a40bab5fc5b670e5b1399a939" },
"nvim-colorizer.lua": { "branch": "master", "commit": "760e27df4dd966607e8fb7fd8b6b93e3c7d2e193" },
"nvim-lspconfig": { "branch": "master", "commit": "8ebe6894dddaeb1459e1397c865f54fa5ecaac80" },
"nvim-lspconfig": { "branch": "master", "commit": "a59ba78f164f586d47a2f315dc3d021a630768d0" },
"nvim-navic": { "branch": "master", "commit": "7a2b823152fe4de65ee7925b0e32d26ed73bc57c" },
"nvim-notify": { "branch": "master", "commit": "72e77098a145d7b805353a0d94a367739f81214f" },
"nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" },
"nvim-tree.lua": { "branch": "master", "commit": "e8a89db1bbc06510a76fc935754b4e99a3e5e8a7" },
"nvim-treesitter": { "branch": "master", "commit": "bc2af0a35c8db554236e9b1c8d217df5b5cd1e52" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "228847a5273e4d7dea1f7805c96dd4b24035be62" },
"nvim-treesitter": { "branch": "master", "commit": "052069ffab58b4ec6b127644cc3d6e5458b9986c" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "2fb97bd6c53d78517d2022a0b84422c18ce5686e" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" },
"nvim-web-devicons": { "branch": "master", "commit": "6c38926351372ea87034dec26182b62c835ff3bc" },
"playground": { "branch": "master", "commit": "01c27f37a1f067200680cacfb7b96f5ad2fa5cd6" },
"plenary.nvim": { "branch": "master", "commit": "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826" },
"rust-tools.nvim": { "branch": "master", "commit": "df584e84393ef255f5b8cbd709677d6a3a5bf42f" },
"schemastore.nvim": { "branch": "main", "commit": "571056608b7fc569f856c8174fcbffaad548eec5" },
"schemastore.nvim": { "branch": "main", "commit": "8ec6e1b030d933cba9a207a78c2f24333641fb2c" },
"smart-splits.nvim": { "branch": "master", "commit": "fdd158ce7554dc830fb86e0fe952cd9476cdf726" },
"sqlite.lua": { "branch": "master", "commit": "53cac3fdb5f5e4e63e243232b6eccf3c764ae18a" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "fab3e2212e206f4f8b3bbaa656e129443c9b802e" },
2 changes: 1 addition & 1 deletion lua/plugins/gruvbox-material.lua
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
--=====================================================================

return {
"sainnhe/gruvbox-material",
"liubang/gruvbox-material",
lazy = false,
priority = 1000,
config = function()
2 changes: 0 additions & 2 deletions lua/plugins/nvim-cmp.lua
Original file line number Diff line number Diff line change
@@ -51,8 +51,6 @@ function M.config()
local compare = require "cmp.config.compare"

vim.opt.completeopt = { "menu", "menuone", "noselect" }
-- Don't show the dumb matching stuff.
vim.opt.shortmess:append "c"

local has_words_before = function()
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
2 changes: 1 addition & 1 deletion lua/plugins/treesitter.lua
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ return {
{ "nvim-treesitter/playground", cmd = "TSPlaygroundToggle" },
{
"nvim-treesitter/nvim-treesitter",
build = ":TSUpdate",
build = ":TSUpdateSync",
event = "BufReadPost",
dependencies = {
"nvim-treesitter/nvim-treesitter-textobjects",