summaryrefslogtreecommitdiff
path: root/shell-scripts
diff options
context:
space:
mode:
Diffstat (limited to 'shell-scripts')
-rw-r--r--shell-scripts/kubeconfig-merge2
-rw-r--r--shell-scripts/nix-proxy14
2 files changed, 2 insertions, 14 deletions
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