From 6531d501a9d94cacaf3caf782ae02dba929db17d Mon Sep 17 00:00:00 2001 From: june Date: Thu, 19 Feb 2026 20:33:23 +0100 Subject: [PATCH] meta: nix refactor (#1) Reviewed-on: https://codeberg.org/comfysage/ebil/pulls/1 Co-authored-by: june Co-committed-by: june --- .envrc | 3 +++ flake.nix | 10 ++++------ default.nix => nix/package.nix | 0 nix/shell.nix | 7 +++++++ 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 .envrc rename default.nix => nix/package.nix (100%) create mode 100644 nix/shell.nix diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..988d72b --- /dev/null +++ b/.envrc @@ -0,0 +1,3 @@ +if has nix; then + use flake +fi diff --git a/flake.nix b/flake.nix index 11c13ec..2ee82c7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,7 @@ { description = "ebil.club cli"; - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - }; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; outputs = { self, nixpkgs }: @@ -16,14 +14,14 @@ in { packages = forAllSystems (pkgs: { - ebil = pkgs.callPackage ./default.nix { }; + ebil = pkgs.callPackage ./nix/package.nix { }; default = self.packages.${pkgs.stdenv.hostPlatform.system}.ebil; }); devShells = forAllSystems (pkgs: { - default = pkgs.callPackage ./shell.nix { }; + default = pkgs.callPackage ./nix/shell.nix { }; }); - overlays.default = final: _: { ebil = final.callPackage ./default.nix { }; }; + overlays.default = final: _: { ebil = final.callPackage ./nix/package.nix { }; }; }; } diff --git a/default.nix b/nix/package.nix similarity index 100% rename from default.nix rename to nix/package.nix diff --git a/nix/shell.nix b/nix/shell.nix new file mode 100644 index 0000000..1bdf337 --- /dev/null +++ b/nix/shell.nix @@ -0,0 +1,7 @@ +{ mkShellNoCC, shellcheck, shfmt }: +mkShellNoCC { + packages = [ + shellcheck + shfmt + ]; +} -- 2.51.2