commit 0d23d09d97bb6b113fdf2f6da4a9dfe4a9d3fc71
parent be82e85582063317a686d6f59ecb4edad0411d10
Author: Chris <chris@echoz.io>
Date: Fri, 21 Nov 2025 08:01:58 +0100
fix: separate out overlay and use it in home-manager module
Diffstat:
3 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -11,22 +11,13 @@
];
argsFor = system: {
inherit system;
- pkgs = nixpkgs.legacyPackages.${system}.extend (self: super: {
- # Remove when https://github.com/NixOS/nixpkgs/pull/463657
- # makes it to nixos-unstable
- wf-recorder = super.wf-recorder.overrideAttrs (prev: rec {
- version = "0.6.0";
- src = prev.src.override {
- rev = "v${version}";
- hash = "sha256-CY0pci2LNeQiojyeES5323tN3cYfS3m4pECK85fpn5I=";
- };
- patches = null;
- });
- });
+ pkgs = nixpkgs.legacyPackages.${system}.extend self.overlays.default;
};
forAllSystems = f: lib.genAttrs systems (system: f (argsFor system));
in
{
+ overlays.default = import ./overlay.nix;
+
devShells = forAllSystems (
{ pkgs, ... }:
{
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
@@ -36,13 +36,7 @@ in
};
config = {
- nixpkgs.overlays = lib.singleton (
- final: prev: {
- imsh-shot = final.callPackage ../imsh-shot { };
- imsh-cast = final.callPackage ../imsh-cast { };
- imsh-cast-monitor = final.callPackage ../imsh-cast-monitor { };
- }
- );
+ nixpkgs.overlays = [ (import ../overlay.nix) ];
programs.imsh-clients = {
imsh-shot.enable = lib.mkDefault cfg.enable;
diff --git a/overlay.nix b/overlay.nix
@@ -0,0 +1,16 @@
+self: super: {
+ imsh-shot = self.callPackage ./imsh-shot { };
+ imsh-cast = self.callPackage ./imsh-cast { };
+ imsh-cast-monitor = self.callPackage ./imsh-cast-monitor { };
+
+ # Remove when https://github.com/NixOS/nixpkgs/pull/463657
+ # makes it to nixos-unstable
+ wf-recorder = super.wf-recorder.overrideAttrs (prev: rec {
+ version = "0.6.0";
+ src = prev.src.override {
+ rev = "v${version}";
+ hash = "sha256-CY0pci2LNeQiojyeES5323tN3cYfS3m4pECK85fpn5I=";
+ };
+ patches = null;
+ });
+}