From 00f9bb88447f8d36294499debfb5bdffb1bdffe0 Mon Sep 17 00:00:00 2001 From: DustVoice Date: Thu, 28 Sep 2023 00:31:38 +0200 Subject: [PATCH 1/2] Make .gitconfig cross-platform --- .gitconfig | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitconfig b/.gitconfig index 17518f2..32d9292 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,13 +4,7 @@ signingkey = 7A9CA430D426100E [core] - editor = emacsclient -a "" -ut - pager = delta - -[interactive] - diffFilter = delta --color-only -[add.interactive] - useBuiltin = false # required for git 2.37.0 + editor = nvim [delta] navigate = true # use n and N to move between diff sections @@ -27,6 +21,7 @@ [gpg] program = gpg2 + #program = "C:/Program Files (x86)/GnuPG/bin/gpg.exe" [pull] rebase = false From 32a746eb1715ee9a18d426f52a502178c4725f40 Mon Sep 17 00:00:00 2001 From: DustVoice Date: Thu, 28 Sep 2023 01:13:54 +0200 Subject: [PATCH 2/2] Update submodules and repo urls --- .config/nvim | 2 +- .gitmodules | 4 ++-- .password-store | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.config/nvim b/.config/nvim index db90c5e..4a1df4e 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit db90c5e6a0e7c8b78360cbd161f7049a6814f78f +Subproject commit 4a1df4edcd405b991facdb9f0c5f6e699aaffdfc diff --git a/.gitmodules b/.gitmodules index 660af2a..9a9ce8c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule ".password-store"] path = .password-store - url = git@git.dustvoice.de:DustVoice/pass.git + url = gitlab@gitlab.dustvoice.de:DustVoice/pass.git [submodule ".config/nvim"] path = .config/nvim - url = https://git.dustvoice.de/DustVoice/nvim.git + url = https://gitlab.dustvoice.de/DustVoice/nvim.git [submodule ".znap/dustvoice-zsh-theme"] path = .znap/dustvoice-zsh-theme url = https://github.com/DustVoice/dustvoice-zsh-theme.git diff --git a/.password-store b/.password-store index a071adb..442d54d 160000 --- a/.password-store +++ b/.password-store @@ -1 +1 @@ -Subproject commit a071adb3f7ee26b42bcb2a40be7c165a92e786fb +Subproject commit 442d54d71da76f8056b704edb658d8f80b8f64af