From dbbb3500809da892a8061ee858052db041cf336f Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Wed, 14 Aug 2024 08:49:16 +0200 Subject: [PATCH] improve git-rebase & update java default version --- config/git/config | 1 + local/bin/.gitignore | 4 ++++ profile | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/git/config b/config/git/config index 606f040..0687128 100644 --- a/config/git/config +++ b/config/git/config @@ -27,6 +27,7 @@ nuke = !git rm --cached -r . && git reset --hard [rebase] autoSquash = true + instructionFormat = %s <%an>%d [rerere] enabled = true [core] diff --git a/local/bin/.gitignore b/local/bin/.gitignore index 56a784f..53ab278 100644 --- a/local/bin/.gitignore +++ b/local/bin/.gitignore @@ -50,6 +50,10 @@ vis vis-* wjt xmonad +pnpm +pnpx +yarn +yarnpkg # unshared scripts mreflow.py diff --git a/profile b/profile index 7d19e91..3c01073 100755 --- a/profile +++ b/profile @@ -15,7 +15,7 @@ export CABAL_HOME="/data/homes/cabal" export STACK_ROOT="/data/homes/stack" export CARGO_HOME="/data/homes/cargo" export RUSTUP_HOME="/data/homes/rustup" -export JAVA_HOME="/usr/lib/jvm/openjdk11/" +export JAVA_HOME="/usr/lib/jvm/openjdk17/" export TEX_BIN="/opt/texlive/2019/bin/x86_64-linux/" export PATH="$HOME/.local/bin:$CABAL_HOME/bin:$CARGO_HOME/bin:$JAVA_HOME/bin:$TEX_BIN:$PATH"