From b8d9538c58ef88c06513a4b88dc8e458bdfc0eb2 Mon Sep 17 00:00:00 2001 From: Archit Gupta Date: Sat, 26 Aug 2023 22:48:57 -0700 Subject: [PATCH] Rename project from flakelite to flakelight --- README.md | 2 +- builtinModules/apps.nix | 6 +++--- builtinModules/builtinFormatters.nix | 4 ++-- builtinModules/builtinOverlay.nix | 6 +++--- builtinModules/checks.nix | 6 +++--- builtinModules/core.nix | 6 +++--- builtinModules/devShells.nix | 8 ++++---- builtinModules/editorconfig.nix | 6 +++--- builtinModules/formatter.nix | 6 +++--- builtinModules/homeConfigurations.nix | 2 +- builtinModules/homeModules.nix | 6 +++--- builtinModules/nixDir.nix | 8 ++++---- builtinModules/nixosConfigurations.nix | 2 +- builtinModules/nixosModules.nix | 6 +++--- builtinModules/overlays.nix | 6 +++--- builtinModules/packages.nix | 8 ++++---- builtinModules/templates.nix | 2 +- default.nix | 8 ++++---- flake.nix | 6 +++--- 19 files changed, 52 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index 5181146..a3f4d6f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# flakelite +# flakelight An opinionated Nix flake framework for making flakes simple. diff --git a/builtinModules/apps.nix b/builtinModules/apps.nix index 5b7c783..05f87b6 100644 --- a/builtinModules/apps.nix +++ b/builtinModules/apps.nix @@ -1,12 +1,12 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT -{ config, lib, flakelite, ... }: +{ config, lib, flakelight, ... }: let inherit (lib) isFunction mapAttrs mkIf mkMerge mkOption; inherit (lib.types) lazyAttrsOf nullOr raw; - inherit (flakelite.types) optFunctionTo; + inherit (flakelight.types) optFunctionTo; isApp = x: (x ? type) && (x.type == "app") && (x ? program); diff --git a/builtinModules/builtinFormatters.nix b/builtinModules/builtinFormatters.nix index 7396ac4..4908e5f 100644 --- a/builtinModules/builtinFormatters.nix +++ b/builtinModules/builtinFormatters.nix @@ -1,4 +1,4 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT @@ -7,7 +7,7 @@ let inherit (lib) mkEnableOption; in { - options.flakelite.builtinFormatters = + options.flakelight.builtinFormatters = mkEnableOption "default formatters" // { default = true; }; config = { diff --git a/builtinModules/builtinOverlay.nix b/builtinModules/builtinOverlay.nix index 422e868..7c73a32 100644 --- a/builtinModules/builtinOverlay.nix +++ b/builtinModules/builtinOverlay.nix @@ -1,8 +1,8 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT -{ config, src, lib, inputs, outputs, flakelite, ... }: +{ config, src, lib, inputs, outputs, flakelight, ... }: let inherit (lib) isList mkOption mkOrder mapAttrs optionalAttrs; inherit (lib.types) listOf nullOr oneOf str; @@ -25,7 +25,7 @@ in system = prev.stdenv.hostPlatform.system; in { - inherit src inputs outputs flakelite system; + inherit src inputs outputs flakelight system; inputs' = mapAttrs (_: mapAttrs (_: v: v.${system} or { })) inputs; outputs' = mapAttrs (_: v: v.${system} or { }) outputs; diff --git a/builtinModules/checks.nix b/builtinModules/checks.nix index ac365fd..636ad6d 100644 --- a/builtinModules/checks.nix +++ b/builtinModules/checks.nix @@ -1,12 +1,12 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT -{ config, src, lib, flakelite, ... }: +{ config, src, lib, flakelight, ... }: let inherit (lib) isDerivation isFunction mkOption mkIf mapAttrs; inherit (lib.types) lazyAttrsOf nullOr raw; - inherit (flakelite.types) optFunctionTo; + inherit (flakelight.types) optFunctionTo; mkCheck = pkgs: src: name: cmd: let diff --git a/builtinModules/core.nix b/builtinModules/core.nix index 03476ad..3df62e5 100644 --- a/builtinModules/core.nix +++ b/builtinModules/core.nix @@ -1,14 +1,14 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT -{ config, inputs, lib, flakelite, ... }: +{ config, inputs, lib, flakelight, ... }: let inherit (builtins) all head isAttrs length; inherit (lib) foldAttrs getFiles getValues mapAttrs mergeAttrs mkOption mkOptionType showFiles showOption; inherit (lib.types) functionTo lazyAttrsOf listOf nonEmptyStr raw uniq; - inherit (flakelite.types) optListOf overlay; + inherit (flakelight.types) optListOf overlay; outputs = mkOptionType { name = "outputs"; diff --git a/builtinModules/devShells.nix b/builtinModules/devShells.nix index a57e5cd..0489fbf 100644 --- a/builtinModules/devShells.nix +++ b/builtinModules/devShells.nix @@ -1,14 +1,14 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT -{ config, lib, flakelite, ... }: +{ config, lib, flakelight, ... }: let inherit (lib) any attrValues filterAttrs mapAttrs mkIf mkMerge mkOption optionalAttrs; inherit (lib.types) lazyAttrsOf functionTo lines listOf nullOr package str; - inherit (flakelite) supportedSystem; - inherit (flakelite.types) optFunctionTo packageDef; + inherit (flakelight) supportedSystem; + inherit (flakelight.types) optFunctionTo packageDef; in { options = { diff --git a/builtinModules/editorconfig.nix b/builtinModules/editorconfig.nix index da821a9..8e7f3a1 100644 --- a/builtinModules/editorconfig.nix +++ b/builtinModules/editorconfig.nix @@ -1,4 +1,4 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT @@ -7,11 +7,11 @@ let inherit (lib) mkEnableOption mkIf optionalString pathExists; in { - options.flakelite.editorconfig = + options.flakelight.editorconfig = mkEnableOption "editorconfig check" // { default = true; }; config.checks = mkIf - (config.flakelite.editorconfig && (pathExists (src + /.editorconfig))) + (config.flakelight.editorconfig && (pathExists (src + /.editorconfig))) { # By default, high false-positive flags are disabled. editorconfig = { editorconfig-checker, ... }: diff --git a/builtinModules/formatter.nix b/builtinModules/formatter.nix index bbfb5e7..3775e63 100644 --- a/builtinModules/formatter.nix +++ b/builtinModules/formatter.nix @@ -1,12 +1,12 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT -{ config, src, lib, flakelite, ... }: +{ config, src, lib, flakelight, ... }: let inherit (lib) mkOption mkIf mapAttrsToList; inherit (lib.types) lazyAttrsOf nullOr str; - inherit (flakelite.types) optFunctionTo; + inherit (flakelight.types) optFunctionTo; in { options.formatters = mkOption { diff --git a/builtinModules/homeConfigurations.nix b/builtinModules/homeConfigurations.nix index 0b502f3..73b86da 100644 --- a/builtinModules/homeConfigurations.nix +++ b/builtinModules/homeConfigurations.nix @@ -1,4 +1,4 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT diff --git a/builtinModules/homeModules.nix b/builtinModules/homeModules.nix index 76b733d..ada8d39 100644 --- a/builtinModules/homeModules.nix +++ b/builtinModules/homeModules.nix @@ -1,12 +1,12 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT -{ config, lib, flakelite, ... }: +{ config, lib, flakelight, ... }: let inherit (lib) mkOption mkIf mkMerge; inherit (lib.types) lazyAttrsOf nullOr; - inherit (flakelite.types) module; + inherit (flakelight.types) module; in { options = { diff --git a/builtinModules/nixDir.nix b/builtinModules/nixDir.nix index b8bb632..960f6ee 100644 --- a/builtinModules/nixDir.nix +++ b/builtinModules/nixDir.nix @@ -1,12 +1,12 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT -{ config, src, lib, flakelite, ... }@args: +{ config, src, lib, flakelight, ... }@args: let inherit (lib) isFunction mkOption mkIf mkMerge optionalAttrs; - inherit (flakelite) autoImport; - inherit (flakelite.types) path; + inherit (flakelight) autoImport; + inherit (flakelight.types) path; in { options.nixDir = mkOption { diff --git a/builtinModules/nixosConfigurations.nix b/builtinModules/nixosConfigurations.nix index c405d3d..8fa1391 100644 --- a/builtinModules/nixosConfigurations.nix +++ b/builtinModules/nixosConfigurations.nix @@ -1,4 +1,4 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT diff --git a/builtinModules/nixosModules.nix b/builtinModules/nixosModules.nix index 053a13a..6df17b7 100644 --- a/builtinModules/nixosModules.nix +++ b/builtinModules/nixosModules.nix @@ -1,12 +1,12 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT -{ config, lib, flakelite, ... }: +{ config, lib, flakelight, ... }: let inherit (lib) mkOption mkIf mkMerge; inherit (lib.types) lazyAttrsOf nullOr; - inherit (flakelite.types) module; + inherit (flakelight.types) module; in { options = { diff --git a/builtinModules/overlays.nix b/builtinModules/overlays.nix index 400f48f..7384326 100644 --- a/builtinModules/overlays.nix +++ b/builtinModules/overlays.nix @@ -1,12 +1,12 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT -{ config, lib, flakelite, ... }: +{ config, lib, flakelight, ... }: let inherit (lib) mkOption mkIf; inherit (lib.types) lazyAttrsOf; - inherit (flakelite.types) overlay; + inherit (flakelight.types) overlay; in { options.overlays = mkOption { diff --git a/builtinModules/packages.nix b/builtinModules/packages.nix index b1c470c..e5127a1 100644 --- a/builtinModules/packages.nix +++ b/builtinModules/packages.nix @@ -1,15 +1,15 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT -{ config, lib, flakelite, ... }: +{ config, lib, flakelight, ... }: let inherit (builtins) attrNames functionArgs intersectAttrs parseDrvName; inherit (lib) composeManyExtensions filterAttrs fix genAttrs mapAttrs mapAttrs' mkIf mkMerge mkOption mkOrder nameValuePair optional optionalAttrs remove; inherit (lib.types) lazyAttrsOf nullOr; - inherit (flakelite) supportedSystem; - inherit (flakelite.types) packageDef; + inherit (flakelight) supportedSystem; + inherit (flakelight.types) packageDef; getName = pkg: pkg.pname or (parseDrvName pkg.name).name; diff --git a/builtinModules/templates.nix b/builtinModules/templates.nix index 04eab51..4deaf4b 100644 --- a/builtinModules/templates.nix +++ b/builtinModules/templates.nix @@ -1,4 +1,4 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT diff --git a/default.nix b/default.nix index 86863c6..2a3bc49 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT @@ -18,12 +18,12 @@ let specialArgs.modulesPath = ./builtinModules; modules = builtinModules ++ [ { inputs.nixpkgs = mkDefault localInputs.nixpkgs; } - { _module.args = { inherit src flakelite; }; } + { _module.args = { inherit src flakelight; }; } root ]; }).config.outputs; - flakelite = { + flakelight = { inherit mkFlake supportedSystem importDir autoImport; types = { @@ -92,6 +92,6 @@ let in { - lib = flakelite; + lib = flakelight; __functor = _: mkFlake; } diff --git a/flake.nix b/flake.nix index 5934dad..8136b7b 100644 --- a/flake.nix +++ b/flake.nix @@ -1,4 +1,4 @@ -# flakelite -- Framework for making flakes simple +# flakelight -- Framework for simplifying flake setup # Copyright (C) 2023 Archit Gupta # SPDX-License-Identifier: MIT @@ -6,7 +6,7 @@ inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; outputs = inputs: let - flakelite = import ./. inputs; + flakelight = import ./. inputs; in - flakelite ./. { outputs = flakelite; }; + flakelight ./. { outputs = flakelight; }; }