treewide: general maintenance work

.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+  # Update Cargo deps
+  - package-ecosystem: cargo
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  # Update used workflows
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily

.github/workflows/nix-build.yml

@@ -5,6 +5,9 @@ on:
   workflow_dispatch:
   pull_request:
     branches: ["master"]
+    paths-ignore:
+      - .gitignore
+      - README.md
 
 jobs:
   check-flake:
@@ -15,10 +18,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@main
+      - uses: cachix/install-nix-action@v31
         with:
-          logger: pretty
+          nix_path: nixpkgs=channel:nixos-unstable
 
       - name: Check Flake
         run: nix flake check --accept-flake-config
@@ -53,8 +55,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - uses: cachix/install-nix-action@v26
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
 
       - name: Build anyrun from the defined matrix
         run: nix build .#${{ matrix.package }} --print-build-logs --extra-substituters "https://anyrun.cachix.org"

.github/workflows/nix-cache.yml

@@ -4,8 +4,7 @@ on:
   workflow_call:
   workflow_dispatch:
   push:
-    branches:
-      - master
+    branches: ["master"]
     paths-ignore:
       - .gitignore
       - README.md
@@ -19,10 +18,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@main
+      - uses: cachix/install-nix-action@v31
         with:
-          logger: pretty
+          nix_path: nixpkgs=channel:nixos-unstable
 
       - name: Check Flake
         run: nix flake check --accept-flake-config
@@ -57,8 +55,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - uses: cachix/install-nix-action@v26
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
 
       - uses: cachix/cachix-action@v14
         with:

.taplo.toml

@@ -0,0 +1,13 @@
+[formatting]
+align_entries         = true
+column_width          = 100
+compact_arrays        = false
+reorder_inline_tables = true
+reorder_keys          = true
+
+[[rule]]
+include = [ "**/Cargo.toml" ]
+keys    = [ "package" ]
+
+[rule.formatting]
+reorder_keys = false

Cargo.toml

@@ -1,5 +1,4 @@
 [workspace]
-resolver = "2"
 members = [
   "anyrun",
   "anyrun-plugin",
@@ -14,5 +13,7 @@ members = [
   "plugins/stdin",
   "plugins/dictionary",
   "plugins/websearch",
-  "plugins/nix-run", "plugins/niri-focus",
+  "plugins/nix-run",
+  "plugins/niri-focus",
 ]
+resolver = "2"

anyrun-macros/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "anyrun-macros"
+name    = "anyrun-macros"
 version = "25.9.3"
 edition = "2021"
 
@@ -10,4 +10,4 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.37"
-syn = { version = "2.0.85", features = ["full"] }
+syn   = { features = [ "full" ], version = "2.0.85" }

anyrun-plugin/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
-name = "anyrun-plugin"
+name    = "anyrun-plugin"
 version = "25.9.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-abi_stable = "0.11.1"
+abi_stable       = "0.11.1"
 anyrun-interface = { git = "https://github.com/anyrun-org/anyrun-interface" }
-anyrun-macros = { path = "../anyrun-macros" }
+anyrun-macros    = { path = "../anyrun-macros" }

anyrun/Cargo.toml

@@ -1,21 +1,22 @@
 [package]
-name = "anyrun"
+name    = "anyrun"
 version = "25.9.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyrun-macros = { path = "../anyrun-macros" }
-abi_stable = "0.11.1"
-ron = "0.8.0"
-serde = { version = "1.0.210", features = ["derive"] }
-anyrun-interface = { git = "https://github.com/anyrun-org/anyrun-interface" }
+abi_stable          = "0.11.1"
+anyrun-interface    = { git = "https://github.com/anyrun-org/anyrun-interface" }
+anyrun-macros       = { path = "../anyrun-macros" }
 anyrun-provider-ipc = { git = "https://github.com/anyrun-org/anyrun-provider" }
-clap = { version = "4.2.7", features = ["derive"] }
-relm4 = { git = "https://github.com/Kirottu/Relm4", branch = "service" }
+
+clap             = { features = [ "derive" ], version = "4.2.7" }
+gtk4             = "0.10.0"
 gtk4-layer-shell = "0.6.3"
-gtk4 = { version = "0.10.0", features = ["v4_12"] }
-serde_json = "1.0.143"
-tokio = { version = "1.47.1", features = ["sync", "rt-multi-thread", "net", "macros"] }
-tree_magic_mini = "3.2.0"
+relm4            = { branch = "service", git = "https://github.com/Kirottu/Relm4" }
+ron              = "0.8.0"
+serde            = { features = [ "derive" ], version = "1.0.210" }
+serde_json       = "1.0.143"
+tokio            = { features = [ "sync", "rt-multi-thread", "net", "macros" ], version = "1.47.1" }
+tree_magic_mini  = "3.2.0"

flake.nix

@@ -30,6 +30,7 @@
           self',
           config,
           pkgs,
+          system,
           ...
         }:
         let
