From 466e15f6ae956e11be748e77bd8d31072e040f53 Mon Sep 17 00:00:00 2001
From: Mike Vink <mike1994vink@gmail.com>
Date: Thu, 8 Dec 2022 15:26:28 +0000
Subject: updates

---
 shell-scripts/kubeconfig-merge |  2 ++
 shell-scripts/nix-proxy        | 14 --------------
 2 files changed, 2 insertions(+), 14 deletions(-)
 create mode 100644 shell-scripts/kubeconfig-merge
 delete mode 100644 shell-scripts/nix-proxy

(limited to 'shell-scripts')

diff --git a/shell-scripts/kubeconfig-merge b/shell-scripts/kubeconfig-merge
new file mode 100644
index 0000000..31e09f6
--- /dev/null
+++ b/shell-scripts/kubeconfig-merge
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+KUBECONFIG=~/.kube/config:${PWD}/$1 kubectl config view --flatten > ~/.kube/config
diff --git a/shell-scripts/nix-proxy b/shell-scripts/nix-proxy
deleted file mode 100644
index f0b4ada..0000000
--- a/shell-scripts/nix-proxy
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-if [[ $(id -u) -ne 0 ]]; then
-    echo "Should be run with sudo privileges"
-    exit
-fi
-mkdir /run/systemd/system/nix-daemon.service.d/
-cat << EOF >/run/systemd/system/nix-daemon.service.d/override.conf 
-[Service]
-Environment="http_proxy=$http_proxy"
-Environment="https_proxy=$http_proxy"
-Environment="all_proxy=$http_proxy"
-EOF
-systemctl daemon-reload
-systemctl restart nix-daemon
-- 
cgit v1.2.3