From 9c992291ef75c6be996a444e7ea9c37c5befff64 Mon Sep 17 00:00:00 2001
From: Gabriel Simmer <gabriel@gitgalaxy.com>
Date: Sat, 29 Oct 2022 17:37:47 +0100
Subject: [PATCH] New nix flake shell

---
 .envrc            |  5 ++++-
 flake.lock        | 43 +++++++++++++++++++++++++++++++++++++++++++
 flake.nix         | 21 +++++++++++++++++++++
 homelab/ntfy.yaml |  2 +-
 shell.nix         |  9 ---------
 5 files changed, 69 insertions(+), 11 deletions(-)
 create mode 100644 flake.lock
 create mode 100644 flake.nix
 delete mode 100644 shell.nix

diff --git a/.envrc b/.envrc
index 051d09d..5e9005b 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,4 @@
-eval "$(lorri direnv)"
+if ! has nix_direnv_version || ! nix_direnv_version 2.1.1; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.1.1/direnvrc" "sha256-b6qJ4r34rbE23yWjMqbmu3ia2z4b2wIlZUksBke/ol0="
+fi
+use flake
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..4f20cca
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,43 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1666926733,
+        "narHash": "sha256-+gYfOEnQVISPDRNoWm2VJD5OEuTUySt48RchLpvm61o=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f44ba1be526c8da9e79a5759feca2365204003f6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..b6094c8
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,21 @@
+{
+  description = "A basic flake with a shell";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = nixpkgs.legacyPackages.${system};
+    in {
+      devShells.default = pkgs.mkShell {
+        nativeBuildInputs = [
+          pkgs.terraform
+          pkgs.ansible
+          pkgs.kubectl
+          pkgs.nodePackages.yaml-language-server
+          pkgs.k9s
+        ];
+        buildInputs = [ ];
+      };
+    });
+}
diff --git a/homelab/ntfy.yaml b/homelab/ntfy.yaml
index 2c078cc..e57b1d6 100644
--- a/homelab/ntfy.yaml
+++ b/homelab/ntfy.yaml
@@ -50,6 +50,6 @@ data:
   server.yml: |
     # Template: https://github.com/binwiederhier/ntfy/blob/main/server/server.yml
     base-url: https://ntfy.gmem.ca
-    behind-proxy: false
+    behind-proxy: true
     upstream-base-url: "https://ntfy.sh"
 
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index 59c9002..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-  pkgs.mkShell {
-    buildInputs = [
-        pkgs.awscli2
-        pkgs.terraform
-        pkgs.kubernetes-helm
-        pkgs.kubernetes
-    ];
-}
\ No newline at end of file