From ae6fbc1518d27f3aa94cedbdd20b52bbd11d873a Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Tue, 3 May 2022 11:10:57 +0200
Subject: [PATCH 01/10] Update kbash and kdjango to use kubectl plugins

---
 dot_config/fish/private_functions/kdjango.fish       | 3 +++
 dot_config/fish/private_functions/private_kbash.fish | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 dot_config/fish/private_functions/kdjango.fish

diff --git a/dot_config/fish/private_functions/kdjango.fish b/dot_config/fish/private_functions/kdjango.fish
new file mode 100644
index 0000000..8396f93
--- /dev/null
+++ b/dot_config/fish/private_functions/kdjango.fish
@@ -0,0 +1,3 @@
+function kdjango
+kubectl django $argv
+end
diff --git a/dot_config/fish/private_functions/private_kbash.fish b/dot_config/fish/private_functions/private_kbash.fish
index f81a784..72623b5 100644
--- a/dot_config/fish/private_functions/private_kbash.fish
+++ b/dot_config/fish/private_functions/private_kbash.fish
@@ -1,4 +1,3 @@
-# Defined interactively
 function kbash
-kubectl exec $argv -it -- bash
+kubectl $argv
 end

From 3d993206c4a5d66206b4b655215074182c5096a3 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Tue, 3 May 2022 11:11:50 +0200
Subject: [PATCH 02/10] Remove chezmoi remove

---
 dot_config/fish/private_functions/.chezmoiremove | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 dot_config/fish/private_functions/.chezmoiremove

diff --git a/dot_config/fish/private_functions/.chezmoiremove b/dot_config/fish/private_functions/.chezmoiremove
deleted file mode 100644
index c3a2550..0000000
--- a/dot_config/fish/private_functions/.chezmoiremove
+++ /dev/null
@@ -1,2 +0,0 @@
-kdjango.fish
-

From a5ce7f762a9fc2aa5cfe3bbcf7de16497a02f6a8 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Tue, 3 May 2022 11:16:34 +0200
Subject: [PATCH 03/10] Fix kbash

---
 dot_config/fish/private_functions/private_kbash.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dot_config/fish/private_functions/private_kbash.fish b/dot_config/fish/private_functions/private_kbash.fish
index 72623b5..40bcd3f 100644
--- a/dot_config/fish/private_functions/private_kbash.fish
+++ b/dot_config/fish/private_functions/private_kbash.fish
@@ -1,3 +1,3 @@
 function kbash
-kubectl $argv
+kubectl bash $argv
 end

From c1bf816d9e054fa0c60c9e947bcccb9aa58b307c Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Wed, 8 Jun 2022 13:43:42 +0200
Subject: [PATCH 04/10] Comment tide config

---
 dot_config/fish/private_config.fish.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dot_config/fish/private_config.fish.tmpl b/dot_config/fish/private_config.fish.tmpl
index 3290888..dbf9697 100644
--- a/dot_config/fish/private_config.fish.tmpl
+++ b/dot_config/fish/private_config.fish.tmpl
@@ -43,7 +43,7 @@ set -gx LIBRARY_PATH $LIBRARY_PATH /usr/local/opt/openssl/lib/
 set -gx EDITOR vim
 set -gx DJANGOPROJECT_DATA_DIR $HOME/.djangoproject
 
-set -g tide_right_prompt_items status cmd_duration context jobs virtual_env rustc go kubectl
+#set -g tide_right_prompt_items status cmd_duration context jobs virtual_env rustc go kubectl
 
 direnv hook fish | source
 alias wg "sudo wg"

From 141bc129ce84335fcaedae319fa772ba88c12b12 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Wed, 8 Jun 2022 13:47:59 +0200
Subject: [PATCH 05/10] Fix tide

---
 dot_config/fish/fish_plugins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dot_config/fish/fish_plugins b/dot_config/fish/fish_plugins
index ecc6642..666f377 100644
--- a/dot_config/fish/fish_plugins
+++ b/dot_config/fish/fish_plugins
@@ -4,4 +4,4 @@ evanlucas/fish-kubectl-completions
 franciscolourenco/done
 jorgebucaran/autopair.fish
 PatrickF1/fzf.fish
-IlanCosman/tide
+IlanCosman/tide@v5

From 6193fc935c9023ea35086511e5ec99209af8aa2c Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Wed, 8 Jun 2022 13:57:51 +0200
Subject: [PATCH 06/10] Add upgrade command

