From d0e2f0ac605faf1d5db3471f59eba9655c277993 Mon Sep 17 00:00:00 2001 From: Jason Haruska <2803+haruska@users.noreply.github.com> Date: Fri, 6 Mar 2026 09:13:28 -0600 Subject: [PATCH] add flake nix --- .envrc | 4 +- .gitignore | 6 +-- devenv.lock | 122 ---------------------------------------------------- devenv.nix | 24 ----------- devenv.yaml | 14 ------ flake.lock | 61 ++++++++++++++++++++++++++ flake.nix | 38 ++++++++++++++++ 7 files changed, 103 insertions(+), 166 deletions(-) delete mode 100644 devenv.lock delete mode 100644 devenv.nix delete mode 100644 devenv.yaml create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.envrc b/.envrc index 5bf8fc15..3550a30f 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1 @@ -source_url "https://raw.githubusercontent.com/cachix/devenv/95f329d49a8a5289d31e0982652f7058a189bfca/direnvrc" "sha256-d+8cBpDfDBj41inrADaJt+bDWhOktwslgoP5YiGJ1v0=" - -use devenv \ No newline at end of file +use flake diff --git a/.gitignore b/.gitignore index 0a1e3b23..679d1723 100644 --- a/.gitignore +++ b/.gitignore @@ -35,12 +35,12 @@ extract_otp_secrets.build/ extract_otp_secrets.dist/ extract_otp_secrets.onefile-build/ extract_otp_secrets.bin -# Devenv -.devenv* -devenv.local.nix +# Nix +result # direnv .direnv +.venv # pre-commit .pre-commit-config.yaml diff --git a/devenv.lock b/devenv.lock deleted file mode 100644 index 8fbbf03f..00000000 --- a/devenv.lock +++ /dev/null @@ -1,122 +0,0 @@ -{ - "nodes": { - "devenv": { - "locked": { - "dir": "src/modules", - "lastModified": 1726050924, - "owner": "cachix", - "repo": "devenv", - "rev": "cf471f691c3765ed431199f61b8bd70530bc4305", - "treeHash": "04a5d566820f8fb1955c7c49ccbd3ff95d9129d7", - "type": "github" - }, - "original": { - "dir": "src/modules", - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "treeHash": "2addb7b71a20a25ea74feeaf5c2f6a6b30898ecb", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "treeHash": "ca14199cabdfe1a06a7b1654c76ed49100a689f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1716977621, - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", - "treeHash": "6d9f1f7ca0faf1bc2eeb397c78a49623260d3412", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1725826545, - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", - "treeHash": "8fc49deaed3f2728a7147c38163cc468a117570a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1725513492, - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", - "treeHash": "4b46d77870afecd8f642541cb4f4927326343b59", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "devenv": "devenv", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/devenv.nix b/devenv.nix deleted file mode 100644 index 87107038..00000000 --- a/devenv.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - pkgs, - lib, - config, - inputs, - ... -}: - -{ - cachix.enable = false; - - languages.python = { - enable = true; - venv = { - enable = true; - requirements = ./requirements.txt; - }; - }; - - packages = [ - pkgs.git - pkgs.zbar - ]; -} diff --git a/devenv.yaml b/devenv.yaml deleted file mode 100644 index 2457af5d..00000000 --- a/devenv.yaml +++ /dev/null @@ -1,14 +0,0 @@ -inputs: - nixpkgs: - url: github:cachix/devenv-nixpkgs/rolling - -# If you're using non-OSS software, you can set allowUnfree to true. -# allowUnfree: true - -# If you're willing to use a package that's vulnerable -# permittedInsecurePackages: -# - "openssl-1.1.1w" - -# If you have more than one devenv you can merge them -#imports: -# - ./backend diff --git a/flake.lock b/flake.lock new file mode 100644 index 00000000..13c3d1c2 --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1772736753, + "narHash": "sha256-au/m3+EuBLoSzWUCb64a/MZq6QUtOV8oC0D9tY2scPQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "917fec990948658ef1ccd07cef2a1ef060786846", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 00000000..518788e5 --- /dev/null +++ b/flake.nix @@ -0,0 +1,38 @@ +{ + description = "extract_otp_secrets dev environment"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + python = pkgs.python312; + in + { + devShells.default = pkgs.mkShell { + packages = [ + python + pkgs.zbar + pkgs.git + ]; + + env = { + LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [ pkgs.zbar ]; + } // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { + DYLD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [ pkgs.zbar ]; + }; + + shellHook = '' + if [ ! -d .venv ]; then + ${python}/bin/python -m venv .venv + fi + source .venv/bin/activate + pip install -q -U -r requirements.txt + ''; + }; + }); +}