From 4406e051686116682ca564ef88722586b4ad5eac Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 21 Oct 2026 19:13:04 +0200 Subject: direnv: Switch to `pre_cache` dev shell implementation --- .envrc | 17 +++++++++++++++++ .gitignore | 19 ++----------------- flake.nix | 21 ++++----------------- 3 files changed, 23 insertions(+), 34 deletions(-) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 00000000..253dad0c --- /dev/null +++ b/.envrc @@ -0,0 +1,17 @@ +source_env_if_exists ./.nenvrc +# use flake + +PATH_add ./scripts +PATH_add ./target/debug + +# 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 diff --git a/.gitignore b/.gitignore index 07c26314..5f05e93e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,7 @@ -.DS_Store -/target -*/target -.env -.idea/ -.vscode/ -result -publish.sh -.envrc -.planning/ - .direnv +/target -ui/backend/target -ui/backend/gen - -sqlite-server.db* - -.atuin/permissions.*.toml +result # Performance testing /perf.data diff --git a/flake.nix b/flake.nix index 5f8584e3..3d91f683 100644 --- a/flake.nix +++ b/flake.nix @@ -54,22 +54,9 @@ checks."${system}".default = tests; - devShells."${system}".default = self.packages.${system}.default.overrideAttrs (super: { - nativeBuildInputs = - super.nativeBuildInputs - ++ [ - # rust stuff - pkgs.cargo - pkgs.clippy - pkgs.rustc - pkgs.rustfmt - pkgs.mold - - pkgs.cargo-edit - pkgs.cargo-expand - pkgs.cargo-flamegraph - ]; - RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}"; - }); + # devShells."${system}".default = self.packages.${system}.default.overrideAttrs (super: { + # inherit (super) nativeBuildInputs; + # RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}"; + # }); }; } -- cgit v1.3.1