diff --git a/.gitignore b/.gitignore
index 3d4575f..09e9e2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 
 result*
-.direnv
+.direnv/
+
+flake.lock
+!/flake.lock
diff --git a/LICENSE b/LICENSE
index a5d8715..141fcbf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Kiana Sheibani
+Copyright (c) 2025 Kiana Sheibani
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..ca4a350
--- /dev/null
+++ b/README.md
@@ -0,0 +1,46 @@
+# Toki's Nix Flake Template Repository
+
+This is my personal collection of Nix flake templates for various programming
+languages and build systems.
+
+## Motivation
+
+There already exists a [semi-official repository of flake
+templates](https://github.com/NixOS/templates), so why make my own?
+
+I have a few different reasons:
+
+- **Comprehensiveness:** The official template repository is rather small and
+  doesn't have most of the templates I would actually want to use.
+- **Consistency:** The templates in the official repository are contributed by
+  community members, and there's very little stylistic or structural consistency
+  between them.
+- **Preference:** The structure of a flake can be very opinionated, and most of
+  the official flake templates are rather poorly constructed by my standards,
+  often not bothering to follow established best practices.
+
+## Usage
+
+Flake templates are used with the `nix flake init` command:
+
+```sh
+nix flake init -t git+https://git.tokinanpa.dev/toki/templates#<template>
+```
+
+Replace `<template>` with the template you want to use. In the simplest case,
+this is just the name of the programming language you want to use; the
+repository will pick a recommended default template for that language.
+
+If you want more control over the generated repository, you may select a
+specific template instead. Templates names are organized by underscore-separated
+*fields*; the number of fields may very depending on the language, but typically
+there are three or four:
+
+1. The programming language
+2. The build system used to compile/package the repository
+3. The Nix library/evaluation system used in the flake itself
+4. (Optional) Additional differences in project structure
+
+For example, the `python_pyproject_nixpkgs_cli` template generates a Python
+repository packaged in Pyproject format where the flake uses Nixpkgs' standard
+derivation builders (`buildPythonPackage`) and the repository exposes a CLI application.
diff --git a/bash/nixpkgs/flake.lock b/bash/nixpkgs/flake.lock
deleted file mode 100644
index 45fde49..0000000
--- a/bash/nixpkgs/flake.lock
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1722073938,
-        "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      }
-    },
-    "systems": {
-      "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/bash/nixpkgs/flake.nix b/bash/nixpkgs/flake.nix
index 9505679..266f871 100644
--- a/bash/nixpkgs/flake.nix
+++ b/bash/nixpkgs/flake.nix
@@ -10,8 +10,8 @@
       packages = eachSystem (system:
         let pkgs = nixpkgs.legacyPackages.${system};
         in {
-          soe = pkgs.callPackage ./package.nix {};
-          default = self.packages.${system}.soe;
+          hello = pkgs.callPackage ./package.nix {};
+          default = self.packages.${system}.hello;
         });
     };
 }
diff --git a/python/nixpkgs/.envrc b/bash/nixpkgs/hello
old mode 100644
new mode 100755
similarity index 50%
rename from python/nixpkgs/.envrc
rename to bash/nixpkgs/hello
index e4c941b..86f1c62
--- a/python/nixpkgs/.envrc
+++ b/bash/nixpkgs/hello
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-use flake ..#python
+echo "Hello, World!"
diff --git a/bash/nixpkgs/package.nix b/bash/nixpkgs/package.nix
index 20e14bc..458a1ce 100644
--- a/bash/nixpkgs/package.nix
+++ b/bash/nixpkgs/package.nix
@@ -1,10 +1,10 @@
-{ stdenv
+{ stdenvNoCC
 , bash
 }:
 
-stdenv.mkDerivation {
-  pname = "soe";
-  version = "1.0";
+stdenvNoCC.mkDerivation {
+  pname = "hello";
+  version = "0.1";
 
   src = ./.;
 
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp soe $out/bin
+    cp hello $out/bin
   '';
 }
diff --git a/bash/nixpkgs/soe b/bash/nixpkgs/soe
deleted file mode 100755
index e861d8f..0000000
--- a/bash/nixpkgs/soe
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-echo -n "Primes up to: "
-read num
-echo
-
-nums=()
-for i in `seq 2 $num`; do
-    nums+=($i)
-done
-
-unset nums[-1]
-
-while [ -n "$nums" ]; do
-    prime=${nums[0]}
-    echo -n "$prime "
-    nums_=()
-    for elem in "${nums[@]}"; do
-        [ $(( $elem % $prime )) -eq 0 ] || nums_+=($elem)
-    done
-    nums=(${nums_[@]})
-done
-
-echo
diff --git a/fish/nixpkgs/flake.lock b/fish/nixpkgs/flake.lock
deleted file mode 100644
index c44d5a5..0000000
--- a/fish/nixpkgs/flake.lock
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1722141560,
-        "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      }
-    },
-    "systems": {
-      "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/fish/nixpkgs/flake.nix b/fish/nixpkgs/flake.nix
index 9505679..266f871 100644
--- a/fish/nixpkgs/flake.nix
+++ b/fish/nixpkgs/flake.nix
@@ -10,8 +10,8 @@
       packages = eachSystem (system:
         let pkgs = nixpkgs.legacyPackages.${system};
         in {
-          soe = pkgs.callPackage ./package.nix {};
-          default = self.packages.${system}.soe;
+          hello = pkgs.callPackage ./package.nix {};
+          default = self.packages.${system}.hello;
         });
     };
 }
