Skip to content

Commit

Permalink
Merge pull request #25 from cspr-rad/minor-refactor
Browse files Browse the repository at this point in the history
Add editorconfig and use inputs from kairos for the default devShell
  • Loading branch information
marijanp authored Feb 20, 2024
2 parents 94b6346 + f0acb01 commit 376fe49
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
7 changes: 7 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
5 changes: 1 addition & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit 376fe49

Please sign in to comment.