diff --git a/flake.nix b/flake.nix index 82e52be..f22be33 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,7 @@ # it is possible to streamline calling packages with a single function # that takes name as an argument, and handles default inherits. mkPlugin = name: - callPackage ./nix/plugins/default.nix { + callPackage ./nix/packages/plugin.nix { inherit inputs lockFile; inherit name; }; @@ -44,8 +44,8 @@ # By default the anyrun package is built without any plugins # as per the `dontBuildPlugins` arg. - anyrun = callPackage ./nix/default.nix {inherit inputs lockFile;}; - anyrun-with-all-plugins = callPackage ./nix/default.nix { + anyrun = callPackage ./nix/packages/anyrun.nix {inherit inputs lockFile;}; + anyrun-with-all-plugins = callPackage ./nix/packages/anyrun.nix { inherit inputs lockFile; dontBuildPlugins = false; }; @@ -72,19 +72,19 @@ default = pkgs.mkShell { inputsFrom = builtins.attrValues self'.packages; packages = with pkgs; [ - rustc # rust compiler + rustc gcc - cargo # rust package manager - clippy # opinionated rust formatter + cargo + clippy + rustfmt ]; }; nix = pkgs.mkShellNoCC { packages = with pkgs; [ - alejandra # nix formatter - rustfmt # rust formatter - statix # lints and suggestions - deadnix # clean up unused nix code + alejandra # formatter + statix # linter + deadnix # dead-code finder ]; }; }; @@ -95,7 +95,7 @@ flake = { homeManagerModules = { - anyrun = import ./nix/hm-module.nix self; + anyrun = import ./nix/modules/home-manager.nix self; default = self.homeManagerModules.anyrun; }; }; diff --git a/nix/hm-module.nix b/nix/modules/home-manager.nix similarity index 99% rename from nix/hm-module.nix rename to nix/modules/home-manager.nix index 5a92f81..a38a6e0 100644 --- a/nix/hm-module.nix +++ b/nix/modules/home-manager.nix @@ -2,13 +2,8 @@ self: { config, pkgs, lib, - hm, ... }: let - cfg = config.programs.anyrun; - - defaultPackage = self.packages.${pkgs.stdenv.hostPlatform.system}.default; - inherit (builtins) map toJSON toString substring stringLength; inherit (lib.modules) mkIf mkMerge; inherit (lib.options) mkOption mkEnableOption literalExpression; @@ -17,6 +12,9 @@ self: { inherit (lib.strings) toLower toUpper replaceStrings; inherit (lib.trivial) boolToString; inherit (lib.types) nullOr package submodule int float listOf either str enum lines bool attrs; + + defaultPackage = self.packages.${pkgs.stdenv.hostPlatform.system}.default; + cfg = config.programs.anyrun; in { meta.maintainers = with lib.maintainers; [n3oney NotAShelf]; diff --git a/nix/default.nix b/nix/packages/anyrun.nix similarity index 96% rename from nix/default.nix rename to nix/packages/anyrun.nix index b7e4849..6244286 100644 --- a/nix/default.nix +++ b/nix/packages/anyrun.nix @@ -22,7 +22,7 @@ }: let inherit (builtins) fromTOML readFile; - cargoToml = fromTOML (readFile ../anyrun/Cargo.toml); + cargoToml = fromTOML (readFile ../../anyrun/Cargo.toml); pname = cargoToml.package.name; version = cargoToml.package.version; in diff --git a/nix/plugins/default.nix b/nix/packages/plugin.nix similarity index 100% rename from nix/plugins/default.nix rename to nix/packages/plugin.nix