bitte-cli: make devshell actually useful

Move the package and source under the expected `std` path and replace
it with a symlink so that I can reference it from the automation cell
allowing me to wire up the `RUST_SRC_PATH` so rust-anaylzer works as
expected and the rust toolchain is available.

Also move `.envrc` under this directory since it is only useful when
working on the cli.

Author: nrdxp

.gitignore

@@ -8,7 +8,7 @@
 result*
 
 # cargo
-cli/target
+target
 
 # misc
 *.swp

cli

@@ -0,0 +1 @@
+nix/cli/packages/cli

cli/package.nix

@@ -61,6 +61,7 @@
       cellsFrom = ./nix;
       organelles = [
         (inputs.std.devshells "devshells")
+        (inputs.std.installables "packages")
 
         # ----------
         # NixOS: Modules, Profiles, Aggregates
@@ -112,8 +113,6 @@
         inherit (nixpkgs) lib;
         inherit inputs;
       };
-
-      toolchain = "stable";
     in
       utils.lib.eachSystem [
         "aarch64-darwin"
@@ -123,17 +122,10 @@
       ] (system: let
         legacyPackages = pkgsForSystem system;
         unstablePackages = unstablePkgsForSystem system;
-        rustPkg = unstablePackages.fenix."${toolchain}".withComponents [
-          "cargo"
-          "clippy"
-          "rust-src"
-          "rustc"
-          "rustfmt"
-        ];
       in rec {
         inherit legacyPackages;
 
-        packages.bitte = unstablePackages.callPackage ./cli/package.nix {inherit toolchain;};
+        packages = {inherit (self.${system}.cli.packages) bitte;};
         defaultPackage = packages.bitte;
 
         hydraJobs = let

flake.nix

@@ -4,15 +4,16 @@
 }: let
   inherit (inputs.std) std;
   inherit (inputs) capsules nixpkgs;
+  inherit (inputs.cells.cli.packages) bitte;
+  inherit (bitte) rustPkg rustPlatform;
   l = nixpkgs.lib // builtins;
 
   rust-dev-pkgs =
     [
-      nixpkgs.openssl
       nixpkgs.zlib
       nixpkgs.pkg-config
-      # rustPkg
-      # rust-analyzer-nightly
+      rustPkg
+      bitte.rust-analyzer
     ]
     ++ l.optionals nixpkgs.stdenv.isDarwin (with nixpkgs.darwin;
       with nixpkgs.apple_sdk.frameworks; [
@@ -26,17 +27,26 @@
 in {
   default = std.lib.mkShell {
     packages = rust-dev-pkgs;
+    language.rust = {
+      packageSet = rustPlatform;
+      enableDefaultToolchain = false;
+    };
     env = [
       {
         name = "RUST_BACKTRACE";
         value = "1";
       }
-      # {
-      #   name = "RUST_SRC_PATH";
-      #   value = "${rustPkg}/lib/rustlib/src/rust/library";
-      # }
+      {
+        name = "RUST_SRC_PATH";
+        value = "${rustPkg}/lib/rustlib/src/rust/library";
+      }
+      {
+        name = "PKG_CONFIG_PATH";
+        value = l.makeSearchPath "lib/pkgconfig" bitte.buildInputs;
+      }
     ];
     imports = [
+      "${inputs.std.inputs.devshell}/extra/language/rust.nix"
       capsules.base
       capsules.tools
       capsules.integrations

nix/automation/devshells.nix

@@ -0,0 +1,72 @@
+{
+  stdenv,
+  lib,
+  pkg-config,
+  openssl,
+  zlib,
+  makeRustPlatform,
+  fenix,
+  # darwin dependencies
+  darwin,
+  toolchain,
+}: let
+  rustPlatform = makeRustPlatform {inherit (fenix.${toolchain}) cargo rustc;};
+
+  rustPkg = fenix."${toolchain}".withComponents [
+    "cargo"
+    "clippy"
+    "rust-src"
+    "rustc"
+    "rustfmt"
+  ];
+in
+  rustPlatform.buildRustPackage
+  {
+    inherit
+      (with builtins; (fromTOML (readFile ./Cargo.toml)).package)
+      name
+      version
+      ;
+
+    src = lib.cleanSource ./.;
+    cargoLock.lockFile = ./Cargo.lock;
+    cargoLock.outputHashes = {
+      "deploy-rs-0.1.0" = "sha256-cDFOojpoHdRt2NFM/39GPPjqARoVuy+yVk0/BgYHwv0=";
+    };
+
+    nativeBuildInputs = [pkg-config];
+    buildInputs =
+      [openssl zlib]
+      ++ lib.optionals stdenv.isDarwin
+      (with darwin.apple_sdk.frameworks; [
+        SystemConfiguration
+        Security
+        CoreFoundation
+        darwin.libiconv
+        darwin.libresolv
+        darwin.Libsystem
+      ]);
+
+    doCheck = false;
+
+    postInstall = ''
+      export BITTE_CLUSTER=b
+      export BITTE_PROVIDER=aws
+      export BITTE_DOMAIN=b.b.b
+
+      mkdir -p $out/share/zsh/site-functions
+      $out/bin/bitte comp zsh > $out/share/zsh/site-functions/_bitte
+
+      mkdir -p $out/share/bash-completion/completions
+      $out/bin/bitte comp bash > $out/share/bash-completion/completions/bitte
+    '';
+
+    passthru = {
+      inherit rustPlatform rustPkg;
+      inherit (fenix.${toolchain}) rust-src;
+      inherit (fenix) rust-analyzer;
+    };
+  }
+  // {
+    meta.description = "A swiss knife for the bitte cluster";
+  }