@@ -51,13 +52,16 @@
                 };
             in
             {
-              default = self'.packages.anyrun;
+              anyrun-provider = inputs.anyrun-provider.packages.${system}.default;
 
               # By default the anyrun package is built without any plugins
               # as per the `dontBuildPlugins` arg.
-              anyrun = callPackage ./nix/packages/anyrun.nix { inherit inputs lockFile; };
-              anyrun-with-all-plugins = callPackage ./nix/packages/anyrun.nix {
+              anyrun = callPackage ./nix/packages/anyrun.nix {
                 inherit inputs lockFile;
+                inherit (self.packages.${system}) anyrun-provider;
+              };
+
+              anyrun-with-all-plugins = self.packages.${system}.anyrun.override {
                 dontBuildPlugins = false;
               };
 
@@ -77,7 +81,7 @@
               websearch = mkPlugin "websearch";
               niri-focus = mkPlugin "niri-focus";
 
-              anyrun-provider = inputs.anyrun-provider.packages.${pkgs.system}.default;
+              default = self'.packages.anyrun;
             };
 
           # Set up an overlay from packages exposed by this flake
@@ -88,10 +92,11 @@
               inputsFrom = builtins.attrValues self'.packages;
               packages = with pkgs; [
                 rustc
-                gcc
                 cargo
+
                 clippy
                 rustfmt
+                taplo
               ];
             };
 
@@ -104,8 +109,38 @@
             };
           };
 
-          # provide the formatter for nix fmt
-          formatter = pkgs.alejandra;
+          # Provides the default formatter for 'nix fmt', which will format the
+          # entire tree with Alejandra. The wrapper script is necessary due to
+          # changes to the behaviour of Nix, which now encourages wrappers for
+          # tree-wide formatting.
+          formatter = pkgs.writeShellApplication {
+            name = "nix3-fmt-wrapper";
+
+            runtimeInputs = [
+              pkgs.nixfmt
+              pkgs.fd
+              pkgs.taplo
+            ];
+
+            text = ''
+              # Find Nix files in the tree and format them with Alejandra
+              fd "$@" -t f -e nix -x nixfmt -q '{}'
+
+              # Same for TOML files, but with Taplo
+              fd "$@" -t f -e toml -x taplo fmt '{}'
+            '';
+          };
+
+          # Provides checks to be built an ran on 'nix flake check'. They can also
+          # be built individually with 'nix build' as described below.
+          checks = {
+            # Check if codebase is properly formatted.
+            # This can be initiated with `nix build .#checks.<system>.nix-fmt`
+            # or with `nix flake check`
+            nix-fmt = pkgs.runCommand "nix-fmt-check" { nativeBuildInputs = [ pkgs.nixfmt ]; } ''
+              nixfmt --check ${self} < /dev/null | tee $out
+            '';
+          };
         };
 
       flake = {

nix/modules/home-manager.nix

@@ -40,8 +40,8 @@ let
     attrs
     ;
 
-  defaultPackage = self.packages.${pkgs.stdenv.hostPlatform.system}.default;
-  defaultProvider = self.packages.${pkgs.stdenv.hostPlatform.system}.anyrun-provider;
+  defaultPackage = self.packages.${pkgs.stdenv.hostplatform.system}.default;
+  defaultProvider = defaultProvider.passthru.anyrun-provider or null;
   cfg = config.programs.anyrun;
 in
 {
@@ -58,7 +58,11 @@ in
       description = ''
         Enable running Anyrun as a daemon, allowing for faster startup speed.
 
-        NOTE: This is required for clipboard functionality.
+        ::: {.note}
+
+        This is required for the clipboard functionality
+
+        :::
       '';
     };
 
@@ -72,6 +76,7 @@ in
         Anyrun package to use. Defaults to the one provided by the flake.
       '';
     };
+
     config =
       let
         mkNumericOption =
@@ -119,6 +124,7 @@ in
         provider = mkOption {
           type = package;
           default = defaultProvider;
+          defaultText = literalExpression "anyrun.packages.${pkgs.stdenv.hostPlatform.sytstem}.default.passthru.anyrun-provider";
           description = ''
             The program that is used for loading the plugins, and for the communcation with them.
           '';
@@ -359,6 +365,19 @@ in
         (assertNumeric cfg.config.height)
         (assertNumeric cfg.config.x)
         (assertNumeric cfg.config.y)
+
+        {
+          assertion = cfg.package.anyrun-provider != null;
+          message = ''
+            Anyrun expects 'anyrun-provider' to be exposed under 'passthru.anyrun-provider'. This is done
+            automatically in the Anyrun flake, but may not be the case if you are using the Home Manager
+            module from the Anyrun flake with 'pkgs.anyrun'. You may consider:
+
+            1. Using the Home Manager module from Home Manager to keep using 'pkgs.anyrun'
+            2. Using the Home Manager module from Anyrun, but don't override the package (recommended)
+            3. Ensure that your Anyrun package correctly provides 'anyrun-provider' under the passthru attr
+          '';
+        }
       ];
 
       warnings =
@@ -414,7 +433,7 @@ in
                 if cfg.config.maxEntries == null then "None" else "Some(${toString cfg.config.maxEntries})"
               },
               plugins: ${toJSON parsedPlugins},
-              provider: "${lib.getExe cfg.config.provider}",
+              provider: ${if cfg.config.provider == null then "None" else "${lib.getExe cfg.config.provider}"},
               ${optionalString (cfg.config.extraLines != null) cfg.config.extraLines}
               ${keybinds}
             )