From 715fe9936313980982ea14ef18d762a72bb07979 Mon Sep 17 00:00:00 2001
From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com>
Date: Tue, 14 Nov 2023 02:55:53 -0500
Subject: [PATCH] Fix references on default template

---
 .gitignore                   |   1 +
 flake.nix                    |   5 +
 templates/default/flake.lock | 195 -----------------------------------
 templates/default/flake.nix  |  11 +-
 4 files changed, 10 insertions(+), 202 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 templates/default/flake.lock

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..03fe62b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+templates/*/flake.lock
diff --git a/flake.nix b/flake.nix
index b692f0d..70c14d3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,5 +82,10 @@
               (parseVersions
                 (removeComments
                   (fileLines versionsFile)))));
+
+      templates.default = {
+        description = "TODO";
+        path = ./templates/default;
+      };
     };
 }
diff --git a/templates/default/flake.lock b/templates/default/flake.lock
deleted file mode 100644
index f92958d..0000000
--- a/templates/default/flake.lock
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "nodes": {
-    "asdf2nix": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-K7RTCFh0H5vOENol+LwB+5N6taJfFB4eIoOdfPIns4c=",
-        "path": "../..",
-        "type": "path"
-      },
-      "original": {
-        "path": "../..",
-        "type": "path"
-      }
-    },
-    "asdf2nix-python": {
-      "inputs": {
-        "nixpkgs-python": "nixpkgs-python"
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-5Mx7OsJrUjrBw+Vt2cx0rudCYGitbQtlhtyE1JTdCJs=",
-        "path": "../../plugins/python",
-        "type": "path"
-      },
-      "original": {
-        "path": "../../plugins/python",
-        "type": "path"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
-        "type": "github"
-      },
-      "original": {
-        "id": "flake-utils",
-        "type": "indirect"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1685974512,
-        "narHash": "sha256-WLPHpe96RbPRO9iDtCxgsYkadTheRq7wqXWdGpR6g7w=",
-        "owner": "domenkozar",
-        "repo": "nixpkgs",
-        "rev": "1102477695918daba466123cc2ef694ed3a49939",
-        "type": "github"
-      },
-      "original": {
-        "owner": "domenkozar",
-        "ref": "cpython-moduralize",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1699291058,
-        "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "nixos",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-python": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1698162272,
-        "narHash": "sha256-6rq0AcQnC3AiR9PGpQrZXeiPMCNpywQWtNdS9TxVxfs=",
-        "owner": "cachix",
-        "repo": "nixpkgs-python",
-        "rev": "7cbac423b7109805bb25c642043230c36d1952df",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "nixpkgs-python",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1699725108,
-        "narHash": "sha256-NTiPW4jRC+9puakU4Vi8WpFEirhp92kTOSThuZke+FA=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "911ad1e67f458b6bcf0278fa85e33bb9924fed7e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "asdf2nix": "asdf2nix",
-        "asdf2nix-python": "asdf2nix-python",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/templates/default/flake.nix b/templates/default/flake.nix
index 173e003..38ecf33 100644
--- a/templates/default/flake.nix
+++ b/templates/default/flake.nix
@@ -1,14 +1,12 @@
 {
   inputs = {
-    # TODO: Change to GH url
-    asdf2nix.url = "path:../..";
-    # TODO: Change to GH url
-    asdf2nix-python.url = "path:../../plugins/python";
+    asdf2nix-python.url = "github:sestrella/asdf2nix?dir=plugins/python";
+    asdf2nix.url = "github:sestrella/asdf2nix";
     flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   };
 
-  outputs = { self, asdf2nix, asdf2nix-python, flake-utils, nixpkgs }:
+  outputs = { self, asdf2nix-python, asdf2nix, flake-utils, nixpkgs }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
@@ -18,12 +16,11 @@
           plugins = {
             python = asdf2nix-python.lib.packageFromVersion;
           };
-          skipMissingPlugins = true;
         };
       in
       {
         devShells.default = pkgs.mkShell {
-          buildInputs = [ (builtins.attrValues packages) ];
+          buildInputs = [ packages.python ];
         };
       });
 }