diff --git a/modules/niri/default.nix b/modules/niri/default.nix index 0471c91..0b43ef4 100644 --- a/modules/niri/default.nix +++ b/modules/niri/default.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: let +{ inputs, lib, config, pkgs, ... }: let inherit (lib) mkIf; inherit (config) withNiri username; in { @@ -7,6 +7,10 @@ in { ]; config = mkIf withNiri { + nixpkgs.overlays = mkIf config.withNiri [ + inputs.niri.overlays.niri + ]; + environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 4200d0f..934a6be 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -1,8 +1,4 @@ { inputs, ... }: { - imports = [ - ./nixpkgs.nix - ]; - nix = { nixPath = ["nixpkgs=${inputs.nixpkgs}"]; gc = { @@ -16,4 +12,9 @@ }; }; + nixpkgs = { + config = { + allowUnfree = true; + }; + }; } diff --git a/modules/nix/nixpkgs.nix b/modules/nix/nixpkgs.nix deleted file mode 100644 index 2f20788..0000000 --- a/modules/nix/nixpkgs.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ inputs, lib, config, ... }: let - inherit (lib) mkIf; -in{ - nixpkgs = { - overlays = mkIf config.withNiri [ - inputs.niri.overlays.niri - ]; - - config = { - allowUnfree = true; - }; - }; -}