Merge branch 'main' into test-mysql-cassandra

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,7 @@
+This document, adapted from [The Ruby Community Conduct Guideline](https://www.ruby-lang.org/en/conduct/), provides community guidelines for a safe, respectful, productive, and collaborative place for any person who is willing to contribute to the associated project. It applies to all “collaborative space”, which is defined as community communications channels (such as mailing lists, submitted patches, commit comments, etc.).
+
+- Participants will be tolerant of opposing views.
+- Participants must ensure that their language and actions are free of personal attacks and disparaging personal remarks.
+- When interpreting the words and actions of others, participants should always assume good intentions.
+- Behaviour which can be reasonably considered harassment will not be tolerated.
+

.github/workflows/ci.yaml

@@ -12,8 +12,17 @@ jobs:
     strategy:
       matrix:
         # Intel mac excluded; See https://github.com/juspay/services-flake/issues/231
-        system: [ x86_64-linux, aarch64-darwin ]
+        system: [x86_64-linux, aarch64-darwin]
     steps:
       - uses: actions/checkout@v4
+      - uses: cachix/cachix-action@v14
+        with:
+          name: services-flake
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          skipPush: true
       - name: om ci
         run: om ci --extra-access-tokens "github.com=${{ secrets.GITHUB_TOKEN }}" run --systems "${{ matrix.system }}"
+      # Push the Nix cache
+      - name: Push to cachix
+        if: github.ref == 'refs/heads/main'
+        run: nix --option system "${{ matrix.system }}" run ./dev#cachix-push

README.md

@@ -2,7 +2,7 @@
 
 # services-flake
 
-`services-flake` provides declarative, composable and reproducible services for Nix development environment, as a [process-compose-flake](https://github.com/Platonic-Systems/process-compose-flake) module (based on [flake-parts](https://flake.parts)). It enables users to have NixOS-like services on MacOS and Linux.
+`services-flake` provides declarative, composable and reproducible services for Nix development environment, as a [process-compose-flake](https://github.com/Platonic-Systems/process-compose-flake) module (based on [flake-parts](https://flake.parts)). It enables users to have NixOS-like services on macOS and Linux.
 
 ![Demo](./doc/demo.gif)
 
@@ -58,3 +58,10 @@ See <https://community.flake.parts/services-flake/contributing>
 ## Credits
 
 Thanks to [the devenv project](https://github.com/cachix/devenv/tree/main/src/modules/services), which originally inspired this project to provide the same for Nix flake users.
+
+### Thanks to all the contributors!
+
+<a href="https://github.com/juspay/services-flake/graphs/contributors">
+  <img src="https://contributors-img.web.app/image?repo=juspay/services-flake" alt="Contributors"/>
+</a>
+

dev/flake.nix

@@ -3,12 +3,10 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-root.url = "github:srid/flake-root";
-    treefmt-nix.url = "github:numtide/treefmt-nix";
-    pre-commit-hooks-nix = {
-      url = "github:cachix/pre-commit-hooks.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-stable.follows = "nixpkgs";
-    };
+    pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix";
+    pre-commit-hooks-nix.flake = false;
+    cachix-push.url = "github:juspay/cachix-push";
+
     # CI will override `services-flake` to run checks on the latest source
     services-flake.url = "github:juspay/services-flake";
   };
@@ -17,19 +15,15 @@
       systems = nixpkgs.lib.systems.flakeExposed;
       imports = [
         inputs.flake-root.flakeModule
-        inputs.treefmt-nix.flakeModule
-        inputs.pre-commit-hooks-nix.flakeModule
+        (inputs.pre-commit-hooks-nix + /flake-module.nix)
+        inputs.cachix-push.flakeModule
         ./nix/pre-commit.nix
       ];
-      perSystem = { pkgs, lib, config, ... }: {
-        treefmt = {
-          projectRoot = inputs.services-flake;
-          projectRootFile = "flake.nix";
-          # Even though pre-commit-hooks.nix checks it, let's have treefmt-nix
-          # check as well until #238 is fully resolved.
-          # flakeCheck = false; # pre-commit-hooks.nix checks this
-          programs = {
-            nixpkgs-fmt.enable = true;
+      perSystem = { self', pkgs, config, ... }: {
+        cachix-push = {
+          cacheName = "services-flake";
+          pathsToCache = {
+            devshell = self'.devShells.default;
           };
         };
         devShells.default = pkgs.mkShell {
@@ -39,7 +33,6 @@
             config.pre-commit.settings.tools.commitizen
           ];
           inputsFrom = [
-            config.treefmt.build.devShell
             config.pre-commit.devShell
           ];
           shellHook = ''

dev/nix/pre-commit.nix

@@ -5,7 +5,7 @@
       check.enable = true;
       settings = {
         hooks = {
-          treefmt.enable = true;
+          nixpkgs-fmt.enable = true;
           commitizen.enable = true;
         };
       };

doc/examples.md

@@ -2,3 +2,5 @@
 
 - [[share-services]]#
 - [[llm]]#
+- [[without-flake-parts]]#
+