From 358ed079bc5eeb62597070576172921f1e62668f Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Thu, 7 Sep 2023 23:35:18 +0200 Subject: [PATCH 1/9] update nvim --- .config/nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim b/.config/nvim index 7b2db77..62cb8cc 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit 7b2db77584493f8a77f311527c6956365a3be072 +Subproject commit 62cb8ccabe303074a6916fafd2f566e6eff489e3 From 2bf481fb6cf336aec6f0f4c834a5d35d09b02287 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Sun, 10 Sep 2023 01:49:49 +0200 Subject: [PATCH 2/9] add gitconfig --- .config/nvim | 2 +- .gitconfig | 8 ++++++++ .gitignore | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .gitconfig diff --git a/.config/nvim b/.config/nvim index 62cb8cc..78b379b 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit 62cb8ccabe303074a6916fafd2f566e6eff489e3 +Subproject commit 78b379b80a64d860abbb69e161789fcc21cd54c9 diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..4ded71c --- /dev/null +++ b/.gitconfig @@ -0,0 +1,8 @@ +[user] + email = software@cscherr.de + name = PlexSheep + signingkey = software@cscherr.de +[credential] + helper = store --file ~/.git-credentials +[commit] + gpgsign = false diff --git a/.gitignore b/.gitignore index e68fcde..4f8d624 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ !.zsh !.zsh/** !.tmux.conf +!.gitconfig From acebf10c4b747752e5933037e749ca2c45c6a1d4 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Sun, 10 Sep 2023 19:37:44 +0200 Subject: [PATCH 3/9] update nvim --- .config/nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim b/.config/nvim index 78b379b..8dcc611 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit 78b379b80a64d860abbb69e161789fcc21cd54c9 +Subproject commit 8dcc61113411679de6e82f4b3414be977e24d528 From 866943dc81cb492ffaadeee724100a6ec5b035d9 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Mon, 11 Sep 2023 09:12:58 +0200 Subject: [PATCH 4/9] path rework --- .zshrc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.zshrc b/.zshrc index 91e03ec..274c4dc 100644 --- a/.zshrc +++ b/.zshrc @@ -1,8 +1,6 @@ ### ENVVARS -export PATH="$PATH:/usr/local/sbin:/usr/sbin/:/usr/local/bin:/usr/bin:/var/lib/flatpak/exports/bin:" -export PATH="$PATH:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:~/.local/bin:~/.cargo/bin" -export PATH="$PATH:/home/plex/.local/bin" -export PATH="$HOME/tools/node-v14.15.4-linux-x64/bin:$PATH" +PATH="/usr/bin:/usr/sbin:$HOME/.local/bin:$HOME/.cargo/bin:/usr/local/bin" +export PATH export EDITOR=nvim export editor=nvim export XDG_CONFIG_HOME=~/.config From ee5129ba7a2c7ef32fb4c81f6d9b27f113279340 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Mon, 11 Sep 2023 09:13:04 +0200 Subject: [PATCH 5/9] update nvim --- .config/nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim b/.config/nvim index 8dcc611..2634786 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit 8dcc61113411679de6e82f4b3414be977e24d528 +Subproject commit 2634786dcbfaabe897c4680227ddeb2c9cf5fb14 From d51b9dd3389de79e508ecce63953172d9cf053e3 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Mon, 11 Sep 2023 17:25:11 +0200 Subject: [PATCH 6/9] update nvim --- .config/nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim b/.config/nvim index 2634786..7887bbf 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit 2634786dcbfaabe897c4680227ddeb2c9cf5fb14 +Subproject commit 7887bbfb65dc30392be847f6da66f9727e0a5f85 From 5a539d3521b529b80df2caf36b119ad9885019e2 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Mon, 11 Sep 2023 23:08:18 +0200 Subject: [PATCH 7/9] change neorg alias --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index 91e03ec..b3a437b 100644 --- a/.zshrc +++ b/.zshrc @@ -23,7 +23,7 @@ alias isotime='date +"%Y-%m-%dT%H:%M:%S%z"' alias gg=lazygit alias reload="source ~/.zshrc" alias gls=/bin/ls -alias neorg='nvim -c "Neorg workspace main"' +alias neorg='nvim -c "Neorg workspace $1"' ### non standard aliases if [ -f ~/.zsh_aliases ]; then From 1ed0c53a2a130ed78d44145f8c20e3921167152c Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Mon, 11 Sep 2023 23:09:02 +0200 Subject: [PATCH 8/9] git merge by default --- .gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitconfig b/.gitconfig index 4ded71c..11e5278 100644 --- a/.gitconfig +++ b/.gitconfig @@ -6,3 +6,5 @@ helper = store --file ~/.git-credentials [commit] gpgsign = false +[pull] + rebase = false From 281611cd67c4fca2f5c6076f7c582a06d5b295dc Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Mon, 11 Sep 2023 23:09:07 +0200 Subject: [PATCH 9/9] update nvim --- .config/nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim b/.config/nvim index 7887bbf..3d3d211 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit 7887bbfb65dc30392be847f6da66f9727e0a5f85 +Subproject commit 3d3d2113e8c7f339a3ce4395f7c33ba59cf07eb7