From dfca95538d690accc8c9068e1aa449d0d027a69a Mon Sep 17 00:00:00 2001
From: Mike Vink <mike1994vink@gmail.com>
Date: Tue, 24 Jan 2023 15:52:39 +0000
Subject: update flake template

---
 flake-template/flake.nix  | 42 ------------------------------------------
 flake.nix                 |  5 +++++
 home.nix                  |  2 +-
 templates/flake/.envrc    |  4 ++++
 templates/flake/flake.nix | 42 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 52 insertions(+), 43 deletions(-)
 delete mode 100644 flake-template/flake.nix
 create mode 100644 templates/flake/.envrc
 create mode 100644 templates/flake/flake.nix

diff --git a/flake-template/flake.nix b/flake-template/flake.nix
deleted file mode 100644
index bd88f19..0000000
--- a/flake-template/flake.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "nixpkgs";
-    nix-filter.url = "github:numtide/nix-filter";
-    flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs-terraform-providers-bin.url = "github:nix-community/nixpkgs-terraform-providers-bin";
-    nixpkgs-terraform-providers-bin.inputs.nixpkgs.follows = "nixpkgs";
-    poetry2nix = {
-      url = "github:nix-community/poetry2nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-  outputs = {
-    self,
-    flake-utils,
-    ...
-  } @ inputs:
-    flake-utils.lib.eachDefaultSystem (system: let
-      pkgs =
-        import inputs.nixpkgs
-        {
-          inherit system;
-        };
-      python = pkgs.python310;
-      poetry = inputs.poetry2nix.packages.${system}.poetry;
-      inherit (inputs.poetry2nix.legacyPackages.${system}) mkPoetryEnv defaultPoetryOverrides;
-
-      more-providers = inputs.nixpkgs-terraform-providers-bin.legacyPackages.${system}.providers;
-      terraform = pkgs.terraform.withPlugins (p: [
-        more-providers.microsoft.azuredevops
-      ]);
-    in {
-      devShells.default = pkgs.mkShell {
-        name = "default-shell";
-        buildInputs = [
-          terraform
-          poetry
-          pkgs.nodejs
-        ];
-      };
-    });
-}
diff --git a/flake.nix b/flake.nix
index 47d9179..976f346 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,5 +50,10 @@
         home-manager = home-manager;
       };
     };
+
+    templates.default = {
+        path = ./templates/flake;
+        description = "nix flake new -t ~/flake";
+    };
   };
 }
diff --git a/home.nix b/home.nix
index 4c90e7c..2ce5ea5 100644
--- a/home.nix
+++ b/home.nix
@@ -58,7 +58,7 @@
       V = "xrandr --output HDMI1 --auto --output eDP1 --off";
       v = "xrandr --output eDP1 --auto --output HDMI1 --off";
       vV = "xrandr --output eDP1 --auto --output HDMI1 --off";
-      newflake = "nix flake new -t github:nix-community/nix-direnv ";
+      newflake = "nix flake new -t ~/flake ";
     };
   };
 
diff --git a/templates/flake/.envrc b/templates/flake/.envrc
new file mode 100644
index 0000000..1305de8
--- /dev/null
+++ b/templates/flake/.envrc
@@ -0,0 +1,4 @@
+if ! has nix_direnv_version || ! nix_direnv_version 2.2.0; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.0/direnvrc" "sha256-5EwyKnkJNQeXrRkYbwwRBcXbibosCJqyIUuz9Xq+LRc="
+fi
+use flake
diff --git a/templates/flake/flake.nix b/templates/flake/flake.nix
new file mode 100644
index 0000000..bd88f19
--- /dev/null
+++ b/templates/flake/flake.nix
@@ -0,0 +1,42 @@
+{
+  inputs = {
+    nixpkgs.url = "nixpkgs";
+    nix-filter.url = "github:numtide/nix-filter";
+    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs-terraform-providers-bin.url = "github:nix-community/nixpkgs-terraform-providers-bin";
+    nixpkgs-terraform-providers-bin.inputs.nixpkgs.follows = "nixpkgs";
+    poetry2nix = {
+      url = "github:nix-community/poetry2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+  outputs = {
+    self,
+    flake-utils,
+    ...
+  } @ inputs:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs =
+        import inputs.nixpkgs
+        {
+          inherit system;
+        };
+      python = pkgs.python310;
+      poetry = inputs.poetry2nix.packages.${system}.poetry;
+      inherit (inputs.poetry2nix.legacyPackages.${system}) mkPoetryEnv defaultPoetryOverrides;
+
+      more-providers = inputs.nixpkgs-terraform-providers-bin.legacyPackages.${system}.providers;
+      terraform = pkgs.terraform.withPlugins (p: [
+        more-providers.microsoft.azuredevops
+      ]);
+    in {
+      devShells.default = pkgs.mkShell {
+        name = "default-shell";
+        buildInputs = [
+          terraform
+          poetry
+          pkgs.nodejs
+        ];
+      };
+    });
+}
-- 
cgit v1.2.3