From 29c6dd54a9aa73c909c2567ecf233198cb13893b Mon Sep 17 00:00:00 2001 From: lenn Date: Sun, 4 Jan 2026 09:52:08 +0800 Subject: [PATCH] init dotfiles with nvim config --- .../nvim/dot_git/COMMIT_EDITMSG | 1 + private_dot_config/nvim/dot_git/HEAD | 1 + private_dot_config/nvim/dot_git/config | 11 + private_dot_config/nvim/dot_git/description | 1 + .../hooks/executable_applypatch-msg.sample | 15 + .../hooks/executable_commit-msg.sample | 24 ++ .../executable_fsmonitor-watchman.sample | 174 +++++++++ .../hooks/executable_post-update.sample | 8 + .../hooks/executable_pre-applypatch.sample | 14 + .../hooks/executable_pre-commit.sample | 49 +++ .../hooks/executable_pre-merge-commit.sample | 13 + .../dot_git/hooks/executable_pre-push.sample | 53 +++ .../hooks/executable_pre-rebase.sample | 169 ++++++++ .../hooks/executable_pre-receive.sample | 24 ++ .../executable_prepare-commit-msg.sample | 42 ++ .../hooks/executable_push-to-checkout.sample | 78 ++++ .../executable_sendemail-validate.sample | 77 ++++ .../dot_git/hooks/executable_update.sample | 128 ++++++ private_dot_config/nvim/dot_git/index | Bin 0 -> 333 bytes private_dot_config/nvim/dot_git/info/exclude | 6 + private_dot_config/nvim/dot_git/logs/HEAD | 1 + .../nvim/dot_git/logs/refs/heads/main | 1 + .../dot_git/logs/refs/remotes/origin/main | 1 + ...nly_561a9b55d73590bb57dfbb1ed1518f29e7f50e | Bin 0 -> 120 bytes ...nly_1681479c5c29a30e9b76368c949f02fb1071d1 | Bin 0 -> 709 bytes ...nly_caa45acabcee29fa4ff436720bacb02e437efb | 2 + ...nly_1d4848e7297b4e74b05362a91083d9708a839a | Bin 0 -> 3576 bytes ...nly_59f8754b4eed8ccdd3d6aca6a2ee1f8a5dedb9 | Bin 0 -> 197 bytes ...nly_1b37a9cb684c504eab5cf68e7e839599688316 | Bin 0 -> 63 bytes .../nvim/dot_git/objects/info/.keep | 0 .../nvim/dot_git/objects/pack/.keep | 0 .../nvim/dot_git/refs/heads/main | 1 + .../nvim/dot_git/refs/remotes/origin/main | 1 + .../nvim/dot_git/refs/tags/.keep | 0 private_dot_config/nvim/init.lua | 363 ++++++++++++++++++ private_dot_config/nvim/lazy-lock.json | 20 + .../nvim/lua/lazy_bootstrap.lua | 10 + 37 files changed, 1288 insertions(+) create mode 100644 private_dot_config/nvim/dot_git/COMMIT_EDITMSG create mode 100644 private_dot_config/nvim/dot_git/HEAD create mode 100644 private_dot_config/nvim/dot_git/config create mode 100644 private_dot_config/nvim/dot_git/description create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_applypatch-msg.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_commit-msg.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_fsmonitor-watchman.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_post-update.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_pre-applypatch.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_pre-commit.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_pre-merge-commit.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_pre-push.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_pre-rebase.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_pre-receive.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_prepare-commit-msg.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_push-to-checkout.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_sendemail-validate.sample create mode 100644 private_dot_config/nvim/dot_git/hooks/executable_update.sample create mode 100644 private_dot_config/nvim/dot_git/index create mode 100644 private_dot_config/nvim/dot_git/info/exclude create mode 100644 private_dot_config/nvim/dot_git/logs/HEAD create mode 100644 private_dot_config/nvim/dot_git/logs/refs/heads/main create mode 100644 private_dot_config/nvim/dot_git/logs/refs/remotes/origin/main create mode 100644 private_dot_config/nvim/dot_git/objects/5f/readonly_561a9b55d73590bb57dfbb1ed1518f29e7f50e create mode 100644 private_dot_config/nvim/dot_git/objects/74/readonly_1681479c5c29a30e9b76368c949f02fb1071d1 create mode 100644 private_dot_config/nvim/dot_git/objects/91/readonly_caa45acabcee29fa4ff436720bacb02e437efb create mode 100644 private_dot_config/nvim/dot_git/objects/bb/readonly_1d4848e7297b4e74b05362a91083d9708a839a create mode 100644 private_dot_config/nvim/dot_git/objects/db/readonly_59f8754b4eed8ccdd3d6aca6a2ee1f8a5dedb9 create mode 100644 private_dot_config/nvim/dot_git/objects/f6/readonly_1b37a9cb684c504eab5cf68e7e839599688316 create mode 100644 private_dot_config/nvim/dot_git/objects/info/.keep create mode 100644 private_dot_config/nvim/dot_git/objects/pack/.keep create mode 100644 private_dot_config/nvim/dot_git/refs/heads/main create mode 100644 private_dot_config/nvim/dot_git/refs/remotes/origin/main create mode 100644 private_dot_config/nvim/dot_git/refs/tags/.keep create mode 100644 private_dot_config/nvim/init.lua create mode 100644 private_dot_config/nvim/lazy-lock.json create mode 100644 private_dot_config/nvim/lua/lazy_bootstrap.lua diff --git a/private_dot_config/nvim/dot_git/COMMIT_EDITMSG b/private_dot_config/nvim/dot_git/COMMIT_EDITMSG new file mode 100644 index 0000000..5ec586d --- /dev/null +++ b/private_dot_config/nvim/dot_git/COMMIT_EDITMSG @@ -0,0 +1 @@ +first commit diff --git a/private_dot_config/nvim/dot_git/HEAD b/private_dot_config/nvim/dot_git/HEAD new file mode 100644 index 0000000..b870d82 --- /dev/null +++ b/private_dot_config/nvim/dot_git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/main diff --git a/private_dot_config/nvim/dot_git/config b/private_dot_config/nvim/dot_git/config new file mode 100644 index 0000000..ada6cfd --- /dev/null +++ b/private_dot_config/nvim/dot_git/config @@ -0,0 +1,11 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[remote "origin"] + url = http://gitea.huangyanjie.com/lenn/nvim-dotfile.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "main"] + remote = origin + merge = refs/heads/main diff --git a/private_dot_config/nvim/dot_git/description b/private_dot_config/nvim/dot_git/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/private_dot_config/nvim/dot_git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/private_dot_config/nvim/dot_git/hooks/executable_applypatch-msg.sample b/private_dot_config/nvim/dot_git/hooks/executable_applypatch-msg.sample new file mode 100644 index 0000000..09b38a8 --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/usr/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/private_dot_config/nvim/dot_git/hooks/executable_commit-msg.sample b/private_dot_config/nvim/dot_git/hooks/executable_commit-msg.sample new file mode 100644 index 0000000..3ced146 --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_commit-msg.sample @@ -0,0 +1,24 @@ +#!/usr/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/private_dot_config/nvim/dot_git/hooks/executable_fsmonitor-watchman.sample b/private_dot_config/nvim/dot_git/hooks/executable_fsmonitor-watchman.sample new file mode 100644 index 0000000..23e856f --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/private_dot_config/nvim/dot_git/hooks/executable_post-update.sample b/private_dot_config/nvim/dot_git/hooks/executable_post-update.sample new file mode 100644 index 0000000..ee496e3 --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_post-update.sample @@ -0,0 +1,8 @@ +#!/usr/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/private_dot_config/nvim/dot_git/hooks/executable_pre-applypatch.sample b/private_dot_config/nvim/dot_git/hooks/executable_pre-applypatch.sample new file mode 100644 index 0000000..845130a --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/usr/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/private_dot_config/nvim/dot_git/hooks/executable_pre-commit.sample b/private_dot_config/nvim/dot_git/hooks/executable_pre-commit.sample new file mode 100644 index 0000000..44f7de3 --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_pre-commit.sample @@ -0,0 +1,49 @@ +#!/usr/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff-index --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/private_dot_config/nvim/dot_git/hooks/executable_pre-merge-commit.sample b/private_dot_config/nvim/dot_git/hooks/executable_pre-merge-commit.sample new file mode 100644 index 0000000..09b65a5 --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/usr/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/private_dot_config/nvim/dot_git/hooks/executable_pre-push.sample b/private_dot_config/nvim/dot_git/hooks/executable_pre-push.sample new file mode 100644 index 0000000..d5e513d --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_pre-push.sample @@ -0,0 +1,53 @@ +#!/usr/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/private_dot_config/nvim/dot_git/hooks/executable_pre-rebase.sample b/private_dot_config/nvim/dot_git/hooks/executable_pre-rebase.sample new file mode 100644 index 0000000..36efc64 --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_pre-rebase.sample @@ -0,0 +1,169 @@ +#!/usr/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/private_dot_config/nvim/dot_git/hooks/executable_pre-receive.sample b/private_dot_config/nvim/dot_git/hooks/executable_pre-receive.sample new file mode 100644 index 0000000..6f473c3 --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_pre-receive.sample @@ -0,0 +1,24 @@ +#!/usr/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/private_dot_config/nvim/dot_git/hooks/executable_prepare-commit-msg.sample b/private_dot_config/nvim/dot_git/hooks/executable_prepare-commit-msg.sample new file mode 100644 index 0000000..cd8e794 --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/usr/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/private_dot_config/nvim/dot_git/hooks/executable_push-to-checkout.sample b/private_dot_config/nvim/dot_git/hooks/executable_push-to-checkout.sample new file mode 100644 index 0000000..badb4b4 --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/usr/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi diff --git a/private_dot_config/nvim/dot_git/hooks/executable_update.sample b/private_dot_config/nvim/dot_git/hooks/executable_update.sample new file mode 100644 index 0000000..5503c12 --- /dev/null +++ b/private_dot_config/nvim/dot_git/hooks/executable_update.sample @@ -0,0 +1,128 @@ +#!/usr/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/private_dot_config/nvim/dot_git/index b/private_dot_config/nvim/dot_git/index new file mode 100644 index 0000000000000000000000000000000000000000..aecd351adb75c58444b6b68498849a59ea2dbf8f GIT binary patch literal 333 zcmZ?q402{*U|<4b=FE^AI(!u`w}R>THIIN|It+X>k{B2omjI<-K(PAz-Lf7Y&o!(4 zN;U*1trTd!S!av zC2vRmDE0Px+jI8vwKdBYy_4^XeY=xE4Co|%keTsG`S~TqB}It^5LYrVgao;|0?jgI zFjg?+iVu^T9eUk#!tU_=>$_Mg|p@IR|H)->gr!#y4{8q<&>#J*?Iy0kL bOyK^>RdXkYMSY$8aCU)z?33Fs|IY;gqDFQE literal 0 HcmV?d00001 diff --git a/private_dot_config/nvim/dot_git/info/exclude b/private_dot_config/nvim/dot_git/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/private_dot_config/nvim/dot_git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/private_dot_config/nvim/dot_git/logs/HEAD b/private_dot_config/nvim/dot_git/logs/HEAD new file mode 100644 index 0000000..bab1d5f --- /dev/null +++ b/private_dot_config/nvim/dot_git/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 91caa45acabcee29fa4ff436720bacb02e437efb lenn 1767489292 +0800 commit (initial): first commit diff --git a/private_dot_config/nvim/dot_git/logs/refs/heads/main b/private_dot_config/nvim/dot_git/logs/refs/heads/main new file mode 100644 index 0000000..bab1d5f --- /dev/null +++ b/private_dot_config/nvim/dot_git/logs/refs/heads/main @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 91caa45acabcee29fa4ff436720bacb02e437efb lenn 1767489292 +0800 commit (initial): first commit diff --git a/private_dot_config/nvim/dot_git/logs/refs/remotes/origin/main b/private_dot_config/nvim/dot_git/logs/refs/remotes/origin/main new file mode 100644 index 0000000..903467d --- /dev/null +++ b/private_dot_config/nvim/dot_git/logs/refs/remotes/origin/main @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 91caa45acabcee29fa4ff436720bacb02e437efb lenn 1767489317 +0800 update by push diff --git a/private_dot_config/nvim/dot_git/objects/5f/readonly_561a9b55d73590bb57dfbb1ed1518f29e7f50e b/private_dot_config/nvim/dot_git/objects/5f/readonly_561a9b55d73590bb57dfbb1ed1518f29e7f50e new file mode 100644 index 0000000000000000000000000000000000000000..2e335a894ad9af95c390662d183ab8996430dc8d GIT binary patch literal 120 zcmV-;0Ehp00V^p=O;s>7uwXDWFfcPQQOL~8EYZs;O=Q?D>*4WSv)Zp@LvYecf##b9 zUCpzgYH|{*Ds^-6le6`*iu3arO2iu7=fr3(=9^t+)-z>3({F*oizWsJ1_lZsbG}KN auRNXM6X3Tx=38G~^VFFc&0+vox+{o1jX6XB literal 0 HcmV?d00001 diff --git a/private_dot_config/nvim/dot_git/objects/74/readonly_1681479c5c29a30e9b76368c949f02fb1071d1 b/private_dot_config/nvim/dot_git/objects/74/readonly_1681479c5c29a30e9b76368c949f02fb1071d1 new file mode 100644 index 0000000000000000000000000000000000000000..cca9b4b4ab3dc0e4c143f0dd19a15134800e830a GIT binary patch literal 709 zcmV;$0y_P80gaSFZeuqLhP%!w46i2xiV`Vt&d^;CP>>Xrd8qwt_&EjA!Q8!g1#C?0 z1oc*nkJR^*wB5lriA8?<@wC}&e}C0K=IOZow)wHy+DT{szWuh@?sYlGY5Qff^}~KY zo!7TqGgjhOP;u0NsI1kXv>L*KP_a?PTDO~@Uskm5kI(ixMx5^H)BK)owG6e)#1Sez z5LB$C#5y$l@DdKf^o~9MJ?)=&%Ll#R(%rlopqa?f$mCXVP%4$tniwTyrWE7X&X0Ot zP25tfwXOTg6- zMra!uL*R-(%;Rv{e_hqwH-8^#A1z0y8ZveDju9he(b|FlHIF99oZ5xoPq8f1{PJ)C z?A5Uw64W)wBE+d+1Vb%3^={a(ah6MgahhW8ySL}n&@s--{V#4Kpo)W-!3WT2-doEh zK)6>cE|^SHi&U=>yiDh1dYP9`{&0&=87$OCQ%VCsqlb7-z{P8klz9z1W4iocr~kY? zh|a(YM9A8;t-F*#hmezdOJkTy9x>!P^!sU^z8-ZtJz%Aiq8KBUt{rNn+A?+{pit6K z6V+a_UfTX|nSB4iGIgoFQ9#OB1|(|*gToU64$flGzzv4KBcD$Z%XD6E%Kz?Ejp50t zX#-9jr8aI10PGd1x`0v=?$-i`Y4?fn`+*nE-a0x_ZeFwrYfd8zTT@cxmSa_RWgmAj z>*=#V@A)R96Cyi~$}W_Kx9B98S7)UMFa^PN-p{d%#Sh1L_y>8k1mYc&TFB^zwJ1o} z6xmZ{t{JIVx#&M1{(3vi)64hsCnatNp1LNh99+7N;?zrm0c>t;;>HEK);{{Bz_g% literal 0 HcmV?d00001 diff --git a/private_dot_config/nvim/dot_git/objects/91/readonly_caa45acabcee29fa4ff436720bacb02e437efb b/private_dot_config/nvim/dot_git/objects/91/readonly_caa45acabcee29fa4ff436720bacb02e437efb new file mode 100644 index 0000000..682f71d --- /dev/null +++ b/private_dot_config/nvim/dot_git/objects/91/readonly_caa45acabcee29fa4ff436720bacb02e437efb @@ -0,0 +1,2 @@ +xM + @= 1 ^%HLڞxVM3P!kDMtr9#/&+YO~vz@g ܵZIJ zJ3K \ No newline at end of file diff --git a/private_dot_config/nvim/dot_git/objects/bb/readonly_1d4848e7297b4e74b05362a91083d9708a839a b/private_dot_config/nvim/dot_git/objects/bb/readonly_1d4848e7297b4e74b05362a91083d9708a839a new file mode 100644 index 0000000000000000000000000000000000000000..3899f87f55fd3237fc6c409c2103f55f401cb3a2 GIT binary patch literal 3576 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 literal 0 HcmV?d00001 diff --git a/private_dot_config/nvim/dot_git/objects/f6/readonly_1b37a9cb684c504eab5cf68e7e839599688316 b/private_dot_config/nvim/dot_git/objects/f6/readonly_1b37a9cb684c504eab5cf68e7e839599688316 new file mode 100644 index 0000000000000000000000000000000000000000..dbce24a333ebdc9a7083222cc359938ef323aa8f GIT binary patch literal 63 zcmV-F0Korv0V^p=O;s>4V=y!@Ff%bx$VsfKj8DqXFDWi5N-WUJDNSU!9r>fw+wX19 V*~{0~EL-$WzAN_aP5>047p@bS9Ay9i literal 0 HcmV?d00001 diff --git a/private_dot_config/nvim/dot_git/objects/info/.keep b/private_dot_config/nvim/dot_git/objects/info/.keep new file mode 100644 index 0000000..e69de29 diff --git a/private_dot_config/nvim/dot_git/objects/pack/.keep b/private_dot_config/nvim/dot_git/objects/pack/.keep new file mode 100644 index 0000000..e69de29 diff --git a/private_dot_config/nvim/dot_git/refs/heads/main b/private_dot_config/nvim/dot_git/refs/heads/main new file mode 100644 index 0000000..61890c9 --- /dev/null +++ b/private_dot_config/nvim/dot_git/refs/heads/main @@ -0,0 +1 @@ +91caa45acabcee29fa4ff436720bacb02e437efb diff --git a/private_dot_config/nvim/dot_git/refs/remotes/origin/main b/private_dot_config/nvim/dot_git/refs/remotes/origin/main new file mode 100644 index 0000000..61890c9 --- /dev/null +++ b/private_dot_config/nvim/dot_git/refs/remotes/origin/main @@ -0,0 +1 @@ +91caa45acabcee29fa4ff436720bacb02e437efb diff --git a/private_dot_config/nvim/dot_git/refs/tags/.keep b/private_dot_config/nvim/dot_git/refs/tags/.keep new file mode 100644 index 0000000..e69de29 diff --git a/private_dot_config/nvim/init.lua b/private_dot_config/nvim/init.lua new file mode 100644 index 0000000..bb1d484 --- /dev/null +++ b/private_dot_config/nvim/init.lua @@ -0,0 +1,363 @@ +-- ~/.config/nvim/init.lua +vim.g.mapleader = " " + +-- 基础体验 +vim.opt.number = true +vim.opt.relativenumber = true +vim.opt.signcolumn = "yes" +vim.opt.termguicolors = true +vim.opt.mouse = "a" +vim.opt.clipboard = "unnamedplus" +vim.opt.updatetime = 250 +vim.opt.timeoutlen = 400 + +-- 缩进（先给一个通用默认） +vim.opt.tabstop = 2 +vim.opt.shiftwidth = 2 +vim.opt.expandtab = true +vim.opt.smartindent = true +vim.opt.scrolloff = 12 + +-- 搜索 +vim.opt.ignorecase = true +vim.opt.smartcase = true +vim.opt.hlsearch = true +vim.opt.incsearch = true + +-- 基本按键 +vim.keymap.set("n", "w", "w", { desc = "save" }) +vim.keymap.set("n", "q", "q", { desc = "quit" }) +vim.keymap.set("n", "", "nohlsearch") +vim.keymap.set("n", "vs", "vsplit", { desc = "Vertical split" }) +vim.keymap.set("n", "hs", "split", { desc = "Horizontal split" }) +vim.keymap.set("n", "sx", "close", { desc = "Close split" }) +vim.keymap.set("n", "so", "only", { desc = "Only this split" }) +vim.keymap.set("i", "jj", "", { noremap = true, silent = true}) +vim.keymap.set("i", "", "", { noremap = true, silent = true }) +vim.keymap.set("i", "", "", { noremap = true, silent = true }) +vim.keymap.set("i", "", "", { noremap = true, silent = true }) +vim.keymap.set("i", "", "", { noremap = true, silent = true }) +vim.keymap.set("n", "", ":m .+1==", { noremap = true, silent = true }) +vim.keymap.set("n", "", ":m .-2==", { noremap = true, silent = true }) +vim.keymap.set("v", "", ":m '>+1gv=gv", { noremap = true, silent = true }) +vim.keymap.set("v", "", ":m '<-2gv=gv", { noremap = true, silent = true }) +-- edit vim config -- +vim.keymap.set("n", "ev", function() + vim.cmd("edit " .. vim.fn.stdpath("config") .. "/init.lua") +end, { desc = "Edit init.lua" }) + +-- source vim config -- +vim.keymap.set("n", "sv", function() + vim.cmd("source" .. vim.fn.stdpath("config") .. "/init.lua") + vim.notify("init.lua reloaded") +end, { desc = "Reload init.lua" }) + +-- 当前lsp +vim.keymap.set("n", "lc", function() + print(vim.inspect(vim.lsp.get_clients({ bufnr = 0 }))) +end, { desc = "LSP: clients (current buffer)"}) +-- 超有用的排错开关：显示报错来源 +vim.opt.shortmess:remove("F") + +vim.diagnostic.config({ + virtual_text = false, + signs = true, + underline = true, + update_in_insert = false, + severity_sort = true, + float = { border = "rounded", source = "if_many"}, +}) + +-- clangd 配置 +local caps = vim.lsp.protocol.make_client_capabilities() +local ok, cmp_lsp = pcall(require, "cmp_nvim_lsp") +if ok then + caps = cmp_lsp.default_capabilities(caps) +end + +-- clangd +vim.lsp.config("clangd", { + capabilities = caps, + cmd = { + "clangd", + "--background-index", + "--clang-tidy", + "--completion-style=detailed", + "--header-insertion=never", + "--suggest-missing-includes=false", + }, + filetypes = { "c", "cpp", "objc", "objcpp", "cuda" }, + root_markers = { "compile_commands.json", "compile_flags.txt", ".git", "CMakeLists.txt" }, +}) + +-- Rust +vim.lsp.config("rust_analyzer", { + capabilities = caps, + root_markers = { "Cargo.toml", ".git" }, +}) + +-- Zig +vim.lsp.config("zls", { + capabilities = caps, + root_markers = { "build.zig", "build.zig.zon", ".git"}, +}) + +-- Json +vim.lsp.config("jsonls", { + capabilities = caps, + root_markers = { "package.json", ".git"}, +}) + +-- CMake LSP +vim.lsp.config("cmake", { + capabilities = caps, + cmd = { "cmake-language-server" }, + root_markers = { "CMakeLists.txt", ".git" }, + filetypes = { "cmake" }, + init_options = { + buildDirectory = "build", + }, +}) + +-- GLSL +vim.lsp.config("glslls", { + cmd = { vim.fn.expand("glslls"), "--stdin", "--target-env", "opengl4.5" }, + filetypes = {"glsl"}, + root_markers = { ".git", "." }, +}) +vim.filetype.add({ + extension = { + vert = "glsl", + frag = "glsl", + comp = "glsl", + geom = "glsl", + tesc = "glsl", + tese = "glsl", + glsl = "glsl", + }, +}) + +-- enable lsp -- +vim.lsp.enable({ "clangd", "rust_analyzer", "zls", "jsonls", "glslls", "build"}) + +-- ===== Auto save on leave ===== +vim.api.nvim_create_autocmd({ + "BufLeave", + "WinLeave", + "TabLeave", + "InsertLeave", +},{ + callback = function() + if vim.bo.modified + and vim.bo.buftype == "" + and vim.fn.expand("%") ~= "" + then + vim.cmd("silent write") + end + end, +}) + +vim.api.nvim_create_autocmd("LspAttach", { + callback = function(args) + local buf = args.buf + local map = function(mode, lhs, rhs, desc) + vim.keymap.set(mode, lhs, rhs, { buffer = buf, desc = desc }) + end + map("n", "gd", vim.lsp.buf.definition, "Go to definition") + map("n", "gr", vim.lsp.buf.references, "References") + map("n", "K", vim.lsp.buf.hover, "Hover") + map("n", "rn", vim.lsp.buf.rename, "Rename") + map("n", "ca", vim.lsp.buf.code_action, "Code Action") + map("n", "[d", vim.diagnostic.goto_prev, "Prev diagnostic") + map("n", "]d", vim.diagnostic.goto_next, "Next diagnostic") + map("n", "e", vim.diagnostic.open_float, "Line diagnostic") + end, +}) + +-- === lazy.nvim bootstrap === +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) +require("lazy_bootstrap") + + +-- === plugins === +require("lazy").setup({ + { "tpope/vim-sleuth" }, + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + vim.api.nvim_create_autocmd("FileType", { + callback = function(args) + local ft = vim.bo[args.buf].filetype + if ft == "lazy" then + return + end + + local lang = vim.treesitter.language.get_lang(ft) + if not lang then + return + end + + local ok = pcall(vim.treesitter.get_parser, args.buf, lang) + if ok then + pcall(vim.treesitter.start, args.buf, lang) + end + end, + }) + end, + }, + { + "hrsh7th/nvim-cmp", + dependencies = { + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + "L3MON4D3/LuaSnip", + "saadparwaiz1/cmp_luasnip", + "rafamadriz/friendly-snippets", + }, + config = function() + local cmp = require("cmp") + local luasnip = require("luasnip") + + require("luasnip.loaders.from_vscode").lazy_load() + + cmp.setup({ + snippet = { + expand = function(args) luasnip.lsp_expand(args.body) end, + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + }), + sources = { + { name = "nvim_lsp"}, + { name = "luasnip" }, + { name = "path" }, + { name = "buffer" }, + }, + }) + end, + }, + { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + cpp = { "clang-format" }, + c = { "clang-format" }, + }, + }, + config = function(_, opts) + require("conform").setup(opts) + vim.keymap.set({ "n", "v"}, "f", function() + require("conform").format({ lsp_fallback = true }) + end, { desc = "Format" }) + end, + }, + { + "lewis6991/gitsigns.nvim", + config = function() + require("gitsigns").setup() + end, + }, + { + "nvim-telescope/telescope.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local telescope = require("telescope") + telescope.setup({ + defaults = { + -- 体验相关 + prompt_prefix = "  ", + selection_caret = "❯ ", + sorting_strategy = "ascending", + layout_config = { + prompt_position = "top", + }, + }, + }) + + local builtin = require("telescope.builtin") + -- 常用快捷键 + vim.keymap.set("n", "ff", builtin.find_files, { desc = "Find files" }) + vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Live grep" }) + vim.keymap.set("n", "fb", builtin.buffers, { desc = "Buffers" }) + vim.keymap.set("n", "fh", builtin.help_tags, { desc = "Help tags" }) + + vim.keymap.set("n", "fd", builtin.diagnostics,{ desc = "Diagnostics" }) + vim.keymap.set("n", "fs", builtin.lsp_document_symbols, { desc = "Symbols (buffer)" }) + vim.keymap.set("n", "fS", builtin.lsp_workspace_symbols,{ desc = "Symbols (workspace)" }) + end, + }, + { + "stevearc/oil.nvim", + config = function() + require("oil").setup() + vim.keymap.set("n", "-", "Oil", { desc = "Open parent directory (Oil)" }) + vim.api.nvim_create_autocmd("FileType", { + pattern = "oil", + callback = function() + vim.keymap.set("n", "q", "bd", { buffer = true }) + end, + }) + end + }, + { + "echasnovski/mini.pairs", + version = false, + config = function() + require("mini.pairs").setup({ + + }) + end, + }, + { + "folke/tokyonight.nvim", + priority = 1000, + config = function() + vim.cmd.colorscheme("tokyonight") + end, + }, + { + "stevearc/dressing.nvim", + event = "VeryLazy", + config = function() + require("dressing").setup({ + input = { + border = "rounded", + }, + select = { + backend = { "builtin" }, + }, + }) + end, + }, +}) + diff --git a/private_dot_config/nvim/lazy-lock.json b/private_dot_config/nvim/lazy-lock.json new file mode 100644 index 0000000..7416814 --- /dev/null +++ b/private_dot_config/nvim/lazy-lock.json @@ -0,0 +1,20 @@ +{ + "LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, + "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "df83eeaab265dacd2eef139a78e502a3f8926618" }, + "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "gitsigns.nvim": { "branch": "main", "commit": "130beacf8a51f00aede9c31064c749136679a321" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "mini.pairs": { "branch": "main", "commit": "d5a29b6254dad07757832db505ea5aeab9aad43a" }, + "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, + "nvim-treesitter": { "branch": "main", "commit": "7efc1b58a8061d29786860006c7257c90a5196dc" }, + "oil.nvim": { "branch": "master", "commit": "963c8d2c5538c4a896a31f396b8a5a2683e254dc" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "telescope.nvim": { "branch": "master", "commit": "3f8109cd21abe9fdb274a09da1e3c176673254b4" }, + "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, + "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" } +} diff --git a/private_dot_config/nvim/lua/lazy_bootstrap.lua b/private_dot_config/nvim/lua/lazy_bootstrap.lua new file mode 100644 index 0000000..db59f87 --- /dev/null +++ b/private_dot_config/nvim/lua/lazy_bootstrap.lua @@ -0,0 +1,10 @@ +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)