geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

frobar: Build zelbar on current nixpkgs

Browse source 
Reduces dependencies
This commit is contained in:
Geoffrey Frogeye 2025-12-05 12:12:45 +01:00
parent 42bcd2a9a2
commit 8cf1959759
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
flake.nix
View file

@ -6,7 +6,7 @@
onixpkgs.url = "nixpkgs/nixos-24.11"; onixpkgs.url = "nixpkgs/nixos-24.11";
nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs.url = "nixpkgs/nixos-25.05";
unixpkgs.url = "nixpkgs/nixos-unstable"; unixpkgs.url = "nixpkgs/nixos-unstable";
zelbarnixpkgs.url = "github:GeoffreyFrogeye/nixpkgs/zelbar"; zelbarnixpkgs.url = "github:wlcx/nixpkgs/zelbar";
# OS # OS
disko = { disko = {
url = "disko"; url = "disko";
@ -60,15 +60,15 @@
(import ./common/update-local-flakes/overlay.nix) (import ./common/update-local-flakes/overlay.nix)
nur.overlays.default nur.overlays.default
( (
# Cherry-pick packages from future # Cherry-pick packages from other places
self: super: self: super:
let let
upkgs = import unixpkgs { inherit (super) system; }; upkgs = import unixpkgs { inherit (super) system; };
zelbarpkgs = import zelbarnixpkgs { inherit (super) system; };
in in
{ {
hello = upkgs.hello; # Placeholder # hello = upkgs.hello; # Take package and dependencies: heavier
zelbar = zelbarpkgs.zelbar; # hello = super.callPackage "${unixpkgs}/pkgs/by-name/he/hello/package.nix" { }; # Take package only: not always possible
zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" { };
fluffychat = upkgs.fluffychat; # unstable so we have 2.0 which doesn't have security warnings fluffychat = upkgs.fluffychat; # unstable so we have 2.0 which doesn't have security warnings
} }
) )
@ -87,6 +87,7 @@
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = attrs // { specialArgs = attrs // {
# Cherry-pick packages from other places without overlays.
upkgs = import unixpkgs { upkgs = import unixpkgs {
inherit system; inherit system;
}; };

14
hm/desktop/frobar/default.nix
View file

@ -1,17 +1,11 @@
{ {
zelbarnixpkgs ? builtins.getFlake "github:GeoffreyFrogeye/nixpkgs/zelbar", zelbarnixpkgs ? builtins.getFlake "github:wlcx/nixpkgs/zelbar",
nixpkgs ? <nixpkgs>, nixpkgs ? <nixpkgs>,
pkgs ? import nixpkgs { pkgs ? import nixpkgs {
overlays = [ overlays = [
( (self: super: {
self: super: zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" { };
let })
zelbarpkgs = import zelbarnixpkgs { inherit (super) system; };
in
{
inherit (zelbarpkgs) zelbar;
}
)
]; ];
}, },
... ...