rust-monorepo: rust-analyzer fresh from rustup

flake.lock

@@ -89,11 +89,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1672688183,
+        "lastModified": 1672770368,
-        "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=",
+        "narHash": "sha256-iO6Z9blIe8dcPh3VT2nkej9EimORCoskGQR6xNjICWI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a",
+        "rev": "d01e7280ad7d13a5a0fae57355bd0dbfe5b81969",
         "type": "github"
       },
       "original": {
@@ -124,17 +124,14 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1661367362,
+        "lastModified": 1,
-        "narHash": "sha256-Qc8MXcV+YCPREu8kk6oggk23ZBKLqeQRAIsLbHEviPE=",
+        "narHash": "sha256-KP+2qdZlhmRkrafuuEofg7YnNdVmGV95ipvpuqmJneI=",
-        "owner": "guibou",
+        "path": "out-of-tree/nixGL",
-        "repo": "nixGL",
+        "type": "path"
-        "rev": "7165ffbccbd2cf4379b6cd6d2edd1620a427e5ae",
-        "type": "github"
       },
       "original": {
-        "owner": "guibou",
+        "path": "out-of-tree/nixGL",
-        "repo": "nixGL",
+        "type": "path"
-        "type": "github"
       }
     },
     "nixpkgs": {
@@ -154,11 +151,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1672525397,
+        "lastModified": 1672617983,
-        "narHash": "sha256-WASDnyxHKWVrEe0dIzkpH+jzKlCKAk0husv0f/9pyxg=",
+        "narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8ba56d7c0d7490680f2d51ba46a141eca7c46afa",
+        "rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4",
         "type": "github"
       },
       "original": {

flake.nix

@@ -11,7 +11,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils.url = "github:numtide/flake-utils";
-    nixgl.url = "github:guibou/nixGL";
+    nixgl.url = "path:out-of-tree/nixGL";
     rust-overlay.url = "github:oxalica/rust-overlay";
     # Allows default.nix to call onto flake.nix. Useful for nix eval and automations
     flake-compat = {

nix-conf/home-manager/base/neovim.nix

@@ -47,9 +47,12 @@ let
 
     # Language-specific stuffs
     pkgs.sumneko-lua-language-server
-    pkgs.rust-analyzer
+    # TODO: the devShell should provide rust-analyzer so that 
-    rust_pkgs
+    # cargo test builds binaries compatible with rust-analyzer 
-    pkgs.evcxr # Rust REPL for Conjure!
+
+    # pkgs.rust-analyzer
+    # rust_pkgs
+    # pkgs.evcxr # Rust REPL for Conjure!
 
     # Python3 as alternative to bash scripts :^)
     # (pkgs.python310Full.withPackages (pypkgs: [

nix-conf/home-manager/flake.lock

@@ -69,11 +69,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1672688183,
+        "lastModified": 1672770368,
-        "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=",
+        "narHash": "sha256-iO6Z9blIe8dcPh3VT2nkej9EimORCoskGQR6xNjICWI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a",
+        "rev": "d01e7280ad7d13a5a0fae57355bd0dbfe5b81969",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-KP+2qdZlhmRkrafuuEofg7YnNdVmGV95ipvpuqmJneI=",
-        "path": "/nix/store/zcawhhz89smqvmyqp985cmlsh6y81789-source/out-of-tree/nixGL",
+        "path": "./../../out-of-tree/nixGL",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/zcawhhz89smqvmyqp985cmlsh6y81789-source/out-of-tree/nixGL",
+        "path": "./../../out-of-tree/nixGL",
         "type": "path"
       }
     },
@@ -131,11 +131,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1672525397,
+        "lastModified": 1672617983,
-        "narHash": "sha256-WASDnyxHKWVrEe0dIzkpH+jzKlCKAk0husv0f/9pyxg=",
+        "narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8ba56d7c0d7490680f2d51ba46a141eca7c46afa",
+        "rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4",
         "type": "github"
       },
       "original": {

nix-conf/home-manager/flake.nix

@@ -7,7 +7,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils.url = "github:numtide/flake-utils";
-    nixgl.url = "./../../out-of-tree/nixGL";
+    nixgl.url = "path:./../../out-of-tree/nixGL";
     rust-overlay.url = "github:oxalica/rust-overlay";
     # Allows default.nix to call onto flake.nix. Useful for nix eval and automations
     flake-compat = {

nix-conf/system/flake.lock

@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1671359686,
+        "lastModified": 1672525397,
-        "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
+        "narHash": "sha256-WASDnyxHKWVrEe0dIzkpH+jzKlCKAk0husv0f/9pyxg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
+        "rev": "8ba56d7c0d7490680f2d51ba46a141eca7c46afa",
         "type": "github"
       },
       "original": {

templates/rust-monorepo/flake.nix

@@ -11,23 +11,21 @@
       let
         overlays = [ rust-overlay.overlays.default ];
         pkgs = import nixpkgs { inherit system overlays; };
+        rust_pkgs = (pkgs.rust-bin.selectLatestNightlyWith
+          (
+            toolchain:
+            toolchain.default.override {
+              extensions = [ "rust-src" "rust-analyzer" "rust-docs" "clippy" "miri" ];
+            }
+          ));
         naersk-lib = pkgs.callPackage naersk { };
       in
       {
         defaultPackage = naersk-lib.buildPackage ./.;
         devShell = with pkgs; mkShell {
           buildInputs = [
-            (pkgs.rust-bin.selectLatestNightlyWith
+            rust_pkgs
-              (
-                toolchain:
-                toolchain.default.override {
-                  extensions = [ "rust-src" ];
-                }
-              ))
-            pkgs.rust-analyzer
-            pkgs.bacon  # rust background code checker
           ];
-          RUST_SRC_PATH = rustPlatform.rustLibSrc;
           shellHook = ''
             # nix flake update # is this even needed?
           '';