flake: add missing overlay

Toqozz · Jan 12, 2024 · ce74597 · ce74597
1 parent 8e5632d
commit ce74597
Showing 1 changed file with 59 additions and 55 deletions.
diff --git a/flake.nix b/flake.nix
@@ -8,6 +8,61 @@
   };
 
   outputs = inputs@{ flake-parts, ... }:
+    let
+      inherit (builtins) fromTOML readFile;
+
+      cargoToml = fromTOML (readFile ./Cargo.toml);
+      version = "${cargoToml.package.version}";
+      mkWired =
+        { lib
+        , rustPlatform
+        , dbus
+        , dlib
+        , cairo
+        , pango
+        , pkg-config
+        , xorg
+        , ...
+        }:
+        rustPlatform.buildRustPackage {
+          name = "wired-${version}";
+
+          src = lib.cleanSource ./.;
+          cargoLock.lockFile = ./Cargo.lock;
+
+          # Requires dbus cairo and pango
+          # pkgconfig, glib and xorg are required for x11-crate
+          nativeBuildInputs = [ pkg-config ];
+          buildInputs = [
+            dbus
+            dlib
+            cairo
+            pango
+            xorg.libX11
+            xorg.libXi
+            xorg.libXrandr
+            xorg.libXcursor
+            xorg.libXScrnSaver
+          ];
+          # install extra files (i.e. the systemd service)
+          postInstall = ''
+            # /usr/bin/wired doesn't exist, here, because the binary will be somewhere in /nix/store,
+            # so this fixes the bin path in the systemd service and writes the updated file to the output dir.
+            mkdir -p $out/usr/lib/systemd/system
+            substitute ./wired.service $out/usr/lib/systemd/system/wired.service --replace /usr/bin/wired $out/bin/wired
+            # install example/default config files to etc/wired -- Arch packages seem to use etc/{pkg} for this,
+            # so there's precedent
+            install -Dm444 -t $out/etc/wired wired.ron wired_multilayout.ron
+          '';
+
+          meta = {
+            homepage = "https://github.com/Toqozz/wired-notify";
+            downloadPage = "https://github.com/Toqozz/wired-notify/releases";
+            license = lib.licenses.mit;
+            mainProgram = "wired";
+          };
+        };
+    in
     flake-parts.lib.mkFlake { inherit inputs; } {
 
       systems = [
@@ -17,64 +72,13 @@
 
       flake = {
         homeManagerModules.default = import ./home-manager.nix;
+
+        overlays.default = final: prev: {
+          wired = prev.callPackage mkWired { };
+        };
       };
 
       perSystem = { self', system, pkgs, ... }:
-        let
-          inherit (builtins) fromTOML readFile;
-
-          cargoToml = fromTOML (readFile ./Cargo.toml);
-          version = "${cargoToml.package.version}";
-          mkWired =
-            { lib
-            , rustPlatform
-            , dbus
-            , dlib
-            , cairo
-            , pango
-            , pkg-config
-            , xorg
-            , ...
-            }:
-            rustPlatform.buildRustPackage {
-              name = "wired-${version}";
-
-              src = lib.cleanSource ./.;
-              cargoLock.lockFile = ./Cargo.lock;
-
-              # Requires dbus cairo and pango
-              # pkgconfig, glib and xorg are required for x11-crate
-              nativeBuildInputs = [ pkg-config ];
-              buildInputs = [
-                dbus
-                dlib
-                cairo
-                pango
-                xorg.libX11
-                xorg.libXi
-                xorg.libXrandr
-                xorg.libXcursor
-                xorg.libXScrnSaver
-              ];
-              # install extra files (i.e. the systemd service)
-              postInstall = ''
-                # /usr/bin/wired doesn't exist, here, because the binary will be somewhere in /nix/store,
-                # so this fixes the bin path in the systemd service and writes the updated file to the output dir.
-                mkdir -p $out/usr/lib/systemd/system
-                substitute ./wired.service $out/usr/lib/systemd/system/wired.service --replace /usr/bin/wired $out/bin/wired
-                # install example/default config files to etc/wired -- Arch packages seem to use etc/{pkg} for this,
-                # so there's precedent
-                install -Dm444 -t $out/etc/wired wired.ron wired_multilayout.ron
-              '';
-
-              meta = {
-                homepage = "https://github.com/Toqozz/wired-notify";
-                downloadPage = "https://github.com/Toqozz/wired-notify/releases";
-                license = lib.licenses.mit;
-                mainProgram = "wired";
-              };
-            };
-        in
         {
           _module.args.pkgs = import inputs.nixpkgs {
             inherit system;