From 5f41fd8b8b7cc2db152d4c353ce7da4c75e2dcf2 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sun, 1 May 2022 13:35:46 -0700 Subject: build: slowly moving to nix Add a `flake.nix' configuration to pull the required dependencies and run the server. Remove a few targets from the Makefile and move the deployment part to a script. --- users/fcuny/blog/flake.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 users/fcuny/blog/flake.nix (limited to 'users/fcuny/blog/flake.nix') diff --git a/users/fcuny/blog/flake.nix b/users/fcuny/blog/flake.nix new file mode 100644 index 0000000..59ef578 --- /dev/null +++ b/users/fcuny/blog/flake.nix @@ -0,0 +1,19 @@ +{ + description = "Franck Cuny's personal website."; + + inputs = { nixpkgs.url = "github:nixos/nixpkgs"; }; + + outputs = { self, nixpkgs }: + let pkgs = nixpkgs.legacyPackages.x86_64-linux; + in { + defaultApp.x86_64-linux = self.apps.server; + apps.server = pkgs.writers.writeBashBin "server" '' + set -e + set -o pipefail + PATH=${pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git ]} + hugo server + ''; + devShell.x86_64-linux = + pkgs.mkShell { buildInputs = with pkgs; [ hugo flyctl git ]; }; + }; +} -- cgit v1.2.3 From 2e8a5c27fb3c48cd4c32e001d4cfc4b3f051d72f Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 10 May 2022 17:56:40 -0700 Subject: add drone configuration and cleanup nix Add a drone configuration to run the deploy on a push to the main branch. Cleanup the nix configuration to only keep support for `nix run` (which will run the hugo server). --- users/fcuny/blog/flake.nix | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'users/fcuny/blog/flake.nix') diff --git a/users/fcuny/blog/flake.nix b/users/fcuny/blog/flake.nix index 59ef578..fa39b45 100644 --- a/users/fcuny/blog/flake.nix +++ b/users/fcuny/blog/flake.nix @@ -1,19 +1,23 @@ { description = "Franck Cuny's personal website."; - inputs = { nixpkgs.url = "github:nixos/nixpkgs"; }; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs"; + flake-utils.url = "github:numtide/flake-utils"; + }; - outputs = { self, nixpkgs }: - let pkgs = nixpkgs.legacyPackages.x86_64-linux; - in { - defaultApp.x86_64-linux = self.apps.server; - apps.server = pkgs.writers.writeBashBin "server" '' - set -e - set -o pipefail - PATH=${pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git ]} - hugo server - ''; - devShell.x86_64-linux = - pkgs.mkShell { buildInputs = with pkgs; [ hugo flyctl git ]; }; - }; + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let pkgs = nixpkgs.legacyPackages.${system}; + in { + defaultApp = pkgs.writers.writeBashBin "run-hugo" '' + set -e + set -o pipefail + export PATH=${pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git ]} + hugo server -D + ''; + + devShell = + pkgs.mkShell { buildInputs = with pkgs; [ hugo flyctl git ]; }; + }); } -- cgit v1.2.3 From 9c1943defe0eb37ccebd4c7756d8f4c0c021d208 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 10 May 2022 18:05:53 -0700 Subject: one more time --- users/fcuny/blog/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/fcuny/blog/flake.nix') diff --git a/users/fcuny/blog/flake.nix b/users/fcuny/blog/flake.nix index fa39b45..35ada07 100644 --- a/users/fcuny/blog/flake.nix +++ b/users/fcuny/blog/flake.nix @@ -18,6 +18,6 @@ ''; devShell = - pkgs.mkShell { buildInputs = with pkgs; [ hugo flyctl git ]; }; + pkgs.mkShell { buildInputs = with pkgs; [ hugo flyctl git jq ]; }; }); } -- cgit v1.2.3 From 3f98841adfb8b553678025219caa45625b396ddf Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 10 May 2022 19:18:21 -0700 Subject: another try --- users/fcuny/blog/flake.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'users/fcuny/blog/flake.nix') diff --git a/users/fcuny/blog/flake.nix b/users/fcuny/blog/flake.nix index 35ada07..7d5a4b2 100644 --- a/users/fcuny/blog/flake.nix +++ b/users/fcuny/blog/flake.nix @@ -10,6 +10,18 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in { + defaultPackage = with pkgs; + stdenv.mkDerivation { + pname = "fcuny.net"; + version = self.lastModifiedDate; + src = ./.; + buildInputs = [ hugo git ]; + buildPhase = '' + mkdir -p $out + hugo --minify --destination $out + ''; + dontInstall = true; + }; defaultApp = pkgs.writers.writeBashBin "run-hugo" '' set -e set -o pipefail @@ -17,6 +29,15 @@ hugo server -D ''; + deploy = pkgs.writers.writeBashBin "run-deploy" '' + set -e + set -o pipefile + export PATH=${ + pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git pkgs.jq pkgs.flyctl ] + } + ./scripts/deploy.sh + ''; + devShell = pkgs.mkShell { buildInputs = with pkgs; [ hugo flyctl git jq ]; }; }); -- cgit v1.2.3 From d2e2cc7fcad35cbb3189d1f51bf01bed57e7beaa Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 10 May 2022 19:28:33 -0700 Subject: i don't think it will work --- users/fcuny/blog/flake.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'users/fcuny/blog/flake.nix') diff --git a/users/fcuny/blog/flake.nix b/users/fcuny/blog/flake.nix index 7d5a4b2..1c9b9dd 100644 --- a/users/fcuny/blog/flake.nix +++ b/users/fcuny/blog/flake.nix @@ -22,6 +22,7 @@ ''; dontInstall = true; }; + defaultApp = pkgs.writers.writeBashBin "run-hugo" '' set -e set -o pipefail @@ -29,14 +30,15 @@ hugo server -D ''; - deploy = pkgs.writers.writeBashBin "run-deploy" '' - set -e - set -o pipefile - export PATH=${ - pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git pkgs.jq pkgs.flyctl ] - } - ./scripts/deploy.sh - ''; + apps = { + deploy = pkgs.pkgs.writeShellScriptBin "run-deploy" '' + set -euxo pipefail + export PATH=${ + pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git pkgs.jq pkgs.flyctl ] + }:$PATH + ./scripts/deploy.sh + ''; + }; devShell = pkgs.mkShell { buildInputs = with pkgs; [ hugo flyctl git jq ]; }; -- cgit v1.2.3 From 573db8f7db0c489b3a2f7c514f8a0651a7b26439 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 10 May 2022 19:29:19 -0700 Subject: who knows --- users/fcuny/blog/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/fcuny/blog/flake.nix') diff --git a/users/fcuny/blog/flake.nix b/users/fcuny/blog/flake.nix index 1c9b9dd..79e6953 100644 --- a/users/fcuny/blog/flake.nix +++ b/users/fcuny/blog/flake.nix @@ -36,7 +36,7 @@ export PATH=${ pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git pkgs.jq pkgs.flyctl ] }:$PATH - ./scripts/deploy.sh + bash ./scripts/deploy.sh ''; }; -- cgit v1.2.3