diff --git a/flake.nix b/flake.nix index 40bbaef..f19c713 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,6 @@ nix = { inherit (nix-config) extraOptions; registry = { - # nixpkgs = { from = { id = "nixpkgs"; type = "indirect"; }; to = { owner = "nixos"; repo = "nixpkgs"; type = "github"; }; }; stable = { from = { id = "stable"; type = "indirect"; }; flake = inputs.nixpkgs; }; unstable = { from = { id = "unstable"; type = "indirect"; }; flake = inputs.nixpkgs-u; }; }; @@ -213,7 +212,6 @@ }; flake = { - overlays = { default = inputs.self.overlays.packages; diff --git a/modules/nixos/rice.nix b/modules/nixos/rice.nix index 572fefc..085ff34 100644 --- a/modules/nixos/rice.nix +++ b/modules/nixos/rice.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, config, lib, ... }: with config.nix-rice.lib; let theme = kitty-themes.getThemeByName "Nightfox"; @@ -51,7 +51,7 @@ in opacity = 0.95; }; - nixpkgs.overlays = [ + nixpkgs.overlays = lib.mkAfter [ (_self: super: { wl-lockscreen = super.wl-lockscreen.override { strPalette = palette.toRgbaShortHex rice.colorPalette; diff --git a/pkgs/wl-lockscreen/default.nix b/pkgs/wl-lockscreen/default.nix index 24b029f..6f657ac 100644 --- a/pkgs/wl-lockscreen/default.nix +++ b/pkgs/wl-lockscreen/default.nix @@ -1,6 +1,6 @@ { roboto , swaylock -, writeScriptBin +, writeShellScriptBin , wallpaper ? ../../wallpapers/n8ca4obsys991.png , font ? { package = roboto; name = "Roboto"; size = 10; } , strPalette ? { @@ -8,8 +8,9 @@ normal = { red = "ff0000ff"; green = "00ff00ff"; black = "000000ff"; }; bright = { red = "ff1010ff"; green = "10ff10ff"; blue = "1010ffff"; }; } -}: writeScriptBin "wl-lockscreen" '' +}: writeShellScriptBin "wl-lockscreen" '' # Using font package ${font.package} + # ${builtins.toJSON strPalette} ${swaylock}/bin/swaylock \ --color "${strPalette.primary.background}" \ --inside-ver-color "${strPalette.normal.green}" \