Merge pull request #195 from NotAShelf/master

nix: housekeeping

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
   "anyrun",
   "anyrun-plugin",

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;
         };
       };

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];
 

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
@@ -39,8 +39,6 @@ in
       inherit lockFile;
     };
 
-    checkInputs = [cargo rustc];
-
     nativeBuildInputs = [
       pkg-config
       makeWrapper
@@ -63,6 +61,8 @@ in
       else [];
 
     doCheck = true;
+    checkInputs = [cargo rustc];
+
     copyLibs = true;
 
     buildAndTestSubdir =
@@ -70,7 +70,7 @@ in
       then pname
       else null;
 
-    CARGO_BUILD_INCREMENTAL = "false";
+    CARGO_BUILD_INCREMENTAL = 0;
     RUST_BACKTRACE = "full";
 
     postInstall = ''
@@ -82,7 +82,7 @@ in
     meta = {
       description = "A wayland native, highly customizable runner.";
       homepage = "https://github.com/Kirottu/anyrun";
-      license = with lib.licenses; [gpl3];
+      license = [lib.licenses.gpl3];
       mainProgram = "anyrun";
       maintainers = with lib.maintainers; [NotAShelf n3oney];
     };

nix/packages/plugin.nix

@@ -10,6 +10,8 @@
   gtk-layer-shell,
   pkg-config,
   librsvg,
+  cargo,
+  rustc,
   # Generic args
   name,
   lockFile,
@@ -49,17 +51,22 @@ in
       ++ extraInputs;
 
     doCheck = true;
+    checkInputs = [
+      cargo
+      rustc
+    ];
+
     copyLibs = true;
     cargoBuildFlags = ["-p ${name}"];
     buildAndTestSubdir = "plugins/${name}";
 
-    CARGO_BUILD_INCREMENTAL = "false";
+    CARGO_BUILD_INCREMENTAL = 0;
     RUST_BACKTRACE = "full";
 
     meta = {
       description = "The ${name} plugin for Anyrun";
       homepage = "https://github.com/Kirottu/anyrun";
-      license = with lib.licenses; [gpl3];
+      license = [lib.licenses.gpl3];
       maintainers = with lib.maintainers; [NotAShelf n3oney];
     };
   }