adapt

flake.nix

@@ -9,19 +9,18 @@
       flake-utils.url = "github:numtide/flake-utils";
       devshell.url = "github:numtide/devshell";
       naersk.url = "github:nmattia/naersk";
-      naersk.inputs.nixpkgs.follows = "master";
       mozilla-overlay = { url = "github:mozilla/mozilla-nixpkgs"; flake = false; };
     };
 
-  outputs = inputs@{ self, home, nixos, master, flake-utils, nur, devshell }:
+  outputs = inputs@{ self, home, nixos, master, flake-utils, nur, devshell, naersk, mozilla-overlay }:
     let
       inherit (builtins) attrNames attrValues readDir elem pathExists filter;
       inherit (flake-utils.lib) eachDefaultSystem mkApp;
       inherit (nixos) lib;
       inherit (lib) all removeSuffix recursiveUpdate genAttrs filterAttrs
         mapAttrs;
       inherit (utils) pathsToImportedAttrs genPkgset overlayPaths modules
-        genPackages pkgImport devShellModules;
+        genPackages pkgImport devshells;
 
       utils = import ./lib/utils.nix { inherit lib; };
 
@@ -48,7 +47,7 @@
 
         nixosModules = modules;
 
-        devShellModules = devShellModules;
+        devshellModules = devshells;
 
         templates.flk.path = ./.;
 

lib/utils.nix

@@ -82,7 +82,7 @@ in
       (recursiveUpdate cachixAttrs modulesAttrs)
       profilesAttrs;
 
-  devShellModules =
+  devshells =
     let
       # shells
       shellList = import ../shells/list.nix;

shells/rust/default.nix

@@ -1,27 +1,32 @@
-with pkgs;
+{ config, lib, ... }: {
+  options.nixflk.rust = {
+    enable = lib.mkEnableOption "nixflk.rust";
+    openssl = lib.mkEnableOption "nixflk.rust.openssl";
+  };
+  config = lib.optionalAttrs nixflk.rust.enable {
+    name = "Nixflk Rust DevShell";
 
-mkDevShell {
-  name = "Personal Rust DevShell";
+    packages = [
+      latest.rustChannels.stable.rust
+      wasm-bindgen-cli
+      binaryen
 
-  packages = [
-    latest.rustChannels.stable.rust
-    wasm-bindgen-cli
-    binaryen
-
-    ncurses
-    pkgconfig
+      ncurses
+      pkgconfig
+    ] ++ if options.nixflk.rust.openssl then [
     openssl
     openssl.dev
-  ];
+    ] else [];
 
-  env.RUST_BACKTRACE = "1";
+    env.RUST_BACKTRACE = "1";
 
-  commands = [
-    {
-      name = "hello";
-      help = "say hello";
-      category = "fun";
-      command = "echo '''hello''' ";
-    }
-  ];
-}
+    commands = [
+      {
+        name = "hello";
+        help = "say hello";
+        category = "fun";
+        command = "echo '''hello''' ";
+      }
+    ];
+  };
+};