Skip to content

Commit

Permalink
Merge branch 'main' into feat/following-mode
Browse files Browse the repository at this point in the history
  • Loading branch information
TornaxO7 committed Dec 13, 2023
2 parents dc50a96 + 602957f commit 5e15ef5
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 26 deletions.
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock

.direnv/
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 27 additions & 17 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,29 +1,39 @@
{
description = "Home Manager configuration of arijit";

{
inputs = {
# Specify the source of Home Manager and Nixpkgs.
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
rust-overlay.url = "github:oxalica/rust-overlay";
flake-utils.url = "github:numtide/flake-utils";
flake-utils.url = "github:numtide/flake-utils";
};

outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }:
flake-utils.lib.eachDefaultSystem(system:
outputs = { nixpkgs, rust-overlay, flake-utils, ... }:
flake-utils.lib.eachDefaultSystem (system:
let
overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs {
inherit system overlays;
};
in
with pkgs;
{
devShells.default = mkShell {
buildInputs = [
rust-bin.stable."1.67.0".default
just
];

rust-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
rust-nightly-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain-nightly.toml;

shared_packages = with pkgs; [
just
];
in
with pkgs;
{
devShells = rec {
default = msrv;

nightly = mkShell {
packages = shared_packages ++ [ rust-nightly-toolchain ];
};
}
);
}

msrv = mkShell {
packages = shared_packages ++ [ rust-toolchain ];
};
};
}
);
}
3 changes: 3 additions & 0 deletions rust-toolchain-nightly.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "nightly-2023-12-13"
components = ["rust-analyzer", "rust-src"]
3 changes: 3 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "1.67.0"
components = ["rust-src", "rust-analyzer"]

0 comments on commit 5e15ef5

Please sign in to comment.