From 06a62f864d4c3839d3b0a4a3706b20a156a403b3 Mon Sep 17 00:00:00 2001 From: Trevor Merritt Date: Sun, 24 Sep 2023 16:52:15 -0400 Subject: [PATCH] add git lg add some PS4 dev stuff --- configs/git/gitconfig | 5 +++++ configs/ssh/config | 19 +++++++++++++++++-- configs/zsh/zshrc | 7 +++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/configs/git/gitconfig b/configs/git/gitconfig index f9dce41..dbc3e11 100644 --- a/configs/git/gitconfig +++ b/configs/git/gitconfig @@ -19,6 +19,9 @@ sms = submodule foreach 'git stash' smp = submodule foreach 'git stash pop' # smbr = submodule foreach 'git checkout ' +lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' --all +lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' +lg = lg1 [core] excludesfile = ~/.gitignore autocrlf = input @@ -48,3 +51,5 @@ rebase = true +[safe] + directory = /opt/ps4/OpenOrbis-PS4-Toolchain diff --git a/configs/ssh/config b/configs/ssh/config index b286972..c27bef3 100644 --- a/configs/ssh/config +++ b/configs/ssh/config @@ -1,3 +1,14 @@ +Host 10.1.21.99 + HostName 10.1.21.99 + User tmerritt + +Host pc101 + HostName pc101 + User tmerritt + +Host 10.1.21.99 + HostName 10.1.21.99 + Host 192.168.0.141 KexAlgorithms diffie-hellman-group-exchange-sha1 Host git.pyrocode.xyz @@ -30,7 +41,8 @@ Host git.geekback.dev # ssh-keygen -t ed25519 -C "tmerritt@yourcoolhost.xyz" Host pc101r Port 22222 - +Host rdev + Port 22223 # DevSpace Start app.lilly.devspace Host app.lilly.devspace HostName localhost @@ -40,4 +52,7 @@ Host app.lilly.devspace StrictHostKeyChecking no UserKnownHostsFile /dev/null User devspace -# DevSpace End app.lilly.devspace \ No newline at end of file +# DevSpace End app.lilly.devspace +Host 192.168.0.254 + KexAlgorithms +diffie-hellman-group1-sha1 + HostKeyAlgorithms=+ssh-dss diff --git a/configs/zsh/zshrc b/configs/zsh/zshrc index a2a3727..9d477ca 100644 --- a/configs/zsh/zshrc +++ b/configs/zsh/zshrc @@ -156,11 +156,18 @@ export PATH="$PATH:/opt/node/bin" # Add Local scripts export PATH="$HOME/.local/bin:$PATH" +# Add PS4 SDK +export OO_PS4_TOOLCHAIN=/opt/ps4/OpenOrbis/PS4Toolchain + # Add GraalVM export GRAALVM_HOME=/opt/graalvm export JAVA_HOME=/home/tmerritt/.sdkman/candidates/java/current/bin/java +# Setup vitasdk +export VITASDK=/usr/local/vitasdk +export PATH="$VITASDK/bin:$PATH" + #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! export SDKMAN_DIR="$HOME/.sdkman" [[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"