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

---
 flake.lock                     | 12 ++++++------
 home.nix                       |  2 ++
 shell-scripts/kubeconfig-merge |  2 ++
 shell-scripts/nix-proxy        | 14 --------------
 4 files changed, 10 insertions(+), 20 deletions(-)
 create mode 100644 shell-scripts/kubeconfig-merge
 delete mode 100644 shell-scripts/nix-proxy

diff --git a/flake.lock b/flake.lock
index 25b55b2..f4628d3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,11 +39,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1670064435,
-        "narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=",
+        "lastModified": 1670242877,
+        "narHash": "sha256-jBLh7dRHnbfvPPA9znOC6oQfKrCPJ0El8Zoe0BqnCjQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c",
+        "rev": "6e51c97f1c849efdfd4f3b78a4870e6aa2da4198",
         "type": "github"
       },
       "original": {
@@ -55,11 +55,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1670083709,
-        "narHash": "sha256-UL4czXyVoKSCqAbNkfJEu2M+XhIVNwBGkyDt+UbtA5E=",
+        "lastModified": 1670439346,
+        "narHash": "sha256-forqFvUxaFZrgBc8fW6agn8ju4ULMJ6ubp0CWhhVA2Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e09913998d89659044c29ef5df4a86542e78a2ef",
+        "rev": "009093a2e1673a9d8d9e66c21f8de9a9ad064d85",
         "type": "github"
       },
       "original": {
diff --git a/home.nix b/home.nix
index 5f79189..af5a1ee 100644
--- a/home.nix
+++ b/home.nix
@@ -15,6 +15,8 @@
       docker
       kubectl
       k9s
+      kubernetes-helm
+      azure-cli
 
       htop
       fortune
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