Compare commits
2 Commits
9b438def7b
...
551723abef
Author | SHA1 | Date | |
---|---|---|---|
551723abef | |||
b2a24ce42e |
23
flake.lock
generated
23
flake.lock
generated
@ -1357,7 +1357,8 @@
|
|||||||
"rust-overlay": "rust-overlay_2",
|
"rust-overlay": "rust-overlay_2",
|
||||||
"stylix": "stylix",
|
"stylix": "stylix",
|
||||||
"systems": "systems_7",
|
"systems": "systems_7",
|
||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2",
|
||||||
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
@ -1711,6 +1712,26 @@
|
|||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"zen-browser": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs-unstable"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1740729275,
|
||||||
|
"narHash": "sha256-/0dJi65+7oBpfEYWrg4jihkEzAf975TVeOk+FpxaW6o=",
|
||||||
|
"owner": "youwen5",
|
||||||
|
"repo": "zen-browser-flake",
|
||||||
|
"rev": "17bd241d6a5692848b01737f595824a707de855a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "youwen5",
|
||||||
|
"repo": "zen-browser-flake",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
26
flake.nix
26
flake.nix
@ -85,6 +85,11 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
zen-browser = {
|
||||||
|
url = "github:youwen5/zen-browser-flake";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
};
|
||||||
|
|
||||||
rust-overlay = {
|
rust-overlay = {
|
||||||
url = "github:oxalica/rust-overlay";
|
url = "github:oxalica/rust-overlay";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@ -257,6 +262,26 @@
|
|||||||
inherit (packages) mopidy-autoplay google-fonts;
|
inherit (packages) mopidy-autoplay google-fonts;
|
||||||
atool-wrapped = packages.atool;
|
atool-wrapped = packages.atool;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
zen-browser-overlay = final: prev:
|
||||||
|
let
|
||||||
|
inherit (final) system callPackage;
|
||||||
|
|
||||||
|
input = inputs.zen-browser;
|
||||||
|
packages = input.packages.${system};
|
||||||
|
sources = builtins.fromJSON (builtins.readFile (input + "/sources.json"));
|
||||||
|
|
||||||
|
warnExists = name: value: let
|
||||||
|
pass = if prev ? ${name} then builtins.warn "zen-browser-overlay: Package `${name}` already exists. This overlay is no longer needed and should be removed." value else value;
|
||||||
|
in pass;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
zen-browser-bin = callPackage packages.zen-browser.override { };
|
||||||
|
zen-browser-unwrapped = warnExists "zen-browser-unwrapped" (callPackage packages.zen-browser-unwrapped.override {
|
||||||
|
inherit (sources.${system}) hash url;
|
||||||
|
inherit (sources) version;
|
||||||
|
});
|
||||||
|
};
|
||||||
in [
|
in [
|
||||||
# TODO delete this, transfer all packages to new-packages overlay
|
# TODO delete this, transfer all packages to new-packages overlay
|
||||||
packagesOverlay
|
packagesOverlay
|
||||||
@ -275,6 +300,7 @@
|
|||||||
inputs.rust-overlay.overlays.default
|
inputs.rust-overlay.overlays.default
|
||||||
inputs.nixfiles-assets.overlays.default
|
inputs.nixfiles-assets.overlays.default
|
||||||
nix-minecraft-patched-overlay
|
nix-minecraft-patched-overlay
|
||||||
|
zen-browser-overlay
|
||||||
];
|
];
|
||||||
|
|
||||||
systems = {
|
systems = {
|
||||||
|
@ -13,6 +13,7 @@ in {
|
|||||||
libreoffice-fresh
|
libreoffice-fresh
|
||||||
obsidian
|
obsidian
|
||||||
anki
|
anki
|
||||||
|
zen-browser-bin
|
||||||
|
|
||||||
# mapping/GIS
|
# mapping/GIS
|
||||||
qgis
|
qgis
|
||||||
|
Loading…
x
Reference in New Issue
Block a user