---
 dot_config/fish/private_functions/upgrade.fish | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 dot_config/fish/private_functions/upgrade.fish

diff --git a/dot_config/fish/private_functions/upgrade.fish b/dot_config/fish/private_functions/upgrade.fish
new file mode 100644
index 0000000..77d7f65
--- /dev/null
+++ b/dot_config/fish/private_functions/upgrade.fish
@@ -0,0 +1,9 @@
+function upgrade --wraps=topgrade
+if not bw login --check
+set -x BW_SESSION (bw login --raw)
+end
+if not bw unlock --check
+set -x BW_SESSION (bw unlock --raw)
+end
+topgrade
+end

From 8b2b659e1dd976b5d6a57e9ed5e87038156fcee7 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Wed, 8 Jun 2022 13:58:43 +0200
Subject: [PATCH 07/10] Add topgrade config file

---
 dot_config/topgrade.toml | 102 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 dot_config/topgrade.toml

diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml
new file mode 100644
index 0000000..ed4477d
--- /dev/null
+++ b/dot_config/topgrade.toml
@@ -0,0 +1,102 @@
+# Don't ask for confirmations
+#assume_yes = true
+
+# Disable specific steps - same options as the command line flag
+disable = ["containers", "gem"]
+
+# Ignore failures for these steps
+#ignore_failures = ["powershell"]
+
+# Run specific steps - same options as the command line flag
+#only = ["system", "emacs"]
+
+# Do not ask to retry failed steps (default: false)
+#no_retry = true
+
+# Run inside tmux
+#run_in_tmux = true
+
+# List of remote machines with Topgrade installed on them
+#remote_topgrades = ["toothless", "pi", "parnas"]
+
+# Arguments to pass SSH when upgrading remote systems
+#ssh_arguments = "-o ConnectTimeout=2"
+
+# Path to Topgrade executable on remote machines
+#remote_topgrade_path = ".cargo/bin/topgrade"
+
+# Arguments to pass tmux when pulling Repositories
+#tmux_arguments = "-S /var/tmux.sock"
+
+# Do not set the terminal title
+#set_title = false
+
+# Display the time in step titles
+# display_time = true
+
+# Cleanup temporary or old files
+#cleanup = true
+
+[git]
+#max_concurrency = 5
+# Additional git repositories to pull
+#repos = [
+#    "~/src/*/",
+#    "~/.config/something"
+#]
+
+# Don't pull the predefined git repos
+#pull_predefined = false
+
+# Arguments to pass Git when pulling Repositories
+#arguments = "--rebase --autostash"
+
+[composer]
+#self_update = true
+
+# Commands to run before anything
+[pre_commands]
+#"Emacs Snapshot" = "rm -rf ~/.emacs.d/elpa.bak && cp -rl ~/.emacs.d/elpa ~/.emacs.d/elpa.bak"
+
+# Custom commands
+[commands]
+#"Python Environment" = "~/dev/.env/bin/pip install -i https://pypi.python.org/simple -U --upgrade-strategy eager jupyter"
+
+[brew]
+#greedy_cask = true
+
+[linux]
+# Arch Package Manager to use. Allowed values: autodetect, trizen, paru, yay, pikaur, pacman.
+#arch_package_manager = "pacman"
+# Arguments to pass yay (or paru) when updating packages
+#yay_arguments = "--nodevel"
+#show_arch_news = true
+#trizen_arguments = "--devel"
+#pikaur_arguments = ""
+#enable_tlmgr = true
+#emerge_sync_flags = "-q"
+#emerge_update_flags = "-uDNa --with-bdeps=y world"
+#redhat_distro_sync = false
+#rpm_ostree = false
+
+[windows]
+# Manually select Windows updates
+#accept_all_updates = false
+#open_remotes_in_new_terminal = true
+
+# Causes Topgrade to rename itself during the run to allow package managers
+# to upgrade it. Use this only if you installed Topgrade by using a package
+# manager such as Scoop to Cargo
+#self_rename = true
+
+[npm]
+# Use sudo if the NPM directory isn't owned by the current user
+#use_sudo = true
+
+[firmware]
+# Offer to update firmware; if false just check for and display available updates
+#upgrade = true
+
+[flatpak]
+# Use sudo for updating the system-wide installation
+#use_sudo = true

From a1f578822f110a92802c7293dae60b2fd1c386f7 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Fri, 17 Jun 2022 12:21:21 +0200
Subject: [PATCH 08/10] Add poetry config var token

