update flake, add lfs

This commit is contained in:
Anton Davydov 2022-04-28 00:01:21 +04:00
parent 2836880fde
commit 9dd1287f70
6 changed files with 56 additions and 67 deletions

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
lfs/** filter=lfs diff=lfs merge=lfs -text

View File

@ -1,30 +1,11 @@
#+TITLE: tree_ru #+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 ** serve
#+begin_src sh #+begin_src sh
timeline-backend nix develop
csvs-ui
#+end_src
** init lfs
#+begin_src
git lfs install --local
#+end_src #+end_src

View File

@ -1,43 +1,60 @@
{ {
"nodes": { "nodes": {
"antea": { "csvs-sh": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1648675498, "lastModified": 1651079676,
"narHash": "sha256-JzaAQBDlxTtsm7hJ5d6IFsZnJ3EtFWpcOCHoWQzc+b8=", "narHash": "sha256-AxIViFd26tbHqWBxa5coc89mnkfaDPPkSfE6JyjWX8Q=",
"ref": "master", "ref": "main",
"rev": "41d3a1fe676d70d4a86a564b1cabe3c0c3e6d14e", "rev": "67080695be516e71ce37f3f2b528bc9e55bdbf27",
"revCount": 92, "revCount": 2,
"type": "git", "type": "git",
"url": "https://source.fetsorn.website/fetsorn/antea" "url": "https://source.fetsorn.website/fetsorn/csvs-sh"
}, },
"original": { "original": {
"ref": "main",
"type": "git", "type": "git",
"url": "https://source.fetsorn.website/fetsorn/antea" "url": "https://source.fetsorn.website/fetsorn/csvs-sh"
} }
}, },
"csvs": { "csvs-ui": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1648708698, "lastModified": 1651084525,
"narHash": "sha256-oQNa06omqWUJ26tHATkvvR2eG6IT+TwC+FBXAi09GFw=", "narHash": "sha256-i7BFMLnoW8rBjlvWOlFA40NkpOlmT6jQFPa4+0RYzRw=",
"ref": "main", "ref": "main",
"rev": "2d3272cf74a380be99d6a7a4ff837319b4a8a27b", "rev": "640ed28373cdc7bef46aec07a8ed04d91d6ce18d",
"revCount": 31, "revCount": 138,
"type": "git", "type": "git",
"url": "https://source.fetsorn.website/fetsorn/csvs" "url": "https://source.fetsorn.website/fetsorn/csvs-ui"
}, },
"original": { "original": {
"ref": "main", "ref": "main",
"type": "git", "type": "git",
"url": "https://source.fetsorn.website/fetsorn/csvs" "url": "https://source.fetsorn.website/fetsorn/csvs-ui"
} }
}, },
"nixpkgs": { "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": { "locked": {
"lastModified": 1641762318, "lastModified": 1641762318,
"narHash": "sha256-QH3qz/f6wlPZMO7DBmFzgFq06QDtu+SWM70QTsYNUjY=", "narHash": "sha256-QH3qz/f6wlPZMO7DBmFzgFq06QDtu+SWM70QTsYNUjY=",
@ -53,29 +70,13 @@
"type": "github" "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": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1648219316, "lastModified": 1651024496,
"narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", "narHash": "sha256-uKSrrw/neSkxX6TXPSaMyfu7iKzFrK7F6HOt6vQefGY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", "rev": "d9e593ed5889f3906dc72811c45bf684be8865cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,8 +88,8 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"antea": "antea", "csvs-sh": "csvs-sh",
"csvs": "csvs", "csvs-ui": "csvs-ui",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
} }
} }

View File

@ -3,8 +3,8 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
antea.url = "git+https://source.fetsorn.website/fetsorn/antea"; csvs-ui.url = "git+https://source.fetsorn.website/fetsorn/csvs-ui?ref=main";
csvs.url = "git+https://source.fetsorn.website/fetsorn/csvs?ref=main"; csvs-sh.url = "git+https://source.fetsorn.website/fetsorn/csvs-sh?ref=main";
}; };
outputs = inputs@{ nixpkgs, ... }: outputs = inputs@{ nixpkgs, ... }:
let let
@ -15,9 +15,9 @@
ret = f system; ret = f system;
op = attrs: key: op = attrs: key:
let let
appendSystem = key: system: ret: { system = ret.key; }; appendSystem = key: system: ret: { ${system} = ret.${key}; };
in attrs // { in attrs // {
key = (attrs.key or { }) ${key} = (attrs.${key} or { })
// (appendSystem key system ret); // (appendSystem key system ret);
}; };
in builtins.foldl' op attrs (builtins.attrNames ret); in builtins.foldl' op attrs (builtins.attrNames ret);
@ -34,8 +34,8 @@
in { in {
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
buildInputs = [ buildInputs = [
inputs.antea.packages.system.timeline-backend-local inputs.csvs-ui.packages.${system}.csvs-ui-backend-local
inputs.csvs.packages.system.csvs-sh inputs.csvs-sh.packages.${system}.csvs-sh
pkgs.git-lfs pkgs.git-lfs
]; ];
shellHook = '' shellHook = ''

3
lfs/as_you_like_it.jpg Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8236ea5a03efa2e397dcd20844915c17b7c181b6f14d8d3b110106a6c3b64237
size 465355

3
lfs/first_folio.jpg Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba0561dadec8c76c31f3145fa0647404e91582bacceeb763c334eeb8befe4f69
size 1537675