Merge branch 'main' of https://gitlab.dustvoice.de/DustVoice/dotfiles
This commit is contained in:
commit
fb95d1e809
3 changed files with 5 additions and 10 deletions
|
@ -4,13 +4,7 @@
|
||||||
signingkey = 7A9CA430D426100E
|
signingkey = 7A9CA430D426100E
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
editor = emacsclient -a "" -ut
|
editor = nvim
|
||||||
pager = delta
|
|
||||||
|
|
||||||
[interactive]
|
|
||||||
diffFilter = delta --color-only
|
|
||||||
[add.interactive]
|
|
||||||
useBuiltin = false # required for git 2.37.0
|
|
||||||
|
|
||||||
[delta]
|
[delta]
|
||||||
navigate = true # use n and N to move between diff sections
|
navigate = true # use n and N to move between diff sections
|
||||||
|
@ -27,6 +21,7 @@
|
||||||
|
|
||||||
[gpg]
|
[gpg]
|
||||||
program = gpg2
|
program = gpg2
|
||||||
|
#program = "C:/Program Files (x86)/GnuPG/bin/gpg.exe"
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
rebase = false
|
rebase = false
|
||||||
|
|
4
.gitmodules
vendored
4
.gitmodules
vendored
|
@ -1,9 +1,9 @@
|
||||||
[submodule ".password-store"]
|
[submodule ".password-store"]
|
||||||
path = .password-store
|
path = .password-store
|
||||||
url = git@git.dustvoice.de:DustVoice/pass.git
|
url = gitlab@gitlab.dustvoice.de:DustVoice/pass.git
|
||||||
[submodule ".config/nvim"]
|
[submodule ".config/nvim"]
|
||||||
path = .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"]
|
[submodule ".znap/dustvoice-zsh-theme"]
|
||||||
path = .znap/dustvoice-zsh-theme
|
path = .znap/dustvoice-zsh-theme
|
||||||
url = https://github.com/DustVoice/dustvoice-zsh-theme.git
|
url = https://github.com/DustVoice/dustvoice-zsh-theme.git
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit a071adb3f7ee26b42bcb2a40be7c165a92e786fb
|
Subproject commit 442d54d71da76f8056b704edb658d8f80b8f64af
|
Loading…
Reference in a new issue