diff --git a/.config/create-work b/.config/create-work new file mode 100755 index 0000000..c3b0f83 --- /dev/null +++ b/.config/create-work @@ -0,0 +1,78 @@ +#!/usr/bin/env nu + +let template_dir = ".config/template" +let config_dir = ".config" +let out_dir = $"(pwd)" +# let out_dir = $"(pwd)/works" + +def main [subject: string, shortcode: string, number?: int] { + let subject_lower = ($subject | str downcase) + let shortcode_lower = ($shortcode | str downcase) + + validate-input $subject $shortcode $number + + let temp_dir = $"/tmp/nure-work-(random chars -l 8)" + let final_dir = $"($out_dir)/($subject_lower)/($shortcode_lower)($number)" + let subject_dir = $"($out_dir)/($subject_lower)" + + # TODO?: replace with git clone + cp -r ($config_dir)/template $temp_dir + # $template | decode base64 | tar zxvf - --strip-components=1 -C $temp_dir o> /dev/null + + generate-doc-toml $shortcode_lower $subject_lower $temp_dir $number + + check-mkdir $out_dir + if ($final_dir | path exists) { + error make -u {msg: $"Directory ($final_dir) already exists"} + } + + check-mkdir $subject_dir; cp -r $temp_dir $final_dir; rm -rf $temp_dir + + print $"=> Created new work: ($final_dir)" +} + +def check-mkdir [path: string] { if not ($path | path exists) { mkdir $path } } + +def validate-input [subject: string, shortcode: string, number?: int] { + if not ($config_dir | path exists) { + error make -u {msg: $"($config_dir) not found"} + } + + let defaults_toml = $"($config_dir)/defaults.toml" + let subjects_toml = $"($config_dir)/subjects.toml" + + if not ($defaults_toml | path exists) { + error make -u {msg: $"defaults.toml not found in ($config_dir)"} + } + if not ($subjects_toml | path exists) { + error make -u {msg: $"subjects.toml not found in ($config_dir)"} + } + + if ($number != nothing and $number < 1 ) { + error make -u {msg: "Work number should be greater than 0"} + } + + # Check subject exists (case insensitive) + let subject_lower = ($subject | str downcase) + let subjects = (open $subjects_toml | columns) + if $subject_lower not-in $subjects { + error make -u { + msg: $"Subject '($subject)' not found in configuration" + help: $"Available subjects: ($subjects | str join ', ')" + } + } +} + +def generate-doc-toml [shortcode: string, subject: string, target_dir: string, number?: int] { + let defaults = (open $"($config_dir)/defaults.toml") + let subjects = (open $"($config_dir)/subjects.toml") + + let subject_data = ($subjects | get $subject) + let work_type = ($defaults | get work_types | try { get $shortcode } catch { $shortcode }) + + { + university: ($defaults | get university) + subject: ($subject_data | get name), type: $work_type, number: $number + mentors: ($subject_data | get mentors), authors: [($defaults | get default_author)] + } | compact --empty | to toml | save $"($target_dir)/src/doc.toml" --force +} diff --git a/.config/create-work.nu b/.config/create-work.nu deleted file mode 100755 index d94e057..0000000 --- a/.config/create-work.nu +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/env nu - -use std - -let template_dir = ".config/template" -let config_dir = ".config" -let out_dir = $"(pwd)" -# let out_dir = $"(pwd)/works" - -# Encoded .tar.gz archive -let template = "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" - -def main [subject: string, shortcode: string, number?: int] { - let subject_lower = ($subject | str downcase) - let shortcode_lower = ($shortcode | str downcase) - - validate-input $subject $shortcode $number - - let temp_dir = (mktemp -d) - let final_dir = $"($out_dir)/($subject_lower)/($shortcode_lower)($number)" - let subject_dir = $"($out_dir)/($subject_lower)" - - # TODO?: replace with git clone - $template | decode base64 | tar zxvf - --strip-components=1 -C $temp_dir o> (std null-device) - - generate-doc-toml $shortcode_lower $subject_lower $temp_dir $number - - if not ($out_dir | path exists) { mkdir $out_dir } - if ($final_dir | path exists) { - error make -u {msg: $"Directory ($final_dir) already exists"} - } - - mkdir $subject_dir; cp -r $temp_dir $final_dir; rm -rf $temp_dir - - print $"=> Created new work: ($final_dir)" -} - -def validate-input [subject: string, shortcode: string, number?: int] { - if not ($config_dir | path exists) { - error make -u {msg: $"($config_dir) not found"} - } - - let defaults_toml = $"($config_dir)/defaults.toml" - let subjects_toml = $"($config_dir)/subjects.toml" - - if not ($defaults_toml | path exists) { - error make -u {msg: $"defaults.toml not found in ($config_dir)"} - } - if not ($subjects_toml | path exists) { - error make -u {msg: $"subjects.toml not found in ($config_dir)"} - } - - if ($number != nothing and $number < 1 ) { - error make -u {msg: "Work number should be greater than 0"} - } - - # Check subject exists (case insensitive) - let subject_lower = ($subject | str downcase) - let subjects = (open $subjects_toml | columns) - if $subject_lower not-in $subjects { - error make -u { - msg: $"Subject '($subject)' not found in configuration" - help: $"Available subjects: ($subjects | str join ', ')" - } - } -} - - -def generate-doc-toml [shortcode: string, subject: string, target_dir: string, number?: int] { - let defaults = (open $"($config_dir)/defaults.toml") - let subjects = (open $"($config_dir)/subjects.toml") - - let subject_data = ($subjects | get $subject) - let work_type = ($defaults | get work_types | try { get $shortcode } catch { $shortcode }) - - { - university: ($defaults | get university) - subject: ($subject_data | get name) - type: $work_type - number: $number - mentors: ($subject_data | get mentors) - authors: [($defaults | get default_author)] - } | compact --empty | to toml | save $"($target_dir)/src/doc.toml" --force -} diff --git a/.config/template.tar.gz b/.config/template.tar.gz deleted file mode 100644 index 01e6980..0000000 Binary files a/.config/template.tar.gz and /dev/null differ diff --git a/.config/template/.envrc b/.config/template/.envrc new file mode 100644 index 0000000..9ebf43c --- /dev/null +++ b/.config/template/.envrc @@ -0,0 +1 @@ +use flake path:$(pwd) diff --git a/.config/template/flake.lock b/.config/template/flake.lock index 7027761..36a2051 100644 --- a/.config/template/flake.lock +++ b/.config/template/flake.lock @@ -21,30 +21,18 @@ "local-nure": { "flake": false, "locked": { - "lastModified": 1769126611, - "narHash": "sha256-4qmXN7kx87pEpZHFJpyRbLfZ5GanF5Jbi1Bmfx6ZXss=", - "path": "/storage/git/typst_nure_template", - "type": "path" + "lastModified": 1769194824, + "narHash": "sha256-gMPvgSEy5SwmbJQ0yFoNmg1a5f4R+1YGgCj8keuZppY=", + "ref": "multi-pages", + "rev": "3e55bb39a25ca9e0c8adddc0e67de49f5a0be4b1", + "revCount": 122, + "type": "git", + "url": "ssh://gitea@linerds.us/unexplrd/typst_nure_template" }, "original": { - "path": "/storage/git/typst_nure_template", - "type": "path" - } - }, - "local-nure-upstream": { - "flake": false, - "locked": { - "lastModified": 1768301144, - "narHash": "sha256-VHZXALfaAw5f32mClZTS7MeTSaDSQtErAjI+lgpYIZk=", - "ref": "refs/heads/0.1.0", - "rev": "549d7f060f81a6356c43b2c231e6453ddae19fca", - "revCount": 111, + "ref": "multi-pages", "type": "git", - "url": "ssh://gitea@gitea.linerds.us/pencelheimer/typst_nure_template" - }, - "original": { - "type": "git", - "url": "ssh://gitea@gitea.linerds.us/pencelheimer/typst_nure_template" + "url": "ssh://gitea@linerds.us/unexplrd/typst_nure_template" } }, "nixpkgs": { @@ -67,7 +55,6 @@ "inputs": { "flake-utils": "flake-utils", "local-nure": "local-nure", - "local-nure-upstream": "local-nure-upstream", "nixpkgs": "nixpkgs", "typix": "typix" } diff --git a/.config/template/flake.nix b/.config/template/flake.nix index f5dbe8c..f455bc3 100644 --- a/.config/template/flake.nix +++ b/.config/template/flake.nix @@ -9,11 +9,11 @@ flake-utils.url = "github:numtide/flake-utils"; - local-nure-upstream.url = "git+ssh://gitea@linerds.us/unexplrd/typst_nure_template?ref=multi-pages"; - # local-nure-upstream.url = "git+ssh://gitea@linerds.us/pencelheimer/typst_nure_template"; - local-nure-upstream.flake = false; + # local-nure-upstream.url = "git+ssh://gitea@linerds.us/unexplrd/typst_nure_template?ref=multi-pages"; + # local-nure-upstream.flake = false; - local-nure.url = "path:/storage/git/typst_nure_template"; + # local-nure.url = "git+ssh://gitea@linerds.us/pencelheimer/typst_nure_template"; + local-nure.url = "git+ssh://gitea@linerds.us/unexplrd/typst_nure_template?ref=multi-pages"; local-nure.flake = false; # Example of downloading icons from a non-flake source @@ -92,17 +92,17 @@ pkgs.linkFarm name linkFarmEntries; unpublishedTypstPackages = mkTypstPackagesDrv "unpublished-packages" [ - { - namespace = "unexplrd"; - name = "test-multifile"; - version = "0.1.0"; - input = inputs.local-nure; - } + # { + # namespace = "unexplrd"; + # name = "test-multifile"; + # version = "0.1.0"; + # input = inputs.local-nure; + # } { namespace = "local"; name = "nure"; version = "0.1.0"; - input = inputs.local-nure-upstream; + input = inputs.local-nure; } ]; diff --git a/.config/template/src/doc.toml b/.config/template/src/doc.toml deleted file mode 100644 index 784502b..0000000 --- a/.config/template/src/doc.toml +++ /dev/null @@ -1,26 +0,0 @@ -university = "ХНУРЕ" - -subject = "ЕРВ" -type = "ЛБ" -number = 3 - -[[mentors]] -name = "Шевченко Т. Г." -degree = "Доцент кафедри ПІ" -gender = "m" - -[[mentors]] -name = "Франко І. Я." -degree = "Асистент кафедри ПІ" -gender = "m" - -[[authors]] -name = "Косач Л. П." -edu_program = "КУІБ" -group = "23-2" -gender = "f" -variant = 8 -# For coursework -full_name_gen = "Косач Лариси Петрівни" -course = 2 -semester = 4 diff --git a/.config/template/src/figures/Google-Logo-700x394.png b/.config/template/src/figures/Google-Logo-700x394.png deleted file mode 100644 index 9967a3c..0000000 Binary files a/.config/template/src/figures/Google-Logo-700x394.png and /dev/null differ diff --git a/.gitignore b/.gitignore index ad56a7c..2fb1001 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,11 @@ # **/lib/ **/src/lib/ **/config/universities.yaml +**/.direnv/ *.pdf # nix artifacts **/result **/result-* +**/.direnv/ diff --git a/erv/lb3/.envrc b/erv/lb3/.envrc new file mode 100644 index 0000000..9ebf43c --- /dev/null +++ b/erv/lb3/.envrc @@ -0,0 +1 @@ +use flake path:$(pwd) diff --git a/erv/lb2/flake.lock b/erv/lb3/flake.lock similarity index 100% rename from erv/lb2/flake.lock rename to erv/lb3/flake.lock diff --git a/erv/lb2/flake.nix b/erv/lb3/flake.nix similarity index 100% rename from erv/lb2/flake.nix rename to erv/lb3/flake.nix diff --git a/erv/lb2/justfile b/erv/lb3/justfile similarity index 100% rename from erv/lb2/justfile rename to erv/lb3/justfile diff --git a/erv/lb2/src/assets/sample.c b/erv/lb3/src/assets/sample.c similarity index 100% rename from erv/lb2/src/assets/sample.c rename to erv/lb3/src/assets/sample.c diff --git a/erv/lb2/src/assets/table.csv b/erv/lb3/src/assets/table.csv similarity index 100% rename from erv/lb2/src/assets/table.csv rename to erv/lb3/src/assets/table.csv diff --git a/erv/lb2/src/chapters/appendices.typ b/erv/lb3/src/chapters/appendices.typ similarity index 100% rename from erv/lb2/src/chapters/appendices.typ rename to erv/lb3/src/chapters/appendices.typ diff --git a/erv/lb2/src/doc.toml b/erv/lb3/src/doc.toml similarity index 97% rename from erv/lb2/src/doc.toml rename to erv/lb3/src/doc.toml index 293e2a1..8412b39 100644 --- a/erv/lb2/src/doc.toml +++ b/erv/lb3/src/doc.toml @@ -1,7 +1,7 @@ university = "ХНУРЕ" subject = "ЕРВ" type = "ЛБ" -number = 2 +number = 3 [[mentors]] name = "Шевченко Т. Г." diff --git a/erv/lb2/src/main.typ b/erv/lb3/src/main.typ similarity index 100% rename from erv/lb2/src/main.typ rename to erv/lb3/src/main.typ diff --git a/erv/lb2/src/utils.typ b/erv/lb3/src/utils.typ similarity index 100% rename from erv/lb2/src/utils.typ rename to erv/lb3/src/utils.typ diff --git a/justfile b/justfile index 8011ad4..3c4038c 100644 --- a/justfile +++ b/justfile @@ -4,4 +4,4 @@ default: # Create new work from template new subject shortcode number="": - @./.config/create-work.nu {{subject}} {{shortcode}} {{number}} + @./.config/create-work {{subject}} {{shortcode}} {{number}}