From 4480102b5fe1efc6adfe3819859b0aa7e73f77ed Mon Sep 17 00:00:00 2001 From: Uzair Aftab Date: Sun, 19 Jan 2025 15:51:54 +0100 Subject: [PATCH 1/4] feat(build): Add in nix flake for devShell - Flake.nix and lock for devShell - .envrc for direnv - Ignore .direnv folder --- .envrc | 4 ++++ .gitignore | 1 + flake.lock | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 24 ++++++++++++++++++++ 4 files changed, 93 insertions(+) create mode 100644 .envrc create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.envrc b/.envrc new file mode 100644 index 000000000..a94463401 --- /dev/null +++ b/.envrc @@ -0,0 +1,4 @@ +# vim: set ft=bash: +if has nix; then + use flake +fi diff --git a/.gitignore b/.gitignore index cf1f0223a..f2f903b36 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ pnpm-debug.log* # macOS-specific files .DS_Store .vercel +.direnv diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..3ed8f3b29 --- /dev/null +++ b/flake.lock @@ -0,0 +1,64 @@ +{ + "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": 1737110817, + "narHash": "sha256-DSenga8XjPaUV5KUFW/i3rNkN7jm9XmguW+qQ1ZJTR4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "041c867bad68dfe34b78b2813028a2e2ea70a23c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "systems": "systems" + } + }, + "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 000000000..1e44c3d95 --- /dev/null +++ b/flake.nix @@ -0,0 +1,24 @@ +{ + description = "docs.astronvim.org"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + inputs.systems.url = "github:nix-systems/default"; + inputs.flake-utils = { + url = "github:numtide/flake-utils"; + inputs.systems.follows = "systems"; + }; + + outputs = { + nixpkgs, + flake-utils, + ... + }: + flake-utils.lib.eachDefaultSystem ( + system: let + pkgs = nixpkgs.legacyPackages.${system}; + in { + devShells.default = pkgs.mkShell {packages = with pkgs; [nodejs_22 pnpm alejandra];}; + + formatter = pkgs.alejandra; + } + ); +} From 7e19d0c450940542fa045a6b2d14eb334c3df81a Mon Sep 17 00:00:00 2001 From: Uzair Aftab Date: Sun, 19 Jan 2025 16:52:25 +0100 Subject: [PATCH 2/4] chore(build): Remove alejandra as formatter --- flake.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/flake.nix b/flake.nix index 1e44c3d95..2602ae5c3 100644 --- a/flake.nix +++ b/flake.nix @@ -17,8 +17,6 @@ pkgs = nixpkgs.legacyPackages.${system}; in { devShells.default = pkgs.mkShell {packages = with pkgs; [nodejs_22 pnpm alejandra];}; - - formatter = pkgs.alejandra; } ); } From 64a1b773c5acd2d0ff1320afb99dd3272277c01c Mon Sep 17 00:00:00 2001 From: Micah Halter Date: Sun, 19 Jan 2025 11:11:36 -0500 Subject: [PATCH 3/4] fix(build): remove `alejandra` --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2602ae5c3..8ac08f693 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ system: let pkgs = nixpkgs.legacyPackages.${system}; in { - devShells.default = pkgs.mkShell {packages = with pkgs; [nodejs_22 pnpm alejandra];}; + devShells.default = pkgs.mkShell {packages = with pkgs; [nodejs_22 pnpm];}; } ); } From 041d2391a2601231697c38150b119ca30bb366bb Mon Sep 17 00:00:00 2001 From: Micah Halter Date: Sun, 19 Jan 2025 11:13:54 -0500 Subject: [PATCH 4/4] feat(build): add `.tool-versions` for asdf and mise environments --- .tool-versions | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 000000000..f81cb37e6 --- /dev/null +++ b/.tool-versions @@ -0,0 +1,2 @@ +nodejs 22 +pnpm 9