feat(templates): updated template structure

Wittano · Jul 28, 2024 · c73b495 · c73b495
1 parent a2f37df
commit c73b495
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 93 deletions.
diff --git a/templates/avalonia/nix/pkg.nix → templates/avalonia/default.nix b/templates/avalonia/nix/pkg.nix → templates/avalonia/default.nix
diff --git a/templates/avalonia/nix/deps.nix → templates/avalonia/deps.nix b/templates/avalonia/nix/deps.nix → templates/avalonia/deps.nix
diff --git 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
diff --git a/templates/avalonia/nix/shell.nix → templates/avalonia/shell.nix b/templates/avalonia/nix/shell.nix → templates/avalonia/shell.nix
diff --git a/templates/cmake-clang++/nix/pkg.nix → templates/cmake-clang++/default.nix b/templates/cmake-clang++/nix/pkg.nix → templates/cmake-clang++/default.nix
diff --git 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
diff --git a/templates/cmake-clang++/nix/shell.nix → templates/cmake-clang++/shell.nix b/templates/cmake-clang++/nix/shell.nix → templates/cmake-clang++/shell.nix
diff --git 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
diff --git a/templates/compose-desktop/nix/shell.nix → templates/compose-desktop/shell.nix b/templates/compose-desktop/nix/shell.nix → templates/compose-desktop/shell.nix
diff --git a/templates/flake/nix/pkg.nix → templates/flake/default.nix b/templates/flake/nix/pkg.nix → templates/flake/default.nix
diff --git 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
diff --git a/templates/flake/nix/shell.nix → templates/flake/shell.nix b/templates/flake/nix/shell.nix → 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 → templates/go/default.nix b/templates/go/nix/pkg.nix → templates/go/default.nix
diff --git 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
diff --git a/templates/go/nix/shell.nix → templates/go/shell.nix b/templates/go/nix/shell.nix → 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";