From 76845745e34d2be8f1432505e563871972d98a21 Mon Sep 17 00:00:00 2001 From: Rune Juhl Jacobsen Date: Wed, 3 Jul 2024 09:05:45 +0200 Subject: [PATCH 1/2] Add _kubectl_config_merge for merging kube configs --- _kubectl_config_merge | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 _kubectl_config_merge diff --git a/_kubectl_config_merge b/_kubectl_config_merge new file mode 100755 index 0000000..cd67219 --- /dev/null +++ b/_kubectl_config_merge @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +# +# Merge kube config file on stdin with the existing kube config file. + +set -euo pipefail +tmp=$(mktemp) +new=$(mktemp) +cat > "${tmp}" + +function _exit() { + rm -f "${tmp}" "${new}" +} + +trap _exit EXIT + +export KUBECONFIG="${tmp}:${HOME}/.kube/config" +kubectl config view --merge --flatten > "${new}" +mv "${new}" ~/.kube/config From b1bccdf49f3e63976bd548cfe66fa2817374e7d1 Mon Sep 17 00:00:00 2001 From: Rune Juhl Jacobsen Date: Wed, 3 Jul 2024 09:07:35 +0200 Subject: [PATCH 2/2] Fix wrong gsettings path used --- toggle_theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toggle_theme b/toggle_theme index a16fcf4..2b2bc13 100755 --- a/toggle_theme +++ b/toggle_theme @@ -55,7 +55,7 @@ #(sh "gsettings" "set" "org.gnome.desktop.interface" (str % "-theme") gnome-theme) theme-preferences) (sh "gsettings" "set" "org.gnome.desktop.interface" "color-scheme" (str "prefer-" (name (next-theme)))) - (sh "gsettings" "set" "org.gnome.wm.preferences" "theme" gnome-theme) + (sh "gsettings" "set" "org.gnome.desktop.wm.preferences" "theme" gnome-theme) (run! #(sh "emacsclient" "--socket-name" % "--eval" (str "(load-theme '" ((:emacs themes) switch-to) ")"))