daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-22 10:10:45 -06:00
Code Issues Projects Releases Packages Wiki Activity

add overlayfrom

Browse source
This commit is contained in:
Daylin Morgan 2024-07-25 10:00:34 -05:00
parent 4da9ef467c
commit 1996233a7f
Signed by: daylin
GPG key ID: 950D13E9719334AD
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/checks.nix
View file

@ -5,14 +5,15 @@
}: }:
let let
inherit (builtins) map; inherit (builtins) map;
inherit (lib) pkgFromSystem pkgsFromSystem; inherit (lib) pkgFromSystem pkgsFromSystem overlayFrom;
pkgs = import inputs.nixpkgs { pkgs = import inputs.nixpkgs {
inherit system; inherit system;
overlays = [ overlays = map [
inputs.lix-module.overlays.default "lix-module"
inputs.hyprland-contrib.overlays.default "hyprland-contrib"
inputs.nixpkgs-wayland.overlay "nixpkgs-wayland" ]
]; overlayFrom
;
}; };
pkgsFrom = pkgsFromSystem system; pkgsFrom = pkgsFromSystem system;
pkgFrom = pkgFromSystem system; pkgFrom = pkgFromSystem system;

2
lib/extended.nix
View file

@ -75,6 +75,7 @@ let
# defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default"; # defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default";
pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}"; pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}";
pkgFromSystem = system: flake: (pkgsFromSystem system flake).default; pkgFromSystem = system: flake: (pkgsFromSystem system flake).default;
overlayFrom = flake: inputs."${flake}".overlays.default;
in in
{ {
inherit inherit
@ -91,5 +92,6 @@ in
flakeVer flakeVer
pkgsFromSystem pkgsFromSystem
pkgFromSystem pkgFromSystem
overlayFrom
; ;
} }

7
modules/desktop/window-managers/hyprland.nix
View file

@ -6,6 +6,7 @@
enabled, enabled,
pkgFrom, pkgFrom,
pkgsFrom, pkgsFrom,
overlayFrom,
... ...
}: }:
@ -56,8 +57,8 @@ mkOizysModule config "hyprland" {
]); ]);
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.hyprland-contrib.overlays.default (overlayFrom "hyprland-contrib")
# inputs.nixpkgs-wayland.overlay # (overlayFrom "nixpkgs-wayland")
# inputs.hyprland.overlays.default # (overlayFrom "hyprland")
]; ];
} }