From 15db0ea5c19c70bce8504290724661586dc94006 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Sat, 8 Apr 2023 00:16:58 +1000 Subject: [PATCH] update to remove media from basant --- basant/shared/config.py | 3 ++- flake.lock | 39 +++++++++++++++++++++++++++++++-------- flake.nix | 1 + 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/basant/shared/config.py b/basant/shared/config.py index 2266ab8..fa7ab19 100644 --- a/basant/shared/config.py +++ b/basant/shared/config.py @@ -3,9 +3,10 @@ nav_tags = ['dev', 'way', 'recipe', 'ops', 'blog', relative_build_url = "" absolute_build_url = "https://anish.lakhwara.com/" files_folder = 'public/' +_folder = 'public/' build_folder = "output/" assets_folder = "./basant/assets/" -medias_folder = "./basant/media/" +medias_folder = "media/" raw_folder = "raw/" template_main = "./basant/partial/main.html" template_nav = "./basant/partial/nav.html" diff --git a/flake.lock b/flake.lock index e59ef2b..51d67ee 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1649667661, - "narHash": "sha256-9cbstidkXdAC3ZzokV6clgCoeLSbbs2tis9KFsqCzTM=", + "lastModified": 1662446902, + "narHash": "sha256-Dmsd3jSG2ldZUlhFaIwunqgMf14EEK7ylXpw+OPDLxE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a48aeae76ad50bb15ad9bda2cf51d7ae5c621853", + "rev": "3bfaf06b12253ddaafe64a67f4ed39b547d41667", "type": "github" }, "original": { @@ -47,14 +47,15 @@ }, "poonam": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "vimwiki-cli": "vimwiki-cli" }, "locked": { - "lastModified": 1650036007, - "narHash": "sha256-ybTF+wYqdjZcmidtTXPmyBpGsjdOGApDNw7ri5E6Uac=", + "lastModified": 1680876003, + "narHash": "sha256-3aN6OSLrDpMHgViYr+C0qV7bVULpoN2vkcEdeKPq7B8=", "ref": "main", - "rev": "4864d9de300f3dc3e70becc36442b1494da6a3b2", - "revCount": 325, + "rev": "65bb6b4d5f1f3e6f022b939b7feaf927c5c712cd", + "revCount": 588, "type": "git", "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" }, @@ -70,6 +71,28 @@ "nixpkgs": "nixpkgs", "poonam": "poonam" } + }, + "vimwiki-cli": { + "inputs": { + "nixpkgs": [ + "poonam", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1662448409, + "narHash": "sha256-Xd8CuFcEpEQK/TjNBXcp1HqPJCc7LwkMqKa1WiAP1Zc=", + "ref": "main", + "rev": "a73c4695cf116c2e8194a5caa837c2f9e1a7e2fb", + "revCount": 7, + "type": "git", + "url": "ssh://gitea@git.sealight.xyz/aynish/vimwiki-cli" + }, + "original": { + "ref": "main", + "type": "git", + "url": "ssh://gitea@git.sealight.xyz/aynish/vimwiki-cli" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c82c20d..fd891e4 100644 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,7 @@ buildInputs = [ poonam.defaultPackage.${system} self.packages.${system}.basant ]; configurePhase = '' cp -r ${poonam.defaultPackage.${system}}/public/ ./ + cp -r ${poonam.defaultPackage.${system}}/assets/ ./ ''; buildPhase = '' ${self.packages.${system}.basant}/bin/main.py