Cargo.toml

@@ -1,6 +1,10 @@
 [workspace]
 resolver = "3"
-members = ["hive-ag3nt", "hive-c0re", "hive-sh4re"]
+members = [
+    "hive-ag3nt",
+    "hive-c0re",
+    "hive-sh4re",
+]
 
 [workspace.package]
 edition = "2024"
@@ -21,14 +25,6 @@ hive-sh4re = { path = "hive-sh4re" }
 rusqlite = { version = "0.37", features = ["bundled"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-tokio = { version = "1", features = [
+tokio = { version = "1", features = ["io-util", "macros", "net", "process", "rt-multi-thread", "signal", "time"] }
-  "io-util",
-  "macros",
-  "net",
-  "process",
-  "rt-multi-thread",
-  "signal",
-  "time",
-] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

flake.nix

@@ -34,7 +34,6 @@
           keep-sorted.enable = true;
           nixfmt.enable = true;
           rustfmt.enable = true;
-          taplo.enable = true;
         };
       };
       forAllSystems =
@@ -127,38 +126,16 @@
       checks = forAllSystems (
         {
           treefmt-eval,
-          pkgs,
           naersk-lib,
           ...
         }:
         {
           formatting = treefmt-eval.config.build.check self;
-          # Clippy as a check: reuse naersk's vendored-deps environment but
+          clippy = naersk-lib.buildPackage {
-          # replace the build phase with `cargo clippy --workspace --all-targets
+            src = ./.;
-          # -- -D warnings`. Naersk's own `mode = "clippy"` mangles the `--`
+            mode = "clippy";
-          # separator, so we go through overrideAttrs instead.
+            cargoClippyOptions = orig: orig ++ [ "--all-targets" "--" "-D" "warnings" ];
-          clippy =
+          };
-            (naersk-lib.buildPackage {
-              src = ./.;
-              # Skip the actual build; we only care about the clippy lint.
-              doCheck = false;
-              copyTarget = false;
-            }).overrideAttrs
-              (old: {
-                name = "${old.name}-clippy";
-                nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.clippy ];
-                buildPhase = ''
-                  runHook preBuild
-                  cargo clippy --workspace --all-targets -- -D warnings
-                  runHook postBuild
-                '';
-                installPhase = ''
-                  runHook preInstall
-                  mkdir -p $out
-                  touch $out/.clippy-passed
-                  runHook postInstall
-                '';
-              });
         }
       );
     };

hive-c0re/src/agent_server.rs

@@ -18,7 +18,11 @@ pub struct AgentSocket {
     pub handle: JoinHandle<()>,
 }
 
-pub fn start(agent: &str, socket_path: &Path, broker: Arc<Broker>) -> Result<AgentSocket> {
+pub fn start(
+    agent: &str,
+    socket_path: &Path,
+    broker: Arc<Broker>,
+) -> Result<AgentSocket> {
     let agent = agent.to_owned();
     if let Some(parent) = socket_path.parent() {
         std::fs::create_dir_all(parent)

hive-c0re/src/approvals.rs

@@ -36,8 +36,7 @@ impl Approvals {
         }
         let conn = Connection::open(path)
             .with_context(|| format!("open approvals db {}", path.display()))?;
-        conn.execute_batch(SCHEMA)
+        conn.execute_batch(SCHEMA).context("apply approvals schema")?;
-            .context("apply approvals schema")?;
         Ok(Self {
             conn: Mutex::new(conn),
         })

hive-c0re/src/main.rs

@@ -81,9 +81,7 @@ async fn main() -> Result<()> {
         }
         Cmd::List => render(client::request(&cli.socket, HostRequest::List).await?),
         Cmd::Pending => render(client::request(&cli.socket, HostRequest::Pending).await?),
-        Cmd::Approve { id } => {
+        Cmd::Approve { id } => render(client::request(&cli.socket, HostRequest::Approve { id }).await?),
-            render(client::request(&cli.socket, HostRequest::Approve { id }).await?)
-        }
         Cmd::Deny { id } => render(client::request(&cli.socket, HostRequest::Deny { id }).await?),
     }
 }