From e63f3a79334dec49f8eb1691f66f18115df04085 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 2 Mar 2026 15:57:50 +0200 Subject: [PATCH] treewide: alejandra -> nixfmt --- flake.nix | 45 +++++++++++++++++++++++++-------------------- nix/overlays.nix | 23 ++++++++++++++--------- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/flake.nix b/flake.nix index f064d7a..5cf79d5 100644 --- a/flake.nix +++ b/flake.nix @@ -6,26 +6,31 @@ systems.url = "github:nix-systems/default-linux"; }; - outputs = { - self, - nixpkgs, - systems, - }: let - inherit (nixpkgs) lib; - eachSystem = lib.genAttrs (import systems); - pkgsFor = eachSystem (system: - import nixpkgs { - localSystem.system = system; - overlays = with self.overlays; [hyprutils]; + outputs = + { + self, + nixpkgs, + systems, + }: + let + inherit (nixpkgs) lib; + eachSystem = lib.genAttrs (import systems); + pkgsFor = eachSystem ( + system: + import nixpkgs { + localSystem.system = system; + overlays = with self.overlays; [ hyprutils ]; + } + ); + in + { + overlays = import ./nix/overlays.nix { inherit self lib; }; + + packages = eachSystem (system: { + default = self.packages.${system}.hyprutils; + inherit (pkgsFor.${system}) hyprutils hyprutils-debug hyprutils-with-tests; }); - in { - overlays = import ./nix/overlays.nix {inherit self lib;}; - packages = eachSystem (system: { - default = self.packages.${system}.hyprutils; - inherit (pkgsFor.${system}) hyprutils hyprutils-debug hyprutils-with-tests; - }); - - formatter = eachSystem (system: pkgsFor.${system}.alejandra); - }; + formatter = eachSystem (system: pkgsFor.${system}.nixfmt-tree); + }; } diff --git a/nix/overlays.nix b/nix/overlays.nix index 937971b..093b376 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -1,23 +1,28 @@ { self, lib, -}: let - mkDate = longDate: (lib.concatStringsSep "-" [ - (builtins.substring 0 4 longDate) - (builtins.substring 4 2 longDate) - (builtins.substring 6 2 longDate) - ]); +}: +let + mkDate = + longDate: + (lib.concatStringsSep "-" [ + (builtins.substring 0 4 longDate) + (builtins.substring 4 2 longDate) + (builtins.substring 6 2 longDate) + ]); ver = lib.removeSuffix "\n" (builtins.readFile ../VERSION); - version = ver + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); -in { + version = + ver + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); +in +{ default = self.overlays.hyprutils; hyprutils = final: prev: { hyprutils = final.callPackage ./default.nix { stdenv = final.gcc15Stdenv; inherit version; }; - hyprutils-debug = final.hyprutils.override {debug = true;}; + hyprutils-debug = final.hyprutils.override { debug = true; }; hyprutils-with-tests = final.hyprutils-debug; }; }