Skip to content

Commit 9a0880c

Browse files
lenkitelenkite
lenkite
authored and
lenkite
committed
WIP: wsl setup
1 parent d66929b commit 9a0880c

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

setup.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,9 @@ install_pkgs() {
263263
set +e
264264
sudo -E add-apt-repository -y ppa:neovim-ppa/unstable
265265
# install kubectl see: https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/#install-using-native-package-management
266-
curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.32/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
266+
if [[ ! -f "/etc/apt/keyrings/kubernetes-apt-keyring.gpg" ]]; then
267+
curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.32/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
268+
fi
267269
sudo chmod 644 /etc/apt/keyrings/kubernetes-apt-keyring.gpg # allow unprivileged APT programs to read this keyring
268270
sudo apt-get -y autoremove
269271
echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.32/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
@@ -274,8 +276,11 @@ sudo chmod 644 /etc/apt/sources.list.d/kubernetes.list # helps tools such as c
274276
sudo -E apt-get --yes install git curl zsh silversearcher-ag netcat-openbsd dh-autoreconf \
275277
autoconf tmux fortune-mod cowsay zip unzip python3 pipx jq yq exuberant-ctags \
276278
vim neovim nodejs rar unrar default-jdk rlwrap yarn zoxide ripgrep kubectl kubetail \
277-
btop bat gcc g++
279+
btop bat gcc g++ gh
280+
echo "Installing Deno..."
278281
curl -fsSL https://deno.land/install.sh | sh
282+
echo "Installing Rust..."
283+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
279284
fi
280285
fi
281286

zshcfg/zshenv

+2-2
Original file line numberDiff line numberDiff line change
@@ -287,5 +287,5 @@ export PATH
287287
main
288288

289289
if [[ -f "$HOME/.cargo/env" ]]; then
290-
fi
291-
. "$HOME/.cargo/env"
290+
. "$HOME/.cargo/env"
291+
fi

zshcfg/zshrc

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Add deno completions to search path
2+
if [[ ":$FPATH:" != *":/mnt/c/Users/I034796/.zsh/completions:"* ]]; then export FPATH="/mnt/c/Users/I034796/.zsh/completions:$FPATH"; fi
13
#supercrabtree vim: set sw=2 ts=2 sts=2 et tw=80 foldlevel=0 foldmethod=marker spell:
24
# See ZSH startup files at http://zsh.sourceforge.net/Intro/intro_3.html
35
# zshrc is sourced in interactive shells
@@ -93,6 +95,8 @@ zsh_plugins() {
9395
zgen oh-my-zsh plugins/vi-mode
9496
zgen oh-my-zsh themes/arrow
9597
zgen oh-my-zsh plugins/kubectl
98+
zgen load jeffreytse/zsh-vi-mode
99+
zgen load jonmosco/kube-ps1
96100
ZSH_HIGHLIGHT_STYLES[comment]='none' #https://github.com/zsh-users/zsh-syntax-highlighting/issues/510
97101
fi
98102
}
@@ -132,7 +136,7 @@ def_autoloads() {
132136

133137
# Autoloads
134138
# See https://unix.stackexchange.com/questions/33255/how-to-define-and-load-your-own-shell-function-in-zsh
135-
autoload -Uz compinit && compinit #Used for compdef function.
139+
autoload -Uz compinit && compinit -u #Used for compdef function.
136140
autoload -U promptinit && promptinit
137141
autoload -U colors && colors
138142
# See http://www.refining-linux.org/archives/36/ZSH-Gem-1-Programmable-file-renaming/
@@ -262,12 +266,17 @@ cloud_sdk() {
262266
if [[ -e "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc" ]]; then
263267
source "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc"
264268
fi
269+
if [[ -z "$TERMINAL" || -z "$GCTL_SESSION_ID" ]]; then
270+
export GCTL_SESSION_ID="my-dev"
271+
fi
265272
eval $(gardenctl kubectl-env zsh)
266273
}
267274

268275
prompt_setup() {
276+
if [[ -d "/opt/homebrew" ]]; then
269277
kube_ps1_dir=$(/opt/homebrew/bin/brew --prefix kube-ps1)/share
270278
[[ -d $kube_ps1_dir ]] && [[ -f $kube_ps1_dir/kube-ps1.sh ]] && source $kube_ps1_dir/kube-ps1.sh && PROMPT='$(kube_ps1)'$PROMPT
279+
fi
271280
}
272281

273282
source_my_zshrc() {
@@ -294,3 +303,4 @@ misc_alias() {
294303
main
295304

296305
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
306+
. "/mnt/c/Users/I034796/.deno/env"

0 commit comments

Comments
 (0)