adds force to relinking of remmina links

Adding fix for Apple keyboard F keys on MBP and MBA

VARIABLES

@@ -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

bin/rsync_projects.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+rsync -vza \
+	/home/tmerritt/Projects/ \
+	tmerritt@192.168.0.210:/nfs/code/toby4
+

configs/git/gitconfig

@@ -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

configs/k8s/cx2.kubeconfig

@@ -7,9 +7,10 @@ clusters:
 contexts:
 - context:
     cluster: default
+    namespace: lillydev
     user: default
   name: default
-current-context: ""
+current-context: default
 kind: Config
 preferences: {}
 users:

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
+# DevSpace End app.lilly.devspace
+Host 192.168.0.254
+  KexAlgorithms +diffie-hellman-group1-sha1
+  HostKeyAlgorithms=+ssh-dss

configs/zsh/zshenv

@@ -30,3 +30,4 @@ unset _old_path
 
 
 export IDEA_JDK=/home/tmerritt/.sdkman/candidates/java/17.0.5-tem
+. "$HOME/.cargo/env"

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"

install.conf.yaml

@@ -36,6 +36,7 @@
       glob: true
       path: configs/remmina/*
       relink: true
+      force: true
     # K8S Stuff
     ~/.kube/kubeconfig: configs/k8s/cx2.kubeconfig
     # Fonts
@@ -47,6 +48,7 @@
     # Wireguard Fix
     ~/.local/bin/fixWireguard.sh: scripts/toInstall/fixWireguard.sh
 - shell:
+    - [ ~/.dotfiles/scripts/fixMacPortableKeyboard.sh, Fixing MacBook Air and MacBook Pro Keyboards]
     - [
         sudo apt install remmina remmina-plugin-vnc remmina-plugin-rdp nmap tmux nmon htop axel ssh zsh zsh-syntax-highlighting -y,
         Install packages Trevor likes.  If you dont, use something else.
@@ -54,11 +56,9 @@
     - [git submodule update --init --recursive, Installing submodules]
     - [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:
 #    "/home/tmerritt/Projects/dfr":
 #      url: "https://git.pyrocode.xyz/tmerritt/dfr.git"

scripts/installPackages.sh

@@ -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

scripts/setupRust.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo Setting up Rust dev environment
+
+# update with rustup
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s --  -y -q 
+
+# Installing Cargo plugins.
+cargo install cargo-cache