fix: overlays

This commit is contained in:
punkfairie 2025-05-27 21:10:27 -07:00
parent 68c0738d05
commit f717547060
Signed by: punkfairie
GPG key ID: B3C5488E9A1A7CA6
4 changed files with 8 additions and 9 deletions

View file

@ -1,5 +1,6 @@
{ {
marleylib, marleylib,
inputs,
inputs', inputs',
... ...
}: let }: let
@ -23,7 +24,7 @@ in {
}; };
sharedModules = [../home]; sharedModules = [../home];
extraSpecialArgs = {inherit marleylib inputs';}; extraSpecialArgs = {inherit marleylib inputs inputs';};
}; };
}; };
} }

View file

@ -1,6 +1,7 @@
{ {
lib, lib,
config, config,
inputs,
pkgs, pkgs,
... ...
}: let }: let
@ -9,6 +10,11 @@ in {
options.marleyos.programs.neovim.enable = lib.mkEnableOption "neovim"; options.marleyos.programs.neovim.enable = lib.mkEnableOption "neovim";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Has to be applied on the OS level to use in HM.
nixpkgs.overlays = [
(import ../../../overlays/marleyvim.nix {inherit inputs;})
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
neovim neovim
]; ];

View file

@ -3,7 +3,6 @@
config, config,
osConfig, osConfig,
lib, lib,
inputs,
pkgs, pkgs,
... ...
}: let }: let
@ -16,10 +15,6 @@ in {
mkEnableOption' "neovim" osCfg.enable; mkEnableOption' "neovim" osCfg.enable;
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
nixpkgs.overlays = [
(import ../../../overlays/marleyvim.nix {inherit inputs;})
];
home.packages = with pkgs; [ home.packages = with pkgs; [
nvim nvim
]; ];

View file

@ -4,7 +4,6 @@
osConfig, osConfig,
lib, lib,
pkgs, pkgs,
inputs,
... ...
}: let }: let
inherit (marleylib.module) mkEnableOption' enabled; inherit (marleylib.module) mkEnableOption' enabled;
@ -23,8 +22,6 @@ in {
}; };
config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) { config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
nixpkgs.overlays = [inputs.niri-flake.overlays.niri];
marleyos = { marleyos = {
shell.wayland = enabled; shell.wayland = enabled;
programs = { programs = {