Compare commits

..
10 Commits
Author SHA1 Message Date
tmerritt 8df246c058 Adds basic rust setup
removes kotlin stuff.
2024-07-15 09:23:14 -04:00
tmerritt 161156f7c2 fixes install and removes crappola 2024-07-03 11:03:08 -04:00
tmerritt edf12d6c12 removes gradle projects - not working with kt.
adds rustdesk path.
2024-07-03 10:54:47 -04:00
tmerritt 5188f2ed17 bump 2024-06-24 13:16:35 -04:00
tmerritt 90a5a4c355 junk 2023-09-24 16:54:34 -04:00
tmerritt 06a62f864d add
git lg
add some PS4 dev stuff
2023-09-24 16:52:49 -04:00
tmerritt 9ff23c540c Update kotlin from 1.8.0 to 1.8.10 (compose 1.3.0 to 1.3.1 changed kotlin support) 2023-03-10 13:42:06 -05:00
tmerritt 96e8b67812 Fixes GraalVM version -> no suffix to build so it was being seen as just java. 2023-03-10 13:41:35 -05:00
tmerritt f950536492 adds new aliases for git.
- sr  = submodule update --remote --init
  - sms = submodule foreach 'git stash'
  - smp = submodule foreach 'git stash pop'
adds recurse option to submodule
adds submodulessummary to status
2023-03-10 13:37:17 -05:00
tmerritt cbecd146c2 update gradle and jdk 2023-03-04 16:39:20 -05:00
16 changed files with 94 additions and 44 deletions

No files matched your search