---
 dot_config/fish/private_config.fish.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dot_config/fish/private_config.fish.tmpl b/dot_config/fish/private_config.fish.tmpl
index dbf9697..081e2c4 100644
--- a/dot_config/fish/private_config.fish.tmpl
+++ b/dot_config/fish/private_config.fish.tmpl
@@ -19,6 +19,7 @@ set -gx GITLABBER_CLONE_METHOD ssh
 set -gx GITLABBER_GIT_CONCURRENCY 10
 set -gx PYPI_USERNAME __token__
 set -gx PYPI_TOKEN {{ (bitwardenFields "item" "PyPi").token.value | quote }}
+set -gx POETRY_PYPI_TOKEN_PYPI $PYPI_TOKEN
 
 set -gx GITEA_TOKEN {{ (bitwardenFields "item" "git.augendre.info").fish_config_token.value | quote }}
 

From 98360f4a616260e02dca6cea30736087ed578600 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Fri, 17 Jun 2022 12:25:21 +0200
Subject: [PATCH 09/10] Add chezmoi functions & poetry token

---
 dot_config/fish/private_config.fish.tmpl             | 2 ++
 dot_config/fish/private_functions/chezmoiapply.fish  | 9 +++++++++
 dot_config/fish/private_functions/chezmoiupdate.fish | 9 +++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 dot_config/fish/private_functions/chezmoiapply.fish
 create mode 100644 dot_config/fish/private_functions/chezmoiupdate.fish

diff --git a/dot_config/fish/private_config.fish.tmpl b/dot_config/fish/private_config.fish.tmpl
index 081e2c4..dfbc378 100644
--- a/dot_config/fish/private_config.fish.tmpl
+++ b/dot_config/fish/private_config.fish.tmpl
@@ -20,6 +20,8 @@ set -gx GITLABBER_GIT_CONCURRENCY 10
 set -gx PYPI_USERNAME __token__
 set -gx PYPI_TOKEN {{ (bitwardenFields "item" "PyPi").token.value | quote }}
 set -gx POETRY_PYPI_TOKEN_PYPI $PYPI_TOKEN
+set -gx POETRY_HTTP_BASIC_PYPI_USERNAME $PYPI_USERNAME
+set -gx POETRY_HTTP_BASIC_PYPI_PASSWORD $PYPI_TOKEN
 
 set -gx GITEA_TOKEN {{ (bitwardenFields "item" "git.augendre.info").fish_config_token.value | quote }}
 
diff --git a/dot_config/fish/private_functions/chezmoiapply.fish b/dot_config/fish/private_functions/chezmoiapply.fish
new file mode 100644
index 0000000..779afac
--- /dev/null
+++ b/dot_config/fish/private_functions/chezmoiapply.fish
@@ -0,0 +1,9 @@
+function chezmoiapply
+if not bw login --check
+set -x BW_SESSION (bw login --raw)
+end
+if not bw unlock --check
+set -x BW_SESSION (bw unlock --raw)
+end
+chezmoi apply
+end
diff --git a/dot_config/fish/private_functions/chezmoiupdate.fish b/dot_config/fish/private_functions/chezmoiupdate.fish
new file mode 100644
index 0000000..4060fc4
--- /dev/null
+++ b/dot_config/fish/private_functions/chezmoiupdate.fish
@@ -0,0 +1,9 @@
+function chezmoiupdate
+if not bw login --check
+set -x BW_SESSION (bw login --raw)
+end
+if not bw unlock --check
+set -x BW_SESSION (bw unlock --raw)
+end
+chezmoi update
+end

From 5d4e5ade65e93533cfdc2b0b23972fa46ad2fe45 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Mon, 4 Jul 2022 14:46:09 +0200
Subject: [PATCH 10/10] Add krew

---
 dot_config/fish/private_config.fish.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dot_config/fish/private_config.fish.tmpl b/dot_config/fish/private_config.fish.tmpl
index dfbc378..c5e5eae 100644
--- a/dot_config/fish/private_config.fish.tmpl
+++ b/dot_config/fish/private_config.fish.tmpl
@@ -1,4 +1,4 @@
-fish_add_path /opt/homebrew/bin $HOME/.local/bin $HOME/.cargo/bin
+fish_add_path /opt/homebrew/bin $HOME/.local/bin $HOME/.cargo/bin $HOME/.krew/bin
 set -gx VIRTUAL_ENV_DISABLE_PROMPT 1
 set -gx PYENV_ROOT ~/.pyenv
 set -gx PIPENV_PYTHON ~/.pyenv/shims/python