From 950483a5d09d5ae9bbb8ff38942471b1f1535cfd 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 nixos --- flake/modules.nix | 2 +- stylix/nixos/default.nix | 29 ++++++++++++----------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/flake/modules.nix b/flake/modules.nix index 8c0bce96..08586de1 100644 --- a/flake/modules.nix +++ b/flake/modules.nix @@ -10,7 +10,7 @@ { pkgs, ... }@args: { imports = [ - (lib.modules.importApply ../stylix/nixos inputs) + ../stylix/nixos { stylix = { inherit inputs; diff --git a/stylix/nixos/default.nix b/stylix/nixos/default.nix index 77f163ba..d5988bce 100644 --- a/stylix/nixos/default.nix +++ b/stylix/nixos/default.nix @@ -1,31 +1,26 @@ -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; } "nixos"; in { imports = [ - "${inputs.self}/stylix/cursor.nix" - "${inputs.self}/stylix/fonts.nix" - "${inputs.self}/stylix/home-manager-integration.nix" - "${inputs.self}/stylix/nixos/cursor.nix" - "${inputs.self}/stylix/nixos/fonts.nix" - "${inputs.self}/stylix/nixos/palette.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 + ./palette.nix + ../cursor.nix + ../fonts.nix + ../home-manager-integration.nix + ../opacity.nix + ../palette.nix + ../pixel.nix + ../target.nix + ../release.nix + ../overlays.nix ] ++ autoload; config.warnings = lib.mkIf