From 77b6ff52e533c27b11771814dba1fd561a3d6336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?= Date: Tue, 20 Feb 2024 15:39:08 +0700 Subject: [PATCH 1/2] editorconfig: initial config --- .editorconfig | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..850f4631 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,7 @@ +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true From f0acb0192997464262f8bf5d9a0c3e4a77aa3c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?= Date: Tue, 20 Feb 2024 15:39:47 +0700 Subject: [PATCH 2/2] flake/devShell/default: use inputs from kairos --- flake.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index b89616d5..59d93946 100644 --- a/flake.nix +++ b/flake.nix @@ -61,10 +61,7 @@ devShells.default = pkgs.mkShell { # Rust Analyzer needs to be able to find the path to default crate RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library"; - - nativeBuildInputs = [ - rustToolchain - ] ++ kairosNodeAttrs.nativeBuildInputs; + inputsFrom = [ self'.packages.kairos ]; }; packages = {