Merge pull request #43 from the-nix-way/empty-template

Add empty template and make various updates

.github/workflows/check.yml

@@ -0,0 +1,14 @@
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  check:
+    runs-on: "ubuntu-22.04"
+    steps:
+      - uses: "actions/checkout@v4"
+      - uses: "DeterminateSystems/nix-installer-action@main"
+      - uses: "DeterminateSystems/magic-nix-cache-action@main"
+      - name: Flake check
+        run: nix develop --command check

.github/workflows/flakehub-publish-tagged.yml

@@ -5,13 +5,14 @@ on:
 
 jobs:
   publish:
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
     permissions:
       id-token: "write"
       contents: "read"
     steps:
-      - uses: "actions/checkout@v3"
+      - uses: "actions/checkout@v4"
       - uses: "DeterminateSystems/nix-installer-action@main"
+      - uses: "DeterminateSystems/magic-nix-cache-action@main"
       - uses: "DeterminateSystems/flakehub-push@main"
         with:
           visibility: "public"

README.md

@@ -35,6 +35,7 @@ Once your preferred template has been initialized, you can use the provided shel
 | [Dhall]                  | [`dhall`](./dhall/)           |
 | [Elixir]                 | [`elixir`](./elixir/)         |
 | [Elm]                    | [`elm`](./elm/)               |
+| Empty (change at will)   | [`empty`](./empty)            |
 | [Gleam]                  | [`gleam`](./gleam/)           |
 | [Go]                     | [`go`](./go/)                 |
 | [Hashicorp] tools        | [`hashi`](./hashi/)           |
@@ -103,6 +104,10 @@ The sections below list what each template includes. In all cases, you're free t
 - [Elm] 0.19.1
 - [elm2nix]
 
+### [Empty](./empty/)
+
+A dev template that's fully customizable.
+
 ### [`gleam`](./gleam/)
 
 - [Gleam] 0.30.0

elixir/flake.nix

@@ -15,10 +15,12 @@
         default = pkgs.mkShell {
           packages = (with pkgs; [ elixir ]) ++
             # Linux only
-            pkgs.lib.optionals (pkgs.stdenv.isLinux) (with pkgs; [ gigalixir inotify-tools libnotify ]) ++
+            (pkgs.lib.optionals (pkgs.stdenv.isLinux)
+              (with pkgs; [ gigalixir inotify-tools libnotify ])) ++
             # macOS only
-            pkgs.lib.optionals (pkgs.stdenv.isDarwin) (with pkgs; [ terminal-notifier ]) ++
-            (with pkgs.darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices ]);
+            pkgs.lib.optionals (pkgs.stdenv.isDarwin)
+              ((with pkgs; [ terminal-notifier ]) ++
+                (with pkgs.darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices ]));
         };
       });
     };

empty/flake.nix

@@ -0,0 +1,39 @@
+{
+  description = "An empty flake template that you can adapt to your own environment";
+
+  # Flake inputs
+  inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
+
+  # Flake outputs
+  outputs = { self, nixpkgs }:
+    let
+      # The systems supported for this flake
+      supportedSystems = [
+        "x86_64-linux" # 64-bit Intel/AMD Linux
+        "aarch64-linux" # 64-bit ARM Linux
+        "x86_64-darwin" # 64-bit Intel macOS
+        "aarch64-darwin" # 64-bit ARM macOS
+      ];
+
+      # Helper to provide system-specific attributes
+      forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
+        pkgs = import nixpkgs { inherit system; };
+      });
+    in
+    {
+      devShells = forEachSupportedSystem ({ pkgs }: {
+        default = pkgs.mkShell {
+          # The Nix packages provided in the environment
+          # Add any you need here
+          packages = with pkgs; [ ];
+
+          # Set any environment variables for your dev shell
+          env = { };
+
+          # Add any shell logic you want executed any time the environment is activated
+          shellHook = ''
+          '';
+        };
+      });
+    };
+}

flake.nix

@@ -14,6 +14,17 @@
             format = prev.writeScriptBin "format" ''
               ${exec "nixpkgs-fmt"} **/*.nix
             '';
+
+            check = prev.writeScriptBin "check" ''
+              for dir in `ls -d */`; do # Iterate through all the templates
+                (
+                  cd $dir
+
+                  nix flake check --all-systems --no-build
+                )
+              done
+            '';
+
             dvt = prev.writeScriptBin "dvt" ''
               if [ -z $1 ]; then
                 echo "no template specified"
@@ -28,12 +39,21 @@
                 --template \
                 "github:the-nix-way/dev-templates#''${TEMPLATE}"
             '';
+
             update = prev.writeScriptBin "update" ''
               for dir in `ls -d */`; do # Iterate through all the templates
                 (
                   cd $dir
-                  ${exec "nix"} flake update # Update flake.lock
-                  ${exec "nix"} flake check  # Make sure things work after the update
+
+                  echo "updating ''${dir}"
+
+                  # Update flake.lock
+                  nix flake update
+
+                  echo "checking ''${dir}"
+
+                  # Make sure things work after the update
+                  nix flake check --all-systems --no-build
                 )
               done
             '';
@@ -47,7 +67,7 @@
     {
       devShells = forEachSupportedSystem ({ pkgs }: {
         default = pkgs.mkShell {
-          packages = with pkgs; [ format update ];
+          packages = with pkgs; [ check format update ];
         };
       });
 
@@ -91,6 +111,11 @@
           description = "Elm development environment";
         };
 
+        empty = {
+          path = ./empty;
+          description = "Empty dev template that you can customize at will";
+        };
+
         gleam = {
           path = ./gleam;
           description = "Gleam development environment";

go/flake.nix

@@ -1,11 +1,11 @@
 {
-  description = "A Nix-flake-based Go 1.17 development environment";
+  description = "A Nix-flake-based Go 1.22 development environment";
 
   inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
 
   outputs = { self, nixpkgs }:
     let
-      goVersion = 20; # Change this to update the whole stack
+      goVersion = 22; # Change this to update the whole stack
       overlays = [ (final: prev: { go = prev."go_1_${toString goVersion}"; }) ];
       supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
       forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
@@ -16,8 +16,8 @@
       devShells = forEachSupportedSystem ({ pkgs }: {
         default = pkgs.mkShell {
           packages = with pkgs; [
-            # go 1.20 (specified by overlay)
-            go
+            # go 1.22 (specified by overlay)
+            go_1_22
 
             # goimports, godoc, etc.
             gotools