diff --git a/flake.nix b/flake.nix index c5ea8b3..e8e1c45 100644 --- a/flake.nix +++ b/flake.nix @@ -17,22 +17,35 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs {inherit system;}; devDeps = with pkgs; [hugo brotli zopfli parallel dart-sass]; - in { + in rec { devShells.default = pkgs.mkShell { LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; packages = devDeps; }; - defaultPackage = pkgs.compressDrvWeb (pkgs.stdenv.mkDerivation { + packages.default = pkgs.compressDrvWeb (pkgs.stdenv.mkDerivation { pname = "jakstys.lt"; version = "1.0.0"; - src = pkgs.lib.cleanSource self; buildInputs = devDeps; buildPhase = "hugo --cleanDestinationDir --printPathWarnings --panicOnWarning"; installPhase = "mv public $out"; }) {}; + apps.default = { + type = "app"; + program = builtins.toString (pkgs.writeShellScript "upload" '' + ${pkgs.rsync}/bin/rsync \ + --info=progress2 \ + --copy-links \ + --archive \ + --partial \ + --delete \ + ${packages.default}/ \ + jakstys.lt:/var/www/jakstys.lt/ + ''); + }; + formatter = pkgs.alejandra; }); } diff --git a/scripts/build-and-upload b/scripts/build-and-upload deleted file mode 100755 index 59c6849..0000000 --- a/scripts/build-and-upload +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -xeuo pipefail -cd "$(git rev-parse --show-toplevel)" - -scripts/build -scripts/upload diff --git a/scripts/upload b/scripts/upload deleted file mode 100755 index 1549e35..0000000 --- a/scripts/upload +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -set -xeuo pipefail -cd "$(git rev-parse --show-toplevel)" - -rsync --info=progress2 -a --partial --delete public/ jakstys.lt:/var/www/jakstys.lt/