Use "nix fmt" as formatter command To get rid of "nix development .#fhs-fish". It's also simple and easier to migrate to other formatter frontend.

Changes

1 changed files (+29/-26)

• flake.nix
  • @@ -42,21 +42,13 @@
    } ); - devShells = forEachSystems ( - { pkgs, system }: - let - dev-packages = - pkgs: - with pkgs; - [ - # > Zig LSP implementation + Zig Language Server - # https://github.com/zigtools/zls - zls - - # > Tool for compliance with the REUSE Initiative recommendations - # https://github.com/fsfe/reuse-tool - # https://reuse.software/ - reuse + formatter = forEachSystems ( + { pkgs, ... }: + pkgs.buildFHSEnv { + name = "devshell-fhs-fish"; + targetPkgs = + pkgs: with pkgs; [ + zig # > Code formatting platform written in Rust # https://dprint.dev/
  • @@ -69,19 +61,30 @@
    # > Official formatter for Nix code # https://github.com/NixOS/nixfmt nixfmt - ] - ++ (pkgs.lib.lists.remove pkgs.zig.hook packages.${system}.gtk.nativeBuildInputs) - ++ packages.${system}.gtk.buildInputs; - in + ]; + runScript = "dprint fmt"; + } + ); + + devShells = forEachSystems ( + { pkgs, system }: { - default = pkgs.mkShell { packages = dev-packages pkgs; }; + default = pkgs.mkShell { + packages = + with pkgs; + [ + # > Zig LSP implementation + Zig Language Server + # https://github.com/zigtools/zls + zls - fhs-fish = - (pkgs.buildFHSEnv { - name = "devshell-fhs-fish"; - targetPkgs = dev-packages; - runScript = "fish"; - }).env; + # > Tool for compliance with the REUSE Initiative recommendations + # https://github.com/fsfe/reuse-tool + # https://reuse.software/ + reuse + ] + ++ (pkgs.lib.lists.remove pkgs.zig.hook packages.${system}.gtk.nativeBuildInputs) + ++ packages.${system}.gtk.buildInputs; + }; } ); };