Compare commits
10
Commits
53fd47ca62
...
8df246c058
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8df246c058 | ||
|
|
161156f7c2 | ||
|
|
edf12d6c12 | ||
|
|
5188f2ed17 | ||
|
|
90a5a4c355 | ||
|
|
06a62f864d | ||
|
|
9ff23c540c | ||
|
|
96e8b67812 | ||
|
|
f950536492 | ||
|
|
cbecd146c2 |
No files matched your search
@@ -1,4 +1,4 @@
|
|||||||
export KOTLIN_VERSION=1.8.0
|
export KOTLIN_VERSION=1.8.10
|
||||||
export JAVA_VERSION=11.0.17-tem
|
export JAVA_VERSION=11.0.18-tem
|
||||||
export GRADLE_VERSION=8.0.1
|
export GRADLE_VERSION=8.0.2
|
||||||
export GRAAL_VERSION=22.3.r19
|
export GRAAL_VERSION=22.3.r19-grl
|
||||||
Executable
+5
@@ -0,0 +1,5 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
rsync -vza \
|
||||||
|
/home/tmerritt/Projects/ \
|
||||||
|
tmerritt@192.168.0.210:/nfs/code/toby4
|
||||||
|
|
||||||
@@ -15,6 +15,13 @@
|
|||||||
co = checkout
|
co = checkout
|
||||||
pf = push --force-with-lease
|
pf = push --force-with-lease
|
||||||
st = status
|
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]
|
[core]
|
||||||
excludesfile = ~/.gitignore
|
excludesfile = ~/.gitignore
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
@@ -37,3 +44,24 @@
|
|||||||
autoSetupRebase=always
|
autoSetupRebase=always
|
||||||
[checkout]
|
[checkout]
|
||||||
defaultRemote=origin
|
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
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
dfr
|
|
||||||
GBLib
|
|
||||||
lilly
|
|
||||||
@@ -7,9 +7,10 @@ clusters:
|
|||||||
contexts:
|
contexts:
|
||||||
- context:
|
- context:
|
||||||
cluster: default
|
cluster: default
|
||||||
|
namespace: lillydev
|
||||||
user: default
|
user: default
|
||||||
name: default
|
name: default
|
||||||
current-context: ""
|
current-context: default
|
||||||
kind: Config
|
kind: Config
|
||||||
preferences: {}
|
preferences: {}
|
||||||
users:
|
users:
|
||||||
|
|||||||
+17
-2
@@ -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
|
Host 192.168.0.141
|
||||||
KexAlgorithms diffie-hellman-group-exchange-sha1
|
KexAlgorithms diffie-hellman-group-exchange-sha1
|
||||||
Host git.pyrocode.xyz
|
Host git.pyrocode.xyz
|
||||||
@@ -30,7 +41,8 @@ Host git.geekback.dev
|
|||||||
# ssh-keygen -t ed25519 -C "tmerritt@yourcoolhost.xyz"
|
# ssh-keygen -t ed25519 -C "tmerritt@yourcoolhost.xyz"
|
||||||
Host pc101r
|
Host pc101r
|
||||||
Port 22222
|
Port 22222
|
||||||
|
Host rdev
|
||||||
|
Port 22223
|
||||||
# DevSpace Start app.lilly.devspace
|
# DevSpace Start app.lilly.devspace
|
||||||
Host app.lilly.devspace
|
Host app.lilly.devspace
|
||||||
HostName localhost
|
HostName localhost
|
||||||
@@ -40,4 +52,7 @@ Host app.lilly.devspace
|
|||||||
StrictHostKeyChecking no
|
StrictHostKeyChecking no
|
||||||
UserKnownHostsFile /dev/null
|
UserKnownHostsFile /dev/null
|
||||||
User devspace
|
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,3 +1,3 @@
|
|||||||
generic
|
generic
|
||||||
kotlin
|
|
||||||
platformio
|
platformio
|
||||||
|
rust
|
||||||
@@ -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"
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
|
||||||
|
# Add GraalVM
|
||||||
|
export GRAALVM_HOME=/opt/graalvm
|
||||||
|
|
||||||
|
export JAVA_HOME=/home/tmerritt/.sdkman/candidates/java/current/bin/java
|
||||||
@@ -30,3 +30,4 @@ unset _old_path
|
|||||||
|
|
||||||
|
|
||||||
export IDEA_JDK=/home/tmerritt/.sdkman/candidates/java/17.0.5-tem
|
export IDEA_JDK=/home/tmerritt/.sdkman/candidates/java/17.0.5-tem
|
||||||
|
. "$HOME/.cargo/env"
|
||||||
+2
-11
@@ -35,7 +35,7 @@ ZSH_THEME="jonathan"
|
|||||||
# export UPDATE_ZSH_DAYS=13
|
# export UPDATE_ZSH_DAYS=13
|
||||||
|
|
||||||
# Uncomment the following line if pasting URLs and other text is messed up.
|
# 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.
|
# Uncomment the following line to disable colors in ls.
|
||||||
# DISABLE_LS_COLORS="true"
|
# DISABLE_LS_COLORS="true"
|
||||||
@@ -49,7 +49,7 @@ ENABLE_CORRECTION="true"
|
|||||||
# Uncomment the following line to display red dots whilst waiting for completion.
|
# 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)
|
# 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
|
# 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
|
# Uncomment the following line if you want to disable marking untracked files
|
||||||
# under VCS as dirty. This makes repository status check for large repositories
|
# under VCS as dirty. This makes repository status check for large repositories
|
||||||
@@ -146,21 +146,12 @@ _load_settings "$HOME/.zsh/configs"
|
|||||||
# aliases
|
# aliases
|
||||||
[[ -f ~/.aliases ]] && source ~/.aliases
|
[[ -f ~/.aliases ]] && source ~/.aliases
|
||||||
|
|
||||||
|
|
||||||
# ADD Krew
|
|
||||||
export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
|
|
||||||
|
|
||||||
# Add NPM
|
# Add NPM
|
||||||
export PATH="$PATH:/opt/node/bin"
|
export PATH="$PATH:/opt/node/bin"
|
||||||
|
|
||||||
# Add Local scripts
|
# Add Local scripts
|
||||||
export PATH="$HOME/.local/bin:$PATH"
|
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!!!
|
#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
|
||||||
export SDKMAN_DIR="$HOME/.sdkman"
|
export SDKMAN_DIR="$HOME/.sdkman"
|
||||||
[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
|
[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
|
||||||
|
|||||||
+3
-4
@@ -11,6 +11,7 @@
|
|||||||
- ~/.local/share/remmina
|
- ~/.local/share/remmina
|
||||||
- ~/.local/etc/vscode/platformio
|
- ~/.local/etc/vscode/platformio
|
||||||
- ~/.local/bin
|
- ~/.local/bin
|
||||||
|
- ~/.config/rustdesk
|
||||||
- link:
|
- link:
|
||||||
# Bash
|
# Bash
|
||||||
~/.bash_logout: configs/bash/bash_logout
|
~/.bash_logout: configs/bash/bash_logout
|
||||||
@@ -54,11 +55,9 @@
|
|||||||
- [git submodule update --init --recursive, Installing submodules]
|
- [git submodule update --init --recursive, Installing submodules]
|
||||||
- [fc-cache -fv, Updating Font Cache]
|
- [fc-cache -fv, Updating Font Cache]
|
||||||
- [
|
- [
|
||||||
~/.dotfiles/scripts/setupKotlin.sh,
|
~/.dotfiles/scripts/setupRust.sh,
|
||||||
Setting up Kotlin (Get a Coffee the first Time),
|
Setting up Rust,
|
||||||
]
|
]
|
||||||
- [~/.dotfiles/scripts/setupKubectl.sh, Setting up Kubectl]
|
|
||||||
- [~/.dotfiles/scripts/setupHelm.sh, Setting up Helm]
|
|
||||||
#- git:
|
#- git:
|
||||||
# "/home/tmerritt/Projects/dfr":
|
# "/home/tmerritt/Projects/dfr":
|
||||||
# url: "https://git.pyrocode.xyz/tmerritt/dfr.git"
|
# url: "https://git.pyrocode.xyz/tmerritt/dfr.git"
|
||||||
|
|||||||
@@ -4,4 +4,4 @@
|
|||||||
sudo apt install \
|
sudo apt install \
|
||||||
remmina remmina-plugin-vnc remmina-plugin-rdp \
|
remmina remmina-plugin-vnc remmina-plugin-rdp \
|
||||||
zsh zsh-syntax-highlighting \
|
zsh zsh-syntax-highlighting \
|
||||||
nmap tmux nmon htop -y
|
nmap tmux nmon htop sccache -y
|
||||||
@@ -7,19 +7,3 @@ echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https:/
|
|||||||
|
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y kubectl
|
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
|
|
||||||
Executable
+17
@@ -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
|
||||||
+1
-1
Submodule zsh/ohmyzsh updated: d304635b8c...1c55a0fe52.
Reference in new issue
Block a user