diff --git a/fish/nixpkgs/hello b/fish/nixpkgs/hello
new file mode 100755
index 0000000..98ecd49
--- /dev/null
+++ b/fish/nixpkgs/hello
@@ -0,0 +1,3 @@
+#!/usr/bin/env fish
+
+echo "Hello, World!"
diff --git a/fish/nixpkgs/package.nix b/fish/nixpkgs/package.nix
index aaeb6d2..6e6dcde 100644
--- a/fish/nixpkgs/package.nix
+++ b/fish/nixpkgs/package.nix
@@ -1,10 +1,10 @@
-{ stdenv
+{ stdenvNoCC
 , fish
 }:
 
-stdenv.mkDerivation {
-  pname = "soe";
-  version = "1.0";
+stdenvNoCC.mkDerivation {
+  pname = "hello";
+  version = "0.1";
 
   src = ./.;
 
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp soe $out/bin
+    cp hello $out/bin
   '';
 }
diff --git a/fish/nixpkgs/soe b/fish/nixpkgs/soe
deleted file mode 100755
index 5cc2b5a..0000000
--- a/fish/nixpkgs/soe
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env fish
-
-read -P "Primes up to: " num
-echo
-
-set nums (seq 2 $num)[..-2]
-
-while test -n "$nums"
-    set prime $nums[1]
-    echo -n "$prime "
-
-    set -e nums_
-    for elem in $nums
-        test (math $elem % $prime) -eq 0 || set -a nums_ $elem
-    end
-    set nums $nums_
-end
-
-echo
diff --git a/flake.nix b/flake.nix
index 6164411..9d558a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,17 @@
 {
-  description = "Templates of the Sieve of Eratosthenes implemented in various languages";
+  description = "Hello World flake templates for various languages and build systems";
 
   outputs = { self, ... }:
     let
+      aliases = {
+        bash = "bash_nixpkgs";
+        fish = "fish_nixpkgs";
+        python = "python_pyproject_nixpkgs_basic";
+      };
+
       # Get all project directories
       subdirs = dir:
-        let sub = builtins.readDir dir;
+        let sub = __readDir dir;
         in builtins.filter
           (d: sub.${d} == "directory")
           (builtins.attrNames sub);
@@ -16,28 +22,23 @@
         builtins.foldl' (x: y: x // y) {}
           (builtins.map func attr);
 
-      templateDirs =
-        builtins.concatMap (lang:
-          builtins.map
-            (pkg: { inherit lang pkg; })
-            (subdirs ./${lang}))
-          (subdirs ./.);
+      flakeSubdirs = dir:
+        builtins.concatMap (sub:
+          if builtins.pathExists /${dir}/${sub}/flake.nix then [ [ sub ] ] else
+            builtins.map (l: [ sub ] ++ l) (flakeSubdirs /${dir}/${sub}))
+          (subdirs dir);
     in {
-      templates = concatMapAttrs ({ lang, pkg }: {
-        "${lang}-${pkg}" = {
-          description = "Packaging a${if vowelStart lang
-                                      then "n"
-                                      else ""} ${lang} executable using ${pkg}";
+      templates = concatMapAttrs (path: {
+        ${builtins.concatStringsSep "_" path} = {
+          description = "${builtins.head path} template with ${builtins.concatStringsSep
+            ", " (builtins.tail path)}";
           path = builtins.filterSource
             (path: type: builtins.baseNameOf path != "flake.lock")
-            ./${lang}/${pkg};
+            (builtins.foldl' (dir: sub: /${dir}/${sub}) ./. path);
         };
-      }) templateDirs // concatMapAttrs (lang: {
-        "${lang}" = self.templates."${lang}-nixpkgs" // {
-          description = "Packaging a${if vowelStart lang
-                                      then "n"
-                                      else ""} ${lang} executable";
-        };
-      }) (subdirs ./.);
+      }) (flakeSubdirs ./.) // builtins.mapAttrs (lang: def:
+        self.templates.${def} // {
+          description = "${lang} template";
+      }) aliases;
     };
 }
