From 38a314298b87fda283e921aa6280be414f95ae4c Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 2 Mar 2026 18:30:05 +0200 Subject: [PATCH 1/3] treewide: alejandra -> nixfmt --- flake.nix | 57 ++++++++++++++++++++++++++---------------------- nix/overlays.nix | 25 ++++++++++++++------- 2 files changed, 48 insertions(+), 34 deletions(-) diff --git a/flake.nix b/flake.nix index 1cc9a00..869921a 100644 --- a/flake.nix +++ b/flake.nix @@ -32,34 +32,39 @@ }; }; - outputs = { - self, - nixpkgs, - systems, - ... - } @ inputs: let - inherit (nixpkgs) lib; - eachSystem = lib.genAttrs (import systems); - pkgsFor = eachSystem (system: - import nixpkgs { - localSystem.system = system; - overlays = with self.overlays; [default]; + outputs = + { + self, + nixpkgs, + systems, + ... + }@inputs: + let + inherit (nixpkgs) lib; + eachSystem = lib.genAttrs (import systems); + pkgsFor = eachSystem ( + system: + import nixpkgs { + localSystem.system = system; + overlays = with self.overlays; [ default ]; + } + ); + in + { + overlays = import ./nix/overlays.nix { inherit inputs lib self; }; + + packages = eachSystem (system: { + default = self.packages.${system}.hyprlock; + inherit (pkgsFor.${system}) hyprlock; }); - in { - overlays = import ./nix/overlays.nix {inherit inputs lib self;}; - packages = eachSystem (system: { - default = self.packages.${system}.hyprlock; - inherit (pkgsFor.${system}) hyprlock; - }); + homeManagerModules = { + default = self.homeManagerModules.hyprlock; + hyprlock = builtins.throw "hyprlock: the flake HM module has been removed. Use the module from Home Manager upstream."; + }; - homeManagerModules = { - default = self.homeManagerModules.hyprlock; - hyprlock = builtins.throw "hyprlock: the flake HM module has been removed. Use the module from Home Manager upstream."; + checks = eachSystem (system: self.packages.${system}); + + formatter = eachSystem (system: pkgsFor.${system}.nixfmt-tree); }; - - checks = eachSystem (system: self.packages.${system}); - - formatter = eachSystem (system: pkgsFor.${system}.alejandra); - }; } diff --git a/nix/overlays.nix b/nix/overlays.nix index b15632e..e45fee9 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -2,15 +2,19 @@ lib, inputs, self, -}: 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) + ]); version = lib.removeSuffix "\n" (builtins.readFile ../VERSION); -in { +in +{ default = inputs.self.overlays.hyprlock; hyprlock = lib.composeManyExtensions [ @@ -21,7 +25,12 @@ in { (final: prev: { hyprlock = prev.callPackage ./default.nix { stdenv = prev.gcc15Stdenv; - version = version + "+date=" + (mkDate (inputs.self.lastModifiedDate or "19700101")) + "_" + (inputs.self.shortRev or "dirty"); + version = + version + + "+date=" + + (mkDate (inputs.self.lastModifiedDate or "19700101")) + + "_" + + (inputs.self.shortRev or "dirty"); inherit (final) hyprlang; shortRev = self.sourceInfo.shortRev or "dirty"; }; From 4db980ab478cd512c604e02fb251155ed913e2f8 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 2 Mar 2026 18:30:57 +0200 Subject: [PATCH 2/3] nix: separate overlay with deps --- flake.nix | 2 +- nix/overlays.nix | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 869921a..1c8dbcc 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ system: import nixpkgs { localSystem.system = system; - overlays = with self.overlays; [ default ]; + overlays = with self.overlays; [ hyprlock-with-deps ]; } ); in diff --git a/nix/overlays.nix b/nix/overlays.nix index e45fee9..6f6f7d4 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -17,23 +17,24 @@ in { default = inputs.self.overlays.hyprlock; - hyprlock = lib.composeManyExtensions [ + hyprlock-with-deps = lib.composeManyExtensions [ inputs.hyprgraphics.overlays.default inputs.hyprlang.overlays.default inputs.hyprutils.overlays.default inputs.hyprwayland-scanner.overlays.default - (final: prev: { - hyprlock = prev.callPackage ./default.nix { - stdenv = prev.gcc15Stdenv; - version = - version - + "+date=" - + (mkDate (inputs.self.lastModifiedDate or "19700101")) - + "_" - + (inputs.self.shortRev or "dirty"); - inherit (final) hyprlang; - shortRev = self.sourceInfo.shortRev or "dirty"; - }; - }) + self.overlays.hyprlock ]; + + hyprlock = final: prev: { + hyprlock = prev.callPackage ./default.nix { + stdenv = prev.gcc15Stdenv; + version = + version + + "+date=" + + (mkDate (inputs.self.lastModifiedDate or "19700101")) + + "_" + + (inputs.self.shortRev or "dirty"); + shortRev = self.sourceInfo.shortRev or "dirty"; + }; + }; } From 512e71d05cfb69b6dd5a5262bc6675845beddd4c Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 2 Mar 2026 18:31:14 +0200 Subject: [PATCH 3/3] flake.lock: update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index ac2cd54..75ba39c 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", + "lastModified": 1772461523, + "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", + "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", + "lastModified": 1772459629, + "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", + "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", "type": "github" }, "original": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1766160771, - "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", + "lastModified": 1772459870, + "narHash": "sha256-xxkK2Cvqxpf/4UGcJ/TyCwrvmiNWsKsJfFzHMp2bxis=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", + "rev": "e63f3a79334dec49f8eb1691f66f18115df04085", "type": "github" }, "original": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", + "lastModified": 1772459835, + "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", + "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "type": "github" }, "original": {