overlays priority

This commit is contained in:
Filippo Berto 2024-10-22 21:31:32 +02:00
parent d7e02d7b05
commit f91ca25c01
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
3 changed files with 5 additions and 6 deletions

View file

@ -64,7 +64,6 @@
nix = { nix = {
inherit (nix-config) extraOptions; inherit (nix-config) extraOptions;
registry = { registry = {
# nixpkgs = { from = { id = "nixpkgs"; type = "indirect"; }; to = { owner = "nixos"; repo = "nixpkgs"; type = "github"; }; };
stable = { from = { id = "stable"; type = "indirect"; }; flake = inputs.nixpkgs; }; stable = { from = { id = "stable"; type = "indirect"; }; flake = inputs.nixpkgs; };
unstable = { from = { id = "unstable"; type = "indirect"; }; flake = inputs.nixpkgs-u; }; unstable = { from = { id = "unstable"; type = "indirect"; }; flake = inputs.nixpkgs-u; };
}; };
@ -213,7 +212,6 @@
}; };
flake = { flake = {
overlays = { overlays = {
default = inputs.self.overlays.packages; default = inputs.self.overlays.packages;

View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, lib, ... }:
with config.nix-rice.lib; with config.nix-rice.lib;
let let
theme = kitty-themes.getThemeByName "Nightfox"; theme = kitty-themes.getThemeByName "Nightfox";
@ -51,7 +51,7 @@ in
opacity = 0.95; opacity = 0.95;
}; };
nixpkgs.overlays = [ nixpkgs.overlays = lib.mkAfter [
(_self: super: { (_self: super: {
wl-lockscreen = super.wl-lockscreen.override { wl-lockscreen = super.wl-lockscreen.override {
strPalette = palette.toRgbaShortHex rice.colorPalette; strPalette = palette.toRgbaShortHex rice.colorPalette;

View file

@ -1,6 +1,6 @@
{ roboto { roboto
, swaylock , swaylock
, writeScriptBin , writeShellScriptBin
, wallpaper ? ../../wallpapers/n8ca4obsys991.png , wallpaper ? ../../wallpapers/n8ca4obsys991.png
, font ? { package = roboto; name = "Roboto"; size = 10; } , font ? { package = roboto; name = "Roboto"; size = 10; }
, strPalette ? { , strPalette ? {
@ -8,8 +8,9 @@
normal = { red = "ff0000ff"; green = "00ff00ff"; black = "000000ff"; }; normal = { red = "ff0000ff"; green = "00ff00ff"; black = "000000ff"; };
bright = { red = "ff1010ff"; green = "10ff10ff"; blue = "1010ffff"; }; bright = { red = "ff1010ff"; green = "10ff10ff"; blue = "1010ffff"; };
} }
}: writeScriptBin "wl-lockscreen" '' }: writeShellScriptBin "wl-lockscreen" ''
# Using font package ${font.package} # Using font package ${font.package}
# ${builtins.toJSON strPalette}
${swaylock}/bin/swaylock \ ${swaylock}/bin/swaylock \
--color "${strPalette.primary.background}" \ --color "${strPalette.primary.background}" \
--inside-ver-color "${strPalette.normal.green}" \ --inside-ver-color "${strPalette.normal.green}" \