diff --git a/python/nixpkgs/bin/soe b/python/nixpkgs/bin/soe
deleted file mode 100755
index 9ef8dcc..0000000
--- a/python/nixpkgs/bin/soe
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env python
-
-import soe
-soe.main()
diff --git a/python/nixpkgs/flake.lock b/python/nixpkgs/flake.lock
deleted file mode 100644
index c44d5a5..0000000
--- a/python/nixpkgs/flake.lock
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1722141560,
-        "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      }
-    },
-    "systems": {
-      "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/python/nixpkgs/package.nix b/python/nixpkgs/package.nix
deleted file mode 100644
index 961c388..0000000
--- a/python/nixpkgs/package.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ python3 }:
-
-python3.pkgs.buildPythonApplication {
-  pname = "soe";
-  version = "1.0";
-  src = ./.;
-
-  doCheck = false;
-}
diff --git a/python/nixpkgs/setup.py b/python/nixpkgs/setup.py
deleted file mode 100644
index 158092b..0000000
--- a/python/nixpkgs/setup.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from setuptools import setup
-
-setup(
-    name="soe",
-    version="1.0.0",
-    scripts=["bin/soe"]
-)
diff --git a/python/nixpkgs/shell.nix b/python/nixpkgs/shell.nix
deleted file mode 100644
index 332eaff..0000000
--- a/python/nixpkgs/shell.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{ python3 }:
-
-python3.buildEnv.env
diff --git a/python/nixpkgs/soe/main.py b/python/nixpkgs/soe/main.py
deleted file mode 100644
index f6a1425..0000000
--- a/python/nixpkgs/soe/main.py
+++ /dev/null
@@ -1,18 +0,0 @@
-
-def sieve_of_eratosthenes(n):
-    nums = list(range(2, n))
-    while nums:
-        prime = nums[0]
-        nums = [i for i in nums if i % prime]
-        yield prime
-
-def main():
-    num = int(input("Primes up to: "))
-    print()
-    for i in sieve_of_eratosthenes(num):
-        print(i, end=" ")
-    print()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/python/pyproject/nixpkgs/cli/.envrc b/python/pyproject/nixpkgs/cli/.envrc
new file mode 100644
index 0000000..af0cc93
--- /dev/null
+++ b/python/pyproject/nixpkgs/cli/.envrc
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+use flake
diff --git a/python/nixpkgs/flake.nix b/python/pyproject/nixpkgs/cli/flake.nix
similarity index 57%
rename from python/nixpkgs/flake.nix
rename to python/pyproject/nixpkgs/cli/flake.nix
index 9505679..0c2dc0d 100644
--- a/python/nixpkgs/flake.nix
+++ b/python/pyproject/nixpkgs/cli/flake.nix
@@ -10,8 +10,14 @@
       packages = eachSystem (system:
         let pkgs = nixpkgs.legacyPackages.${system};
         in {
-          soe = pkgs.callPackage ./package.nix {};
-          default = self.packages.${system}.soe;
+          hello = pkgs.callPackage ./package.nix {};
+          default = self.packages.${system}.hello;
+        });
+
+      devShells = eachSystem (system:
+        let pkgs = nixpkgs.legacyPackages.${system};
+        in {
+          default = pkgs.callPackage ./shell.nix {};
         });
     };
 }
diff --git a/python/pyproject/nixpkgs/cli/package.nix b/python/pyproject/nixpkgs/cli/package.nix
new file mode 100644
index 0000000..ce28631
--- /dev/null
+++ b/python/pyproject/nixpkgs/cli/package.nix
@@ -0,0 +1,20 @@
+{ python3
+}:
+
+python3.pkgs.buildPythonApplication {
+  pname = "hello";
+  version = "0.1";
+  src = ./.;
+
+  pyproject = true;
+  build-system = with python3.pkgs; [
+    # build-system.{requires,setup_requires}
+    setuptools
+  ];
+
+  dependencies = [
+    # Python package dependencies
+  ];
+
+  doCheck = false;
+}
diff --git a/python/pyproject/nixpkgs/cli/pyproject.toml b/python/pyproject/nixpkgs/cli/pyproject.toml
new file mode 100644
index 0000000..07e8dfb
--- /dev/null
+++ b/python/pyproject/nixpkgs/cli/pyproject.toml
@@ -0,0 +1,10 @@
+[project]
+name = "hello"
+version = "0.1.0"
+
+[project.scripts]
+hello = "hello:main"
+
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
diff --git a/python/pyproject/nixpkgs/cli/shell.nix b/python/pyproject/nixpkgs/cli/shell.nix
new file mode 100644
index 0000000..4a7e9e5
--- /dev/null
+++ b/python/pyproject/nixpkgs/cli/shell.nix
@@ -0,0 +1,8 @@
+{ mkShell
+, python3
+}:
+
+mkShell {
+  inputsFrom = [ python3.buildEnv.env ];
+  packages = [ python3.pkgs.python-lsp-server ];
+}
diff --git a/python/nixpkgs/soe/__init__.py b/python/pyproject/nixpkgs/cli/src/hello/__init__.py
similarity index 100%
rename from python/nixpkgs/soe/__init__.py
rename to python/pyproject/nixpkgs/cli/src/hello/__init__.py
diff --git a/python/pyproject/nixpkgs/cli/src/hello/main.py b/python/pyproject/nixpkgs/cli/src/hello/main.py
new file mode 100644
index 0000000..b1a4c27
--- /dev/null
+++ b/python/pyproject/nixpkgs/cli/src/hello/main.py
@@ -0,0 +1,6 @@
+
+def main():
+    print("Hello, World!")
+
+if __name__ == "__main__":
+    main()