Skip to content

Commit

Permalink
Update flake usage
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasjm committed Jan 2, 2025
1 parent 3c3ec88 commit a06d061
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 33 deletions.
10 changes: 4 additions & 6 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@

# if ! has nix_direnv_version || ! nix_direnv_version 2.2.0; then
# source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.0/direnvrc" "sha256-5EwyKnkJNQeXrRkYbwwRBcXbibosCJqyIUuz9Xq+LRc="
# fi
if ! has nix_direnv_version || ! nix_direnv_version 2.2.0; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.0/direnvrc" "sha256-5EwyKnkJNQeXrRkYbwwRBcXbibosCJqyIUuz9Xq+LRc="
fi

# use_flake

export NIX_PATH=nixpkgs=$(nix run .#nixpkgsPath)
use_flake
21 changes: 0 additions & 21 deletions flake.lock

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

10 changes: 4 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
{
description = "Sandwich";

inputs.gitignore = {
url = "github:hercules-ci/gitignore.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
inputs.nixpkgsMaster.url = "github:NixOS/nixpkgs/master";
inputs.flake-utils.url = "github:numtide/flake-utils";

outputs = { self, gitignore, nixpkgs, nixpkgsMaster, flake-utils }:
outputs = { self, nixpkgs, nixpkgsMaster, flake-utils }:
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
let
pkgs = import nixpkgs { inherit system; };
Expand All @@ -29,7 +25,9 @@
};

devShells.default = pkgs.mkShell {
buildInputs = [ pkgs.htop ];
buildInputs = with pkgs; [
nodejs
];
};
});
}

0 comments on commit a06d061

Please sign in to comment.