From 521af2d17abadfc2118c1d374eb6f95452afd82b Mon Sep 17 00:00:00 2001 From: saji Date: Sun, 20 Apr 2025 09:57:57 -0500 Subject: [PATCH] move package to separate file --- flake.nix | 36 ++++++++++++++---------------------- package.nix | 10 ++++++++-- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/flake.nix b/flake.nix index 1f682d2..4374826 100644 --- a/flake.nix +++ b/flake.nix @@ -16,30 +16,22 @@ )); in { - packages = forAllSystems (pkgs: rec { - default = pkgs.buildNpmPackage { - name = "myblog"; - version = "unstable"; - buildInputs = with pkgs; [ - nodejs - vips - ]; - nativeBuildInputs = with pkgs; [ - pkg-config - ]; - # npmDepsHash = "sha256-rMU1q2BPvPihovOyjbCezd1UyEODSrtCLr9TJedOVl0="; - npmDeps = pkgs.importNpmLock { - npmRoot = ./.; - - }; - npmConfigHook = pkgs.importNpmLock.npmConfigHook; - src = ./.; - installPhase = '' - mkdir -p $out/public - cp -ar _site/* $out/public/ - ''; + apps = forAllSystems (pkgs: { + "deploy" = { + type = "app"; + program = let + ci = (pkgs.writeShellApplication { + name = "ci.sh"; + text = '' + nix build + ''; + }); + in "${ci}/ci.sh"; }; }); + packages = forAllSystems (pkgs: { + default = pkgs.callPackage ./package.nix {}; + }); deploy.nodes.myblog = { hostname = "saji.dev"; profiles.mysite = { diff --git a/package.nix b/package.nix index 7124b12..5282464 100644 --- a/package.nix +++ b/package.nix @@ -4,15 +4,16 @@ buildNpmPackage, importNpmLock, vips, + lib, }: buildNpmPackage { name = "myblog"; version = "unstable"; buildInputs = [ - nodejs - vips ]; nativeBuildInputs = [ pkg-config + nodejs + vips ]; npmDeps = importNpmLock { npmRoot = ./.; @@ -23,4 +24,9 @@ mkdir -p $out/public cp -ar _site/* $out/public/ ''; + meta = { + description = "My blog, yay"; + homepage = "https://saji.dev"; + platforms = lib.platforms.all; + }; }