diff --git a/templates/avalonia/nix/pkg.nix b/templates/avalonia/default.nix
similarity index 100%
rename from templates/avalonia/nix/pkg.nix
rename to templates/avalonia/default.nix
diff --git a/templates/avalonia/nix/deps.nix b/templates/avalonia/deps.nix
similarity index 100%
rename from templates/avalonia/nix/deps.nix
rename to templates/avalonia/deps.nix
diff --git a/templates/avalonia/flake.nix b/templates/avalonia/flake.nix
index 1234e532..c6cdf615 100644
--- a/templates/avalonia/flake.nix
+++ b/templates/avalonia/flake.nix
@@ -13,7 +13,7 @@
           pkgs = import nixpkgs { inherit system; };
         in
         {
-          package.default = pkgs.callPackage ./nix/pkg.nix { };
-          devShells.default = pkgs.callPackage ./nix/shell.nix { };
-        }) // { nixosModules.default = ./nix/module.nix; };
+          package.default = pkgs.callPackage ./default.nix { };
+          devShells.default = pkgs.callPackage ./shell.nix { };
+        });
 }
diff --git a/templates/avalonia/nix/module.nix b/templates/avalonia/nix/module.nix
deleted file mode 100644
index d15fd81a..00000000
--- a/templates/avalonia/nix/module.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
-  cfg = config.app;
-  app = pkgs.callPackage ./pkg.nix { };
-in
-{
-  options = {
-    programs.app.enable = mkEnableOption "Enable app";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ app ];
-  };
-}
diff --git a/templates/avalonia/nix/shell.nix b/templates/avalonia/shell.nix
similarity index 100%
rename from templates/avalonia/nix/shell.nix
rename to templates/avalonia/shell.nix
diff --git a/templates/cmake-clang++/nix/pkg.nix b/templates/cmake-clang++/default.nix
similarity index 100%
rename from templates/cmake-clang++/nix/pkg.nix
rename to templates/cmake-clang++/default.nix
diff --git a/templates/cmake-clang++/flake.nix b/templates/cmake-clang++/flake.nix
index 8f460572..5d4060e4 100644
--- a/templates/cmake-clang++/flake.nix
+++ b/templates/cmake-clang++/flake.nix
@@ -13,7 +13,7 @@
           pkgs = import nixpkgs { inherit system; };
         in
         {
-          package.default = pkgs.callPackage ./nix/pkg.nix { };
-          devShells.default = pkgs.callPackage ./nix/shell.nix { };
-        }) // { nixosModules.default = ./nix/module.nix; };
+          package.default = pkgs.callPackage ./default.nix { };
+          devShells.default = pkgs.callPackage ./shell.nix { };
+        });
 }
diff --git a/templates/cmake-clang++/nix/module.nix b/templates/cmake-clang++/nix/module.nix
deleted file mode 100644
index d15fd81a..00000000
--- a/templates/cmake-clang++/nix/module.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
-  cfg = config.app;
-  app = pkgs.callPackage ./pkg.nix { };
-in
-{
-  options = {
-    programs.app.enable = mkEnableOption "Enable app";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ app ];
-  };
-}
diff --git a/templates/cmake-clang++/nix/shell.nix b/templates/cmake-clang++/shell.nix
similarity index 100%
rename from templates/cmake-clang++/nix/shell.nix
rename to templates/cmake-clang++/shell.nix
diff --git a/templates/compose-desktop/flake.nix b/templates/compose-desktop/flake.nix
index 2a377876..47aa396b 100644
--- a/templates/compose-desktop/flake.nix
+++ b/templates/compose-desktop/flake.nix
@@ -13,8 +13,7 @@
           pkgs = import nixpkgs { inherit system; };
         in
         {
-          package.default = pkgs.callPackage ./nix/pkg.nix { };
-          devShells.default = pkgs.callPackage ./nix/shell.nix { };
-        }) // { nixosModules.default = ./nix/module.nix; };
+          devShells.default = pkgs.callPackage ./shell.nix { };
+        });
 }
 
