Merge pull request #3 from nix-open-org/format-with-nixfmt-rfc-style

nix-open-org · Feb 23, 2024 · 6a0a494 · 6a0a494
2 parents 6923bcf + 22cb077
commit 6a0a494
Show file tree

Hide file tree

Showing 5 changed files with 220 additions and 161 deletions.
diff --git a/data.nix b/data.nix
@@ -109,9 +109,7 @@
       homepage = "https://github.com/NixOS/foundation";
       matrixRoom = "#foundation:nixos.org";
       leader = null;
-      members = [
-        "edolstra"
-      ];
+      members = [ "edolstra" ];
     };
 
     moderation = {
@@ -124,8 +122,7 @@
       '';
       homepage = "https://github.com/NixOS/moderation";
       matrixRoom = "#moderation:nixos.org";
-      members = [
-      ];
+      members = [ ];
     };
 
     marketing = {
@@ -138,8 +135,7 @@
       '';
       homepage = "https://github.com/NixOS/marketing";
       matrixRoom = "#marketing:nixos.org";
-      members = [
-      ];
+      members = [ ];
     };
 
     nix = {
@@ -150,8 +146,7 @@
       '';
       homepage = "https://github.com/NixOS/nix";
       matrixRoom = "#nix-dev:nixos.org";
-      members = [
-      ];
+      members = [ ];
     };
   };
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,24 +1,44 @@
 {
-  description = "A very basic flake";
+  description = "NixOS organization";
 
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
   inputs.systems.url = "github:nix-systems/default";
+  inputs.treefmt-nix.url = "github:numtide/treefmt-nix";
+  inputs.treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
 
-  outputs = { self, nixpkgs, systems }:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      systems,
+      treefmt-nix,
+    }:
     let
-      eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system:
-        f nixpkgs.legacyPackages.${system});
+      eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
     in
     {
-      devShells = eachSystem (pkgs:
-        {
+      devShells = eachSystem (
+        pkgs: {
           default = pkgs.mkShell {
             packages = [
               pkgs.findutils
               pkgs.gnumake
             ];
           };
-        });
-      packages = eachSystem (pkgs:
+        }
+      );
+
+      formatter = eachSystem (
+        pkgs:
+        treefmt-nix.lib.mkWrapper pkgs {
+          projectRootFile = "flake.nix";
+          # See https://github.com/numtide/treefmt-nix#supported-programs
+          programs.nixfmt-rfc-style.enable = true;
+        }
+      );
+
+      packages = eachSystem (
+        pkgs:
         let
           eval = nixpkgs.lib.evalModules {
             modules = [
@@ -36,14 +56,14 @@
               cat ${readmeFile}
             '';
           };
-          updateReadme =
-            pkgs.writeShellApplication {
-              name = "update-readme";
-              text = ''
-                gitRoot=$(git rev-parse --show-toplevel)
-                cp ${readmeFile} "$gitRoot/README.md"
-              '';
-            };
-        });
+          updateReadme = pkgs.writeShellApplication {
+            name = "update-readme";
+            text = ''
+              gitRoot=$(git rev-parse --show-toplevel)
+              cp ${readmeFile} "$gitRoot/README.md"
+            '';
+          };
+        }
+      );
     };
 }
diff --git a/peribolos.nix b/peribolos.nix
@@ -1,6 +1,7 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
 }:
 
 buildGoModule rec {
@@ -27,4 +28,3 @@ buildGoModule rec {
     mainProgram = "peribolos";
   };
 }
-