+4 -4
View File
@@ -1,4 +1,4 @@
export KOTLIN_VERSION=1.8.0
export JAVA_VERSION=11.0.17-tem
export GRADLE_VERSION=8.0.1
export GRAAL_VERSION=22.3.r19
export KOTLIN_VERSION=1.8.10
export JAVA_VERSION=11.0.18-tem
export GRADLE_VERSION=8.0.2
export GRAAL_VERSION=22.3.r19-grl
+5
View File
@@ -0,0 +1,5 @@
#!/bin/bash
rsync -vza \
/home/tmerritt/Projects/ \
tmerritt@192.168.0.210:/nfs/code/toby4
+28
View File
@@ -15,6 +15,13 @@
co = checkout
pf = push --force-with-lease
st = status
sr = submodule update --remote --init
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
@@ -37,3 +44,24 @@
autoSetupRebase=always
[checkout]
defaultRemote=origin
[status]
submodulessummary = true
[submodule]
recurse = true
rebase = true
[safe]
directory = /opt/ps4/OpenOrbis-PS4-Toolchain
[credential "https://github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
[credential "https://gist.github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
[url "https://invent.kde.org/"]
insteadOf = kde:
[url "ssh://git@invent.kde.org/"]
pushInsteadOf = kde:
[pull]
rebase = true
-3
View File
@@ -1,3 +0,0 @@
dfr
GBLib
lilly
+2 -1
View File
@@ -7,9 +7,10 @@ clusters:
contexts:
- context:
cluster: default
namespace: lillydev
user: default
name: default
current-context: ""
current-context: default
kind: Config
preferences: {}
users:
+17 -2
View File
@@ -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
# DevSpace End app.lilly.devspace
Host 192.168.0.254
KexAlgorithms +diffie-hellman-group1-sha1
HostKeyAlgorithms=+ssh-dss
+1 -1
View File
@@ -1,3 +1,3 @@
generic
kotlin
platformio
rust
+7
View File
@@ -0,0 +1,7 @@
# Add PS4 SDK
export OO_PS4_TOOLCHAIN=/opt/ps4/OpenOrbis/PS4Toolchain
# Setup vitasdk
export VITASDK=/usr/local/vitasdk
export PATH="$VITASDK/bin:$PATH"
+5
View File
@@ -0,0 +1,5 @@
# Add GraalVM
export GRAALVM_HOME=/opt/graalvm
export JAVA_HOME=/home/tmerritt/.sdkman/candidates/java/current/bin/java
+1
View File
@@ -30,3 +30,4 @@ unset _old_path
export IDEA_JDK=/home/tmerritt/.sdkman/candidates/java/17.0.5-tem
. "$HOME/.cargo/env"
+2 -11
View File
@@ -35,7 +35,7 @@ ZSH_THEME="jonathan"
# export UPDATE_ZSH_DAYS=13
# Uncomment the following line if pasting URLs and other text is messed up.
# DISABLE_MAGIC_FUNCTIONS="true"
DISABLE_MAGIC_FUNCTIONS="true"
# Uncomment the following line to disable colors in ls.
# DISABLE_LS_COLORS="true"
@@ -49,7 +49,7 @@ ENABLE_CORRECTION="true"
# Uncomment the following line to display red dots whilst waiting for completion.
# Caution: this setting can cause issues with multiline prompts (zsh 5.7.1 and newer seem to work)
# See https://github.com/ohmyzsh/ohmyzsh/issues/5765
# COMPLETION_WAITING_DOTS="true"
COMPLETION_WAITING_DOTS="true"
# Uncomment the following line if you want to disable marking untracked files
# under VCS as dirty. This makes repository status check for large repositories
@@ -146,21 +146,12 @@ _load_settings "$HOME/.zsh/configs"
# aliases
[[ -f ~/.aliases ]] && source ~/.aliases
# ADD Krew
export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
# Add NPM
export PATH="$PATH:/opt/node/bin"
# Add Local scripts
export PATH="$HOME/.local/bin:$PATH"
# Add GraalVM
export GRAALVM_HOME=/opt/graalvm
export JAVA_HOME=/home/tmerritt/.sdkman/candidates/java/current/bin/java
#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"
+3 -4
View File
@@ -11,6 +11,7 @@
- ~/.local/share/remmina
- ~/.local/etc/vscode/platformio
- ~/.local/bin
- ~/.config/rustdesk
- link:
# Bash
~/.bash_logout: configs/bash/bash_logout
@@ -54,11 +55,9 @@
- [git submodule update --init --recursive, Installing submodules]
- [fc-cache -fv, Updating Font Cache]
- [
~/.dotfiles/scripts/setupKotlin.sh,
Setting up Kotlin (Get a Coffee the first Time),
~/.dotfiles/scripts/setupRust.sh,
Setting up Rust,
]
- [~/.dotfiles/scripts/setupKubectl.sh, Setting up Kubectl]
- [~/.dotfiles/scripts/setupHelm.sh, Setting up Helm]
#- git:
# "/home/tmerritt/Projects/dfr":
# url: "https://git.pyrocode.xyz/tmerritt/dfr.git"
+1 -1
View File
@@ -4,4 +4,4 @@
sudo apt install \
remmina remmina-plugin-vnc remmina-plugin-rdp \
zsh zsh-syntax-highlighting \
nmap tmux nmon htop -y
nmap tmux nmon htop sccache -y
-16
View File
@@ -7,19 +7,3 @@ echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https:/
sudo apt-get update
sudo apt-get install -y kubectl
(
set -x; cd "$(mktemp -d)" &&
OS="$(uname | tr '[:upper:]' '[:lower:]')" &&
ARCH="$(uname -m | sed -e 's/x86_64/amd64/' -e 's/\(arm\)\(64\)\?.*/\1\2/' -e 's/aarch64$/arm64/')" &&
KREW="krew-${OS}_${ARCH}" &&
curl -fsSLO "https://github.com/kubernetes-sigs/krew/releases/latest/download/${KREW}.tar.gz" &&
tar zxvf "${KREW}.tar.gz" &&
./"${KREW}" install krew
)
for n in $(cat ~/.dotfiles/scripts/krew.plugins.txt)
do
echo "Installing $n"
kubectl krew install "$n"
done
+17
View File
@@ -0,0 +1,17 @@
#!/bin/bash
echo Setting up Rust dev environment
sudo apt install lcov grcov
# update with rustup
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y -q
# Add source to rustup
rustup component add rust-src
# Add coverage assistance
rustup component add llvm-tools-preview
# Installing Cargo plugins.
cargo install cargo-cache