From 5fa31498d281f6863d4a316fba3db3d1b847f77a Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Wed, 28 May 2025 18:42:59 +0100 Subject: [PATCH] stylix: drop unnecessary use of `self` in home-manager --- flake/modules.nix | 2 +- stylix/hm/default.nix | 31 +++++++++++++------------------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/flake/modules.nix b/flake/modules.nix index 08586de1..c8a93bd2 100644 --- a/flake/modules.nix +++ b/flake/modules.nix @@ -27,7 +27,7 @@ { pkgs, ... }@args: { imports = [ - (lib.modules.importApply ../stylix/hm inputs) + ../stylix/hm { stylix = { inherit inputs; diff --git a/stylix/hm/default.nix b/stylix/hm/default.nix index 976bb123..773881ce 100644 --- a/stylix/hm/default.nix +++ b/stylix/hm/default.nix @@ -1,32 +1,27 @@ -inputs: { lib, config, ... }: -# Imported modules which define new options must use an absolute path based -# on ${inputs.self}, otherwise those options will not appear in the generated -# documentation. - let autoload = import ../autoload.nix { inherit lib; } "hm"; in { imports = [ - "${inputs.self}/stylix/cursor.nix" - "${inputs.self}/stylix/fonts.nix" - "${inputs.self}/stylix/hm/cursor.nix" - "${inputs.self}/stylix/hm/fonts.nix" - "${inputs.self}/stylix/hm/icon.nix" - "${inputs.self}/stylix/hm/palette.nix" - "${inputs.self}/stylix/icon.nix" - "${inputs.self}/stylix/opacity.nix" - "${inputs.self}/stylix/palette.nix" - "${inputs.self}/stylix/pixel.nix" - "${inputs.self}/stylix/target.nix" - "${inputs.self}/stylix/release.nix" - "${inputs.self}/stylix/overlays.nix" + ./cursor.nix + ./fonts.nix + ./icon.nix + ./palette.nix + ../cursor.nix + ../fonts.nix + ../icon.nix + ../opacity.nix + ../palette.nix + ../pixel.nix + ../target.nix + ../release.nix + ../overlays.nix ] ++ autoload; config.warnings = lib.mkIf