Skip to content

Commit

Permalink
feat(nix): replace devenv with flake; cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
eljamm committed Feb 15, 2025
1 parent 5e2ccb2 commit 723f617
Show file tree
Hide file tree
Showing 19 changed files with 411 additions and 221 deletions.
3 changes: 3 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ time = "run --quiet --release -- time"

[env]
AOC_YEAR = "2023"

[target.x86_64-unknown-linux-gnu]
linker = "clang"
7 changes: 5 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
end_of_line = lf
charset = utf-8
insert_final_newline = true
trim_trailing_whitespace = true

Expand All @@ -15,3 +15,6 @@ trim_trailing_whitespace = false

[*.md]
trim_trailing_whitespace = false

[*.nix]
indent_size = 2
8 changes: 6 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
source_url "https://raw.githubusercontent.com/cachix/devenv/95f329d49a8a5289d31e0982652f7058a189bfca/direnvrc" "sha256-d+8cBpDfDBj41inrADaJt+bDWhOktwslgoP5YiGJ1v0="
#! /usr/bin/env bash

use devenv
watch_file \
nix/modules/*.nix \
nix/lib.nix

use flake
29 changes: 10 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
# Generated by Cargo
# will have compiled files and executables
## Nix
.direnv*
.pre-commit-config.yaml

## Rust
# compiled files and executables
debug/
target/

# These are backup files generated by rustfmt
# backup files generated by rustfmt
**/*.rs.bk

# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb

# Tools
.bacon-locations

# Added by cargo

/target

# Advent of Code
## Advent of Code
# @see https://old.reddit.com/r/adventofcode/comments/k99rod/sharing_input_data_were_we_requested_not_to/gf2ukkf/?context=3

data/inputs/*
Expand All @@ -26,15 +28,4 @@ data/puzzles/*
dhat-heap.json

# Benchmarks

data/timings.json

# Nix
.devenv*
.direnv*

# Tools
.bacon-locations

# pre-commit
.pre-commit-config.yaml
137 changes: 0 additions & 137 deletions devenv.lock

This file was deleted.

41 changes: 0 additions & 41 deletions devenv.nix

This file was deleted.

8 changes: 0 additions & 8 deletions devenv.yaml

This file was deleted.

Loading

0 comments on commit 723f617

Please sign in to comment.