diff --git a/modules/home/git.nix b/modules/home/git.nix index 1f6d84f..dc48212 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -17,6 +17,7 @@ log.decorate = "full"; log.date = "iso"; merge.conflictStyle = "diff3"; + commit.gpgsign = false; alias = { br = "branch --sort=-committerdate"; co = "checkout"; diff --git a/modules/home/nixvim/keymaps.nix b/modules/home/nixvim/keymaps.nix index 3a7ee51..2cc8b86 100644 --- a/modules/home/nixvim/keymaps.nix +++ b/modules/home/nixvim/keymaps.nix @@ -57,6 +57,7 @@ in { (mk "gd" "DiffviewOpen" "差分を開く") (mk "gH" "DiffviewFileHistory" "リポジトリ履歴") (mk "gh" "DiffviewFileHistory %" "ファイル履歴") + (mk "gq" "DiffviewClose" "差分を閉じる") # Telescope (explicit form for reliability) (mkRaw "ff" "function() require('telescope.builtin').find_files() end" "ファイルを探す")