From 9dd1287f70ac06bf8b73bdf8cb1655ddbec1946d Mon Sep 17 00:00:00 2001 From: Anton Davydov Date: Thu, 28 Apr 2022 00:01:21 +0400 Subject: [PATCH] update flake, add lfs --- .gitattributes | 1 + README.org | 31 ++++-------------- flake.lock | 73 +++++++++++++++++++++--------------------- flake.nix | 12 +++---- lfs/as_you_like_it.jpg | 3 ++ lfs/first_folio.jpg | 3 ++ 6 files changed, 56 insertions(+), 67 deletions(-) create mode 100644 .gitattributes create mode 100644 lfs/as_you_like_it.jpg create mode 100644 lfs/first_folio.jpg diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..7868190 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +lfs/** filter=lfs diff=lfs merge=lfs -text diff --git a/README.org b/README.org index c4941c4..dba9d33 100644 --- a/README.org +++ b/README.org @@ -1,30 +1,11 @@ #+TITLE: tree_ru -#+begin_src -nix develop -#+end_src -* operations -** annotate -#+begin_src sh - -# build biorg from all datums -scripts/puma -c \ - "metadir/props/datum/index.csv" \ - "bash scripts/build-biorg" \ - "ops/biorg" \ - "index.bi.org" - -# annotate events in biorg - -# break biorg to a temporary metadir -temp=$(cat ops/biorg/links/index.bi.org | bash scripts/break-biorg); -rm "ops/inbox"; -ln -s "temp" "ops/inbox"; - -# merge ../ops/inbox into the metadir -bash scripts/merge ops/inbox ./metadir; -#+end_src ** serve #+begin_src sh -timeline-backend +nix develop +csvs-ui +#+end_src +** init lfs +#+begin_src +git lfs install --local #+end_src diff --git a/flake.lock b/flake.lock index be491c4..b847ede 100644 --- a/flake.lock +++ b/flake.lock @@ -1,43 +1,60 @@ { "nodes": { - "antea": { + "csvs-sh": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1648675498, - "narHash": "sha256-JzaAQBDlxTtsm7hJ5d6IFsZnJ3EtFWpcOCHoWQzc+b8=", - "ref": "master", - "rev": "41d3a1fe676d70d4a86a564b1cabe3c0c3e6d14e", - "revCount": 92, + "lastModified": 1651079676, + "narHash": "sha256-AxIViFd26tbHqWBxa5coc89mnkfaDPPkSfE6JyjWX8Q=", + "ref": "main", + "rev": "67080695be516e71ce37f3f2b528bc9e55bdbf27", + "revCount": 2, "type": "git", - "url": "https://source.fetsorn.website/fetsorn/antea" + "url": "https://source.fetsorn.website/fetsorn/csvs-sh" }, "original": { + "ref": "main", "type": "git", - "url": "https://source.fetsorn.website/fetsorn/antea" + "url": "https://source.fetsorn.website/fetsorn/csvs-sh" } }, - "csvs": { + "csvs-ui": { "inputs": { "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1648708698, - "narHash": "sha256-oQNa06omqWUJ26tHATkvvR2eG6IT+TwC+FBXAi09GFw=", + "lastModified": 1651084525, + "narHash": "sha256-i7BFMLnoW8rBjlvWOlFA40NkpOlmT6jQFPa4+0RYzRw=", "ref": "main", - "rev": "2d3272cf74a380be99d6a7a4ff837319b4a8a27b", - "revCount": 31, + "rev": "640ed28373cdc7bef46aec07a8ed04d91d6ce18d", + "revCount": 138, "type": "git", - "url": "https://source.fetsorn.website/fetsorn/csvs" + "url": "https://source.fetsorn.website/fetsorn/csvs-ui" }, "original": { "ref": "main", "type": "git", - "url": "https://source.fetsorn.website/fetsorn/csvs" + "url": "https://source.fetsorn.website/fetsorn/csvs-ui" } }, "nixpkgs": { + "locked": { + "lastModified": 1651024496, + "narHash": "sha256-uKSrrw/neSkxX6TXPSaMyfu7iKzFrK7F6HOt6vQefGY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d9e593ed5889f3906dc72811c45bf684be8865cf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1641762318, "narHash": "sha256-QH3qz/f6wlPZMO7DBmFzgFq06QDtu+SWM70QTsYNUjY=", @@ -53,29 +70,13 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1645937171, - "narHash": "sha256-n9f9GZBNMe8UMhcgmmaXNObkH01jjgp7INMrUgBgcy4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "22dc22f8cedc58fcb11afe1acb08e9999e78be9c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_3": { "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1651024496, + "narHash": "sha256-uKSrrw/neSkxX6TXPSaMyfu7iKzFrK7F6HOt6vQefGY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "d9e593ed5889f3906dc72811c45bf684be8865cf", "type": "github" }, "original": { @@ -87,8 +88,8 @@ }, "root": { "inputs": { - "antea": "antea", - "csvs": "csvs", + "csvs-sh": "csvs-sh", + "csvs-ui": "csvs-ui", "nixpkgs": "nixpkgs_3" } } diff --git a/flake.nix b/flake.nix index f373312..a8e2627 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - antea.url = "git+https://source.fetsorn.website/fetsorn/antea"; - csvs.url = "git+https://source.fetsorn.website/fetsorn/csvs?ref=main"; + csvs-ui.url = "git+https://source.fetsorn.website/fetsorn/csvs-ui?ref=main"; + csvs-sh.url = "git+https://source.fetsorn.website/fetsorn/csvs-sh?ref=main"; }; outputs = inputs@{ nixpkgs, ... }: let @@ -15,9 +15,9 @@ ret = f system; op = attrs: key: let - appendSystem = key: system: ret: { system = ret.key; }; + appendSystem = key: system: ret: { ${system} = ret.${key}; }; in attrs // { - key = (attrs.key or { }) + ${key} = (attrs.${key} or { }) // (appendSystem key system ret); }; in builtins.foldl' op attrs (builtins.attrNames ret); @@ -34,8 +34,8 @@ in { devShell = pkgs.mkShell { buildInputs = [ - inputs.antea.packages.system.timeline-backend-local - inputs.csvs.packages.system.csvs-sh + inputs.csvs-ui.packages.${system}.csvs-ui-backend-local + inputs.csvs-sh.packages.${system}.csvs-sh pkgs.git-lfs ]; shellHook = '' diff --git a/lfs/as_you_like_it.jpg b/lfs/as_you_like_it.jpg new file mode 100644 index 0000000..23e6fb3 --- /dev/null +++ b/lfs/as_you_like_it.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8236ea5a03efa2e397dcd20844915c17b7c181b6f14d8d3b110106a6c3b64237 +size 465355 diff --git a/lfs/first_folio.jpg b/lfs/first_folio.jpg new file mode 100644 index 0000000..c125449 --- /dev/null +++ b/lfs/first_folio.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba0561dadec8c76c31f3145fa0647404e91582bacceeb763c334eeb8befe4f69 +size 1537675