distribute cargo via fenix+hm

nix/home-manager/flake.lock

@@ -21,6 +21,27 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1717655240,
+        "narHash": "sha256-n43uyWCS7R7ScJ85ZcJt4lVUPmlZz4/1/TdGgB2k5tA=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "143c8105ce72bb5740d0009546ee723c14842b50",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -170,11 +191,11 @@
         "nmt": "nmt"
       },
       "locked": {
-        "lastModified": 1716380104,
+        "lastModified": 1717627901,
-        "narHash": "sha256-tcVeEM4bW4YLJon5eU9DvyM4OOaMhy4jCDaE/kQPq8w=",
+        "narHash": "sha256-t2V2iwh1TowZigAQdUKRhawftFbFbxyxFxMlG/koBMo=",
         "owner": "nixneovim",
         "repo": "nixneovim",
-        "rev": "9d829521b8e1065a40896e8a1989c3e2bad05f97",
+        "rev": "8efa30742ea496ade5ea4321675a096411203366",
         "type": "github"
       },
       "original": {
@@ -196,11 +217,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1716379933,
+        "lastModified": 1717621372,
-        "narHash": "sha256-IlsMK48/UGM5yjb/l0vfN7CyyopGLJ/v+BCS6eGl01A=",
+        "narHash": "sha256-u/U455J7V5EO6qkZq64T++pxUyns8n670lJV+5pOH7U=",
         "owner": "nixneovim",
         "repo": "nixneovimplugins",
-        "rev": "fbbf2e9c16a280b51f451af699025b72d259ac66",
+        "rev": "c911cb5d23260f89886a2359038f79fb19fde137",
         "type": "github"
       },
       "original": {
@@ -226,11 +247,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1717535162,
+        "lastModified": 1717680517,
-        "narHash": "sha256-tZmyv/uZGT+CSvRCDOVVBxoskSjb/yll7l1CUpa3w3U=",
+        "narHash": "sha256-tJ6XBhu3KficVXTy5jjYRScT+8vSLscKtcsk1Z8Hn4I=",
         "owner": "nixOS",
         "repo": "nixpkgs",
-        "rev": "ea51548160cf8aec392e0ec83b5ad3de67b7c2ad",
+        "rev": "9d907b831f4f4882259992a660b1f210ca7090fa",
         "type": "github"
       },
       "original": {
@@ -302,6 +323,7 @@
     },
     "root": {
       "inputs": {
+        "fenix": "fenix",
         "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
         "nixneovim": "nixneovim",
@@ -309,6 +331,23 @@
         "zjstatus": "zjstatus"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717583671,
+        "narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "48bbdd6a74f3176987d5c809894ac33957000d19",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "rust-overlay": {
       "inputs": {
         "flake-utils": [

nix/home-manager/flake.nix

@@ -2,8 +2,8 @@
   description = "Home Manager configuration of acicchetti";
 
   nixConfig = {
-    extra-substituters = ["https://devenv.cachix.org"];
+    extra-substituters = ["https://devenv.cachix.org" "https://nixpkgs.cachix.org" "https://nix-community.cachix.org"];
-    extra-trusted-public-keys = ["devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="];
+    extra-trusted-public-keys = ["devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" "nixpkgs.cachix.org-1:q91R6hxbwFvDqTSDKwDAV4T5PxqXGxswD8vhONFMeOE=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
   };
 
   inputs = {
@@ -30,6 +30,12 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
   };
 
   outputs = {
@@ -39,6 +45,7 @@
     nix-index-database,
     nixneovim,
     zjstatus,
+    fenix,
     ...
   }: let
     supportedSystems = ["aarch64-darwin" "x86_64-linux"];
@@ -54,7 +61,7 @@
             (_final: prev: {
               zjstatus = zjstatus.packages.${prev.system}.default;
             })
-            # emacs-overlay.overlays.default
+            fenix.overlays.default
           ];
         }
     );

nix/home-manager/modules/packages/default.nix

@@ -32,6 +32,7 @@ in {
       emacs
       fantasque-sans-mono
       fd
+      (fenix.latest.withComponents ["cargo" "clippy" "rustfmt" "rust-src" "rustc"])
       ffmpeg_6
       gawkInteractive
       gnugrep
@@ -60,6 +61,7 @@ in {
       rage
       ripgrep
       rsync
+      rust-analyzer-nightly # part of the fenix distribution/overlay
       scriptisto
       sqlite
       tmux