2 files changed, 25 insertions, 31 deletions

diff --git a/pkgs/by-name/ya/yambar-cpu/flake.nix b/pkgs/by-name/ya/yambar-cpu/flake.nix
index 6480a40d..3a27bccf 100644
--- a/pkgs/by-name/ya/yambar-cpu/flake.nix
+++ b/pkgs/by-name/ya/yambar-cpu/flake.nix
@@ -3,31 +3,28 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    crane.url = "github:ipetkov/crane";
-    crane.inputs.nixpkgs.follows = "nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs = {
-    self,
     nixpkgs,
-    crane,
     flake-utils,
     ...
   }:
     flake-utils.lib.eachDefaultSystem (system: let
-      craneLib = crane.mkLib pkgs;
-      craneBuild = craneLib.buildPackage {
-        src = craneLib.cleanCargoSource ./.;
-
-        doCheck = true;
-      };
+      pkgs = nixpkgs.legacyPackages."${system}";
     in {
-      packages.default = craneBuild;
-      legacyPackages.default = craneBuild;
-      app.default = {
-        type = "app";
-        program = "${self.packages.${system}.default}/bin/cpu_usage";
+      devShells.default = pkgs.mkShell {
+        packages = with pkgs; [
+          # rust stuff
+          cargo
+          clippy
+          rustc
+          rustfmt
+
+          cargo-edit
+          cargo-expand
+        ];
       };
     });
 }
diff --git a/pkgs/by-name/ya/yambar-memory/flake.nix b/pkgs/by-name/ya/yambar-memory/flake.nix
index 030667f1..9182eceb 100644
--- a/pkgs/by-name/ya/yambar-memory/flake.nix
+++ b/pkgs/by-name/ya/yambar-memory/flake.nix
@@ -1,33 +1,30 @@
 {
-  description = "A smart way to check your cpu usage";
+  description = "A smart way to check your memory usage";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    crane.url = "github:ipetkov/crane";
-    crane.inputs.nixpkgs.follows = "nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs = {
-    self,
     nixpkgs,
-    crane,
     flake-utils,
     ...
   }:
     flake-utils.lib.eachDefaultSystem (system: let
-      craneLib = crane.mkLib pkgs;
-      craneBuild = craneLib.buildPackage {
-        src = craneLib.cleanCargoSource ./.;
-
-        doCheck = true;
-      };
+      pkgs = nixpkgs.legacyPackages."${system}";
     in {
-      packages.default = craneBuild;
-      legacyPackages.default = craneBuild;
-      app.default = {
-        type = "app";
-        program = "${self.packages.${system}.default}/bin/memory";
+      devShells.default = pkgs.mkShell {
+        packages = with pkgs; [
+          # rust stuff
+          cargo
+          clippy
+          rustc
+          rustfmt
+
+          cargo-edit
+          cargo-expand
+        ];
       };
     });
 }