stylix: drop unnecessary use of self in autoload.nix

This commit is contained in:
Matt Sturgeon 2025-05-28 18:42:59 +01:00
parent 91755e0f1c
commit 9fb268f3a6
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
6 changed files with 14 additions and 15 deletions

View file

@ -1,13 +1,13 @@
{ lib, inputs }:
{ lib }:
# string -> [ path ]
# List include path for either nixos modules or hm modules
for:
platform:
builtins.concatLists (
lib.mapAttrsToList (
path: kind:
target: kind:
let
file = "${inputs.self}/modules/${path}/${for}.nix";
file = ../modules/${target}/${platform}.nix;
module = import file;
# Detect whether the file's value has an argument named `mkTarget`
@ -47,5 +47,5 @@ builtins.concatLists (
else
file
)
) (builtins.readDir "${inputs.self}/modules")
) (builtins.readDir ../modules)
)

View file

@ -10,7 +10,7 @@ inputs:
# documentation.
let
autoload = import ../autoload.nix { inherit lib inputs; } "darwin";
autoload = import ../autoload.nix { inherit lib; } "darwin";
in
{
imports = [
@ -23,7 +23,7 @@ in
"${inputs.self}/stylix/pixel.nix"
"${inputs.self}/stylix/target.nix"
"${inputs.self}/stylix/release.nix"
(lib.modules.importApply "${inputs.self}/stylix/overlays.nix" inputs)
"${inputs.self}/stylix/overlays.nix"
] ++ autoload;
config.warnings =
lib.mkIf

View file

@ -2,7 +2,7 @@ inputs:
{ lib, ... }:
let
autoload = import ../autoload.nix { inherit lib inputs; } "droid";
autoload = import ../autoload.nix { inherit lib; } "droid";
in
{
imports = [
@ -12,7 +12,7 @@ in
"${inputs.self}/stylix/palette.nix"
"${inputs.self}/stylix/pixel.nix"
"${inputs.self}/stylix/target.nix"
(lib.modules.importApply "${inputs.self}/stylix/overlays.nix" inputs)
"${inputs.self}/stylix/overlays.nix"
] ++ autoload;
# See https://github.com/nix-community/nix-on-droid/issues/436

View file

@ -10,7 +10,7 @@ inputs:
# documentation.
let
autoload = import ../autoload.nix { inherit lib inputs; } "hm";
autoload = import ../autoload.nix { inherit lib; } "hm";
in
{
imports = [
@ -26,7 +26,7 @@ in
"${inputs.self}/stylix/pixel.nix"
"${inputs.self}/stylix/target.nix"
"${inputs.self}/stylix/release.nix"
(lib.modules.importApply "${inputs.self}/stylix/overlays.nix" inputs)
"${inputs.self}/stylix/overlays.nix"
] ++ autoload;
config.warnings =
lib.mkIf

View file

@ -10,7 +10,7 @@ inputs:
# documentation.
let
autoload = import ../autoload.nix { inherit lib inputs; } "nixos";
autoload = import ../autoload.nix { inherit lib; } "nixos";
in
{
imports = [
@ -25,7 +25,7 @@ in
"${inputs.self}/stylix/pixel.nix"
"${inputs.self}/stylix/target.nix"
"${inputs.self}/stylix/release.nix"
(lib.modules.importApply "${inputs.self}/stylix/overlays.nix" inputs)
"${inputs.self}/stylix/overlays.nix"
] ++ autoload;
config.warnings =
lib.mkIf

View file

@ -1,4 +1,3 @@
inputs:
{
lib,
pkgs,
@ -33,5 +32,5 @@ inputs:
attrs.overlay
];
}
) (import ./autoload.nix { inherit lib inputs; } "overlay");
) (import ./autoload.nix { inherit lib; } "overlay");
}