diff --git a/templates/compose-desktop/nix/module.nix b/templates/compose-desktop/nix/module.nix
deleted file mode 100644
index d15fd81a..00000000
--- a/templates/compose-desktop/nix/module.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
-  cfg = config.app;
-  app = pkgs.callPackage ./pkg.nix { };
-in
-{
-  options = {
-    programs.app.enable = mkEnableOption "Enable app";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ app ];
-  };
-}
diff --git a/templates/compose-desktop/nix/shell.nix b/templates/compose-desktop/shell.nix
similarity index 100%
rename from templates/compose-desktop/nix/shell.nix
rename to templates/compose-desktop/shell.nix
diff --git a/templates/flake/nix/pkg.nix b/templates/flake/default.nix
similarity index 100%
rename from templates/flake/nix/pkg.nix
rename to templates/flake/default.nix
diff --git a/templates/flake/flake.nix b/templates/flake/flake.nix
index d6ff3118..fc500ab8 100644
--- a/templates/flake/flake.nix
+++ b/templates/flake/flake.nix
@@ -13,7 +13,7 @@
           pkgs = import nixpkgs { inherit system; };
         in
         {
-          package.default = pkgs.callPackage ./nix/pkg.nix { };
-          devShells.default = pkgs.callPackage ./nix/shell.nix { };
-        }) // { nixosModules.default = ./nix/module.nix; };
+          package.default = pkgs.callPackage ./default.nix { };
+          devShells.default = pkgs.callPackage ./shell.nix { };
+        });
 }
diff --git a/templates/flake/nix/module.nix b/templates/flake/nix/module.nix
deleted file mode 100644
index d15fd81a..00000000
--- a/templates/flake/nix/module.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
-  cfg = config.app;
-  app = pkgs.callPackage ./pkg.nix { };
-in
-{
-  options = {
-    programs.app.enable = mkEnableOption "Enable app";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ app ];
-  };
-}
diff --git a/templates/flake/nix/shell.nix b/templates/flake/shell.nix
similarity index 87%
rename from templates/flake/nix/shell.nix
rename to templates/flake/shell.nix
index 869e9ddf..8759d225 100644
--- a/templates/flake/nix/shell.nix
+++ b/templates/flake/shell.nix
@@ -1,9 +1,7 @@
 { mkShell
 , nixd
 , nixpkgs-fmt
-, lib
 }:
-with lib;
 mkShell {
   nativeBuildInputs = [
     # Nix
diff --git a/templates/go/nix/pkg.nix b/templates/go/default.nix
similarity index 100%
rename from templates/go/nix/pkg.nix
rename to templates/go/default.nix
diff --git a/templates/go/flake.nix b/templates/go/flake.nix
index 398b4561..a28e2e64 100644
--- a/templates/go/flake.nix
+++ b/templates/go/flake.nix
@@ -13,7 +13,7 @@
           pkgs = import nixpkgs { inherit system; };
         in
         {
-          package.default = pkgs.callPackage ./nix/pkg.nix { };
-          devShells.default = pkgs.callPackage ./nix/shell.nix { };
-        }) // { nixosModules.default = ./nix/module.nix; };
+          package.default = pkgs.callPackage ./default.nix { };
+          devShells.default = pkgs.callPackage ./shell.nix { };
+        });
 }
diff --git a/templates/go/nix/module.nix b/templates/go/nix/module.nix
deleted file mode 100644
index d15fd81a..00000000
--- a/templates/go/nix/module.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
-  cfg = config.app;
-  app = pkgs.callPackage ./pkg.nix { };
-in
-{
-  options = {
-    programs.app.enable = mkEnableOption "Enable app";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ app ];
-  };
-}
diff --git a/templates/go/nix/shell.nix b/templates/go/shell.nix
similarity index 76%
rename from templates/go/nix/shell.nix
rename to templates/go/shell.nix
index ee80419f..12d3a756 100644
--- a/templates/go/nix/shell.nix
+++ b/templates/go/shell.nix
@@ -1,4 +1,10 @@
-{ mkShell, go, gotools, act, nixd, nixpkgs-fmt }: mkShell {
+{ mkShell
+, go
+, gotools
+, act
+, nixd
+, nixpkgs-fmt
+}: mkShell {
   hardeningDisable = [ "all" ];
 
   GOROOT = "${go}/share/go";