diff --git a/.gitmodules b/.gitmodules index d64f726..f0f8634 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,6 +14,4 @@ [submodule "plugins/zsh-syntax-highlighting"] path = plugins/zsh-syntax-highlighting url = https://github.com/zsh-users/zsh-syntax-highlighting.git -[submodule "plugins/gradle-completion"] - path = plugins/gradle-completion - url = https://github.com/gradle/gradle-completion + diff --git a/configs/k8s/cx2.kubeconfig b/configs/k8s/cx2.kubeconfig index cdf9b0a..8ed8c32 100755 --- a/configs/k8s/cx2.kubeconfig +++ b/configs/k8s/cx2.kubeconfig @@ -1,20 +1,20 @@ apiVersion: v1 clusters: - cluster: - certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUyTXpNME5UazVNek13SGhjTk1qRXhNREExTVRnMU1qRXpXaGNOTXpFeE1EQXpNVGcxTWpFegpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUyTXpNME5UazVNek13V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFSNUhMZzh2OW50OFh6YkU2RUR6R2VMdzZNdXJ5Z1RuaDdGY2lrYXdLcWUKNjJFK2psUTRXcUVJVHNRaVRVNWFiKzNCczBZQnZSU2xWdWNhcGt4bjZkNTJvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVXZjRm9sdXVWeXR4K2Q0NGpkYmQyCm1iYzU4c2N3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnSWJkVUlGMjMyZXIzSjk4bVl1T2ZEYkVhMU9Ccm82KzYKcG9yM3VGdTFEbHNDSVFEMEtSRlNGZ2Zsd3dSWFRxMkpTb3VzM09oOE0wSzV3djBuVlFWL2V1ekxuZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - server: https://24.51.235.164:6443 - name: default + certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJpRENDQVMrZ0F3SUJBZ0lRUnlZZnJuT0cwd1FPWU5EZmZBUVNmVEFLQmdncWhrak9QUVFEQWpBVk1STXcKRVFZRFZRUUtFd3ByZFdKbGNtNWxkR1Z6TUI0WERUSTBNVEV5TnpFek5UUXhOVm9YRFRNME1URXlOVEV6TlRReApOVm93RlRFVE1CRUdBMVVFQ2hNS2EzVmlaWEp1WlhSbGN6QlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VICkEwSUFCTVNKMndHcUtpZGhKMDY3cE1NTlJ3YzZmbEZUREtHUEtvUHpqSjgyME14cWFuMm52c0VacUlSV252MVcKeEhRK1VKQ0dycnd1d2laa01lQ1lmd1FSOVh5allUQmZNQTRHQTFVZER3RUIvd1FFQXdJQ2hEQWRCZ05WSFNVRQpGakFVQmdnckJnRUZCUWNEQVFZSUt3WUJCUVVIQXdJd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFCkZnUVU4S1FJcmtqQzZiZHdCa3Fmem1DNitacFBmVFl3Q2dZSUtvWkl6ajBFQXdJRFJ3QXdSQUlnRmxZWVdjcjkKQ3ZHM3NxN1NYbUFWbk5UNVBpOERveTVOU0liTUFKVUVib3dDSUI2SSt5NklJMEpRTmQwRW15dFdIN2o3VjVSbApRb0g3Ny9MZkp2OUJ2MzRSCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + server: https://10.5.0.2:6443 + name: talos-default contexts: - context: - cluster: default - namespace: lillydev - user: default - name: default -current-context: default + cluster: talos-default + namespace: default + user: admin@talos-default + name: admin@talos-default +current-context: admin@talos-default kind: Config preferences: {} users: -- name: default +- name: admin@talos-default user: - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJUGtBSDRPTlRxWFF3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOak16TkRVNU9UTXpNQjRYRFRJeE1UQXdOVEU0TlRJeE0xb1hEVEl6TURjeApNVEV4TlRnME5Wb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJNM2JNY3VlYnNXSjBZT2UKdEtJeEU1VlM0djhVOFFRRVQ2azg3d1FheGhBcXE0Tnl2cWNmMFd5bWNQbzBFMVptd09CN1BDUEhndXAreVI1VApKcnZjUmo2alNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCU2hzQkM4WXJoaUR4ZnFUQzRqMFJqczBscUZiakFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQTJNVHREa2t2cE9XTW0vMmtWYjdtVXVoYWdvQzNGQ000aTdpZE4rczJPLzhDSUJhN1RlcXA5M1VqY2F3bQp4ejlhMkU1M05XcitUU1MrSU9RbGFwWmRJYlhSCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkakNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUyTXpNME5UazVNek13SGhjTk1qRXhNREExTVRnMU1qRXpXaGNOTXpFeE1EQXpNVGcxTWpFegpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUyTXpNME5UazVNek13V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFTWVlZK2ZwQTVrWnVpb2h6YUFaVitNem1BS0FBWXYrVXdoU203N09qU28Kekw5VW8vSEdGbFZxZFdVMFREb1VoS0JESjdNaVRCQ3JxUWxwSXdjNTVpQkJvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVW9iQVF2R0s0WWc4WDZrd3VJOUVZCjdOSmFoVzR3Q2dZSUtvWkl6ajBFQXdJRFJ3QXdSQUlnZmJ4ZHVraDBkWlhtN3ZlSldmZmQrUDJhQTdrZVJYSngKdzFLVjNJakw3MGNDSUNoMTBXelgxUmU0WVUrVGI2dVRmQ1BwSzJJK3NSVU0xa2hmdXRVeUloTFkKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= - client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU5NOXVhS2x3dzRmUzBiYjFuNHFkUzFRSUNuZFVrbHdTMTE3QVVFNHhLeUhvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFemRzeHk1NXV4WW5SZzU2MG9qRVRsVkxpL3hUeEJBUlBxVHp2QkJyR0VDcXJnM0srcHgvUgpiS1p3K2pRVFZtYkE0SHM4SThlQzZuN0pIbE1tdTl4R1BnPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo= + client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJoakNDQVN1Z0F3SUJBZ0lSQU9uNThVb09NM1ZwNEpGMWxLS0xObUV3Q2dZSUtvWkl6ajBFQXdJd0ZURVQKTUJFR0ExVUVDaE1LYTNWaVpYSnVaWFJsY3pBZUZ3MHlOREV4TWpjeE5EQTBNVFJhRncweU5URXhNamN4TkRBMApNalJhTUNreEZ6QVZCZ05WQkFvVERuTjVjM1JsYlRwdFlYTjBaWEp6TVE0d0RBWURWUVFERXdWaFpHMXBiakJaCk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkpSN3g3bHJhQUNHUHRRQ0VLcS9wbzhHN2dPK09LM2EKWjZIakxxaE5hWlZMcFFBd0ZVMXNtdDcyQXQrMVZnbjVDank4Syt0KzFqcjRwRzg4MFM5L3FIdWpTREJHTUE0RwpBMVVkRHdFQi93UUVBd0lGb0RBVEJnTlZIU1VFRERBS0JnZ3JCZ0VGQlFjREFqQWZCZ05WSFNNRUdEQVdnQlR3CnBBaXVTTUxwdDNBR1NwL09ZTHI1bWs5OU5qQUtCZ2dxaGtqT1BRUURBZ05KQURCR0FpRUEyak02ZEJhOFo4dk8KN0FzQWplNHNuMkFUNHBsUkZ3b01YRlJMNHpPZFY2Y0NJUUNvcU1xVm4vRFZWTkdkWW45RGpsMmJudUx2TFdjdwpHazdaaHd5cWJYWWcwQT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUo4VDV4Z2R6elM0bmFhRzc4d2dTRDRDN1VFQUNqVVppQXhpWkJoYXphbUdvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFbEh2SHVXdG9BSVkrMUFJUXFyK21qd2J1QTc0NHJkcG5vZU11cUUxcGxVdWxBREFWVFd5YQozdllDMzdWV0Nma0tQTHdyNjM3V092aWtienpSTDMrb2V3PT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo= diff --git a/configs/ssh/config b/configs/ssh/config index c27bef3..ff811bc 100644 --- a/configs/ssh/config +++ b/configs/ssh/config @@ -11,10 +11,6 @@ Host 10.1.21.99 Host 192.168.0.141 KexAlgorithms diffie-hellman-group-exchange-sha1 -Host git.pyrocode.xyz - Port 2222 - IdentitiesOnly yes - IdentityFile ~/.ssh/id_ed25519_ # entry generated by okteto Host 172.24.4.115 HostName 172.24.4.115 @@ -22,37 +18,13 @@ Host 172.24.4.115 Host 10.1.24.115 HostName 10.1.24.115 User tmerritt -# entry generated by okteto -Host api.okteto - ForwardAgent yes - PubkeyAcceptedKeyTypes +ssh-rsa - HostKeyAlgorithms +ssh-rsa - HostName 0.0.0.0 - Port 33293 - StrictHostKeyChecking no - UserKnownHostsFile /dev/null - IdentityFile "/home/tmerritt/.okteto/id_rsa_okteto" - IdentitiesOnly yes Host git.geekback.dev - Port 2222 IdentitiesOnly yes IdentityFile ~/.ssh/id_ed25519 # to generate new key # 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 - LogLevel error - Port 10463 - IdentityFile "/home/tmerritt/.devspace/ssh/id_devspace_ecdsa" - StrictHostKeyChecking no - UserKnownHostsFile /dev/null - User devspace -# DevSpace End app.lilly.devspace -Host 192.168.0.254 - KexAlgorithms +diffie-hellman-group1-sha1 - HostKeyAlgorithms=+ssh-dss +#Host 192.168.0.254 +# KexAlgorithms +diffie-hellman-group1-sha1 +# HostKeyAlgorithms=+ssh-dss diff --git a/configs/zsh/zshrc b/configs/zsh/zshrc index 9d477ca..0975176 100644 --- a/configs/zsh/zshrc +++ b/configs/zsh/zshrc @@ -156,6 +156,7 @@ export PATH="$PATH:/opt/node/bin" # Add Local scripts export PATH="$HOME/.local/bin:$PATH" +<<<<<<< Updated upstream # Add PS4 SDK export OO_PS4_TOOLCHAIN=/opt/ps4/OpenOrbis/PS4Toolchain @@ -167,8 +168,14 @@ export JAVA_HOME=/home/tmerritt/.sdkman/candidates/java/current/bin/java # Setup vitasdk export VITASDK=/usr/local/vitasdk export PATH="$VITASDK/bin:$PATH" +. "$HOME/.cargo/env" #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" +export VITASDK=/usr/local/vitasdk +export PATH=$VITASDK/bin:$PATH + +# opencode +export PATH=/home/tmerritt/.opencode/bin:$PATH diff --git a/install.conf.yaml b/install.conf.yaml index 50151ec..1b66830 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -4,12 +4,10 @@ relink: true - create: - ~/Projects - - ~/.kube - ~/.local/etc/vscode/generic - ~/.local/etc/vscode/kotlin - ~/.local/share/fonts - ~/.local/share/remmina - - ~/.local/etc/vscode/platformio - ~/.local/bin - link: # Bash @@ -36,28 +34,19 @@ glob: true path: configs/remmina/* relink: true - # K8S Stuff - ~/.kube/kubeconfig: configs/k8s/cx2.kubeconfig # Fonts ~/.local/share/fonts/MesloLGS NF Bold Italic.ttf: fonts/MesloLGS NF Bold Italic.ttf ~/.local/share/fonts/MesloLGS NF Italic.ttf: fonts/MesloLGS NF Italic.ttf ~/.local/share/fonts/MesloLGS NF Bold .ttf: fonts/MesloLGS NF Bold.ttf ~/.local/share/fonts/MesloLGS NF Regular.ttf: fonts/MesloLGS NF Regular.ttf ~/.local/share/fonts/Emoji.ttf: fonts/emoji.ttf - # 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. ] - [git submodule update --init --recursive, Installing submodules] - [fc-cache -fv, Updating Font Cache] - - [ - ~/.dotfiles/scripts/setupRust.sh, - Setting up Rust, - ] #- git: # "/home/tmerritt/Projects/dfr": # url: "https://git.pyrocode.xyz/tmerritt/dfr.git" diff --git a/scripts/fixMacPortableKeyboard.sh b/scripts/fixMacPortableKeyboard.sh deleted file mode 100755 index c6b9556..0000000 --- a/scripts/fixMacPortableKeyboard.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -if [ -f "/sys/module/hid_apple/parameters/fn_mode" ]; then - echo "Found a Mac! Lets see about the keyboard..." - if [ ! -f "/etc/modprobe.d/hid_apple.conf"]; then - echo "Applying runtime fix" - sudo su -c "echo -n 0x02 > /sys/module/hid_apple/parameters/fnmode" - echo "Applying Boot fix..." - echo options hid_apple fnmode=2 | sudo tee -a /etc/modprobe.d/hid_apple.conf - update-initramfs -u -k all - else - echo "Keyboard already fixed." - fi -else - echo "Not a mac." -fi diff --git a/scripts/installPackages.sh b/scripts/installPackages.sh index cfc4f02..5e770fa 100755 --- a/scripts/installPackages.sh +++ b/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 sccache -y + nmap tmux nmon htop -y diff --git a/scripts/krew.plugins.txt b/scripts/krew.plugins.txt deleted file mode 100644 index f16732f..0000000 --- a/scripts/krew.plugins.txt +++ /dev/null @@ -1,20 +0,0 @@ -deprecations -view-utilization -unused-volumes -tunnel -sniff -sick-pods -reap -pvmigrate -prune-unused -doctor -images -ingress-nginx -janitor -kurt -minio -neat -net-forward -open-svc -outdated -cert-manager diff --git a/scripts/setupHelm.sh b/scripts/setupHelm.sh deleted file mode 100755 index 3ffb5b5..0000000 --- a/scripts/setupHelm.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash diff --git a/scripts/setupKotlin.sh b/scripts/setupKotlin.sh deleted file mode 100755 index 7b777d7..0000000 --- a/scripts/setupKotlin.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -source ../VARIABLES - -curl -s "https://get.sdkman.io?rcupdate=false" | bash -source "$HOME/.sdkman/bin/sdkman-init.sh" || sdk version || echo "Try running \"source \ -\"$HOME/.sdkman/bin/sdkman-init.sh\"\"" - -# Update sdkman -sdk selfupdate force - -# install and setup Kotlin - yes | sdk install kotlin $KOTLIN_VERSION || true - sdk default kotlin $KOTLIN_VERSION || true - yes | sdk install kscript || true - -# Install and setup GraalVM and regular JDK - yes | sdk install java $GRAAL_VERSION || true - yes | sdk install java $JAVA_VERSION || true -sdk default java $JAVA_VERSION || true - -# Install and setup gradle -yes | sdk install gradle $GRADLE_VERSION || true -sdk default gradle || true diff --git a/scripts/setupKubectl.sh b/scripts/setupKubectl.sh deleted file mode 100755 index 2798ff9..0000000 --- a/scripts/setupKubectl.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -sudo apt-get update -sudo apt-get install -y apt-transport-https ca-certificates curl -sudo curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg -echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list - -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 \ No newline at end of file diff --git a/scripts/toInstall/fixWireguard.sh b/scripts/toInstall/fixWireguard.sh deleted file mode 100755 index 81f29af..0000000 --- a/scripts/toInstall/fixWireguard.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -sudo wg-quick down wg0 && systemctl restart networking