Replace nixpkgs-fmt with nixfmt-rfc-style

kachick · May 16, 2024 · cfc3da7 · cfc3da7
1 parent 7667a17
commit cfc3da7
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 25 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -18,7 +18,7 @@
   "nix.serverSettings": {
     "nil": {
       "formatting": {
-        "command": ["nixpkgs-fmt"]
+        "command": ["nixfmt"]
       }
     }
   }

diff --git a/Rakefile b/Rakefile
@@ -142,5 +142,6 @@ task :check_non_ruby do
   Rake::Task['dprint'].invoke
   sh('typos . .github .vscode')
   sh('yamlfmt -lint .')
-  sh('nixpkgs-fmt --check ./*.nix')
+  # nix fmt doesn't have check: https://github.com/NixOS/nix/issues/6918
+  sh("git ls-files '*.nix' | xargs nixfmt --check")
 end
diff --git a/flake.nix b/flake.nix
@@ -9,13 +9,21 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
       in
       rec {
-        devShells.default = with pkgs;
+        formatter = pkgs.nixfmt-rfc-style;
+        devShells.default =
+          with pkgs;
           mkShell {
             buildInputs = [
               # https://github.com/NixOS/nix/issues/730#issuecomment-162323824
@@ -30,35 +38,31 @@
               dprint
               tree
               nil
-              nixpkgs-fmt
+              nixfmt-rfc-style
               typos
               yamlfmt
             ];
           };
 
-        packages.ruby-ulid = pkgs.stdenv.mkDerivation
-          {
-            name = "ruby-ulid";
-            src = self;
-            installPhase = ''
-              mkdir -p $out/bin
-              cp -rf ./lib $out
-            '';
-            runtimeDependencies = [
-              pkgs.ruby_3_3
-            ];
-          };
+        packages.ruby-ulid = pkgs.stdenv.mkDerivation {
+          name = "ruby-ulid";
+          src = self;
+          installPhase = ''
+            mkdir -p $out/bin
+            cp -rf ./lib $out
+          '';
+          runtimeDependencies = [ pkgs.ruby_3_3 ];
+        };
 
         # `nix run`
         apps = {
           ruby = {
             type = "app";
-            program = with pkgs; lib.getExe (writeShellApplication
-              {
+            program =
+              with pkgs;
+              lib.getExe (writeShellApplication {
                 name = "ruby-with-ulid";
-                runtimeInputs = [
-                  ruby_3_3
-                ];
+                runtimeInputs = [ ruby_3_3 ];
                 text = ''
                   ruby -r"${packages.ruby-ulid}/lib/ulid" "$@"
                 '';
@@ -67,8 +71,9 @@
 
           irb = {
             type = "app";
-            program = with pkgs; lib.getExe (writeShellApplication
-              {
+            program =
+              with pkgs;
+              lib.getExe (writeShellApplication {
                 name = "irb-with-ulid";
                 runtimeInputs = [
                   ruby_3_3