1 files changed, 43 insertions, 66 deletions
diff --git a/flake.nix b/flake.nix
index 75d34114..66c34eb1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,74 +1,51 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
-    fenix = {
-      url = "github:nix-community/fenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
   };
-  outputs =
-    { self
-    , nixpkgs
-    , flake-utils
-    , fenix
-    , ...
-    }:
-    flake-utils.lib.eachDefaultSystem
-      (system:
-      let
-        pkgs = nixpkgs.outputs.legacyPackages.${system};
-      in
-      {
-        packages.atuin = pkgs.callPackage ./atuin.nix {
-          rustPlatform =
-            let
-              toolchain =
-                fenix.packages.${system}.fromToolchainFile
-                  {
-                    file = ./rust-toolchain.toml;
-                    sha256 = "sha256-mvUGEOHYJpn3ikC5hckneuGixaC+yGrkMM/liDIDgoU=";
-                  };
-            in
-            pkgs.makeRustPlatform {
-              cargo = toolchain;
-              rustc = toolchain;
-            };
-        };
-        packages.default = self.outputs.packages.${system}.atuin;
 
-        devShells.default = self.packages.${system}.default.overrideAttrs (super: {
-          nativeBuildInputs = with pkgs;
-            super.nativeBuildInputs
-            ++ [
-              cargo-edit
-              clippy
-              rustfmt
-            ];
-          RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
+  outputs = {
+    self,
+    nixpkgs,
+    ...
+  }: let
+    system = "x86_64-linux";
+    pkgs = nixpkgs.outputs.legacyPackages.${system};
+  in {
+    packages."${system}" = {
+      atuin = pkgs.callPackage ./atuin.nix {};
+      default = self.outputs.packages.${system}.atuin;
+    };
 
-          shellHook = ''
-            echo >&2 "Setting development database path"
-            export ATUIN_DB_PATH="/tmp/atuin_dev.db"
-            export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db"
+    devShells."${system}".default = self.packages.${system}.default.overrideAttrs (super: {
+      nativeBuildInputs =
+        super.nativeBuildInputs
+        ++ [
+          # rust stuff
+          pkgs.cargo
+          pkgs.clippy
+          pkgs.rustc
+          pkgs.rustfmt
+          pkgs.mold
 
-            if [ -e "''${ATUIN_DB_PATH}" ]; then
-              echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that"
-            fi
+          pkgs.cargo-edit
+          pkgs.cargo-expand
+          pkgs.cargo-flamegraph
+        ];
+      RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
 
-            if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then
-              echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that"
-            fi
-          '';
-        });
-      })
-    // {
-      overlays.default = final: prev: {
-        inherit (self.packages.${final.stdenv.hostPlatform.system}) atuin;
-      };
-    };
+      shellHook = ''
+        echo >&2 "Setting development database path"
+        export ATUIN_DB_PATH="/tmp/atuin_dev.db"
+        export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db"
+
+        if [ -e "''${ATUIN_DB_PATH}" ]; then
+          echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that"
+        fi
+
+        if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then
+          echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that"
+        fi
+      '';
+    });
+  };
 }