From 8e7fa27dc8e66d192d6d8d5c62b8670c7acde1ab Mon Sep 17 00:00:00 2001 From: technofab Date: Mon, 5 Jan 2026 22:10:17 +0100 Subject: [PATCH 1/2] chore: add devtools --- .gitlab-ci.yml | 4 +-- docs/index.md | 1 - nix/repo/devShells.nix | 64 ++++++++++++++++++++++++++++++++++++------ nix/repo/flake.lock | 28 +++++++++++++++--- nix/repo/flake.nix | 7 +++-- 5 files changed, 86 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a415272..7d70f67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ # Generated by soonix, DO NOT EDIT include: -- component: gitlab.com/TECHNOFAB/nix-gitlab-ci/nix-gitlab-ci@3.0.0-alpha.2 +- component: gitlab.com/TECHNOFAB/nix-gitlab-ci/nix-gitlab-ci@3.1.2 inputs: - version: 3.0.0-alpha.2 + version: 3.1.2 diff --git a/docs/index.md b/docs/index.md index 986e3aa..b457a50 100644 --- a/docs/index.md +++ b/docs/index.md @@ -102,4 +102,3 @@ Soonix is designed as a cleaner, more maintainable alternative to Nixago: Ready to start using Soonix? Check out the [Usage Guide](./usage.md) for detailed setup instructions and examples, or browse the [Integration Guide](./integrations.md) to see how to use Soonix with different development tools and frameworks. - diff --git a/nix/repo/devShells.nix b/nix/repo/devShells.nix index 16ebc5d..c473189 100644 --- a/nix/repo/devShells.nix +++ b/nix/repo/devShells.nix @@ -3,18 +3,66 @@ inputs, ... }: let - inherit (inputs) pkgs devshell treefmt; + inherit (inputs) pkgs devshell treefmt devtools-lib; + inherit (cell) soonix; + treefmtWrapper = treefmt.mkWrapper pkgs { + projectRootFile = "flake.nix"; + programs = { + alejandra.enable = true; + mdformat.enable = true; + }; + settings.formatter.mdformat = { + excludes = ["CHANGELOG.md" "LICENSE.md"]; + command = let + pkg = pkgs.python3.withPackages (p: [ + p.mdformat + p.mdformat-mkdocs + p.mdformat-frontmatter + ]); + in "${pkg}/bin/mdformat"; + }; + }; in { default = devshell.mkShell { - imports = [cell.soonix.devshellModule]; + imports = [soonix.devshellModule devtools-lib.devshellModule]; packages = [ pkgs.nil - (treefmt.mkWrapper pkgs { - programs = { - alejandra.enable = true; - mdformat.enable = true; - }; - }) + treefmtWrapper ]; + lefthook.config = { + "pre-commit" = { + parallel = true; + jobs = [ + { + name = "treefmt"; + stage_fixed = true; + run = "${treefmtWrapper}/bin/treefmt"; + env.TERM = "dumb"; + } + { + name = "soonix"; + stage_fixed = true; + run = "nix run .#soonix:update"; + } + ]; + }; + }; + cocogitto.config = { + tag_prefix = "v"; + ignore_merge_commits = true; + changelog = { + authors = [ + { + username = "TECHNOFAB"; + signature = "technofab"; + } + ]; + path = "CHANGELOG.md"; + template = "remote"; + remote = "gitlab.com"; + repository = "soonix"; + owner = "TECHNOFAB"; + }; + }; }; } diff --git a/nix/repo/flake.lock b/nix/repo/flake.lock index e223cb3..b746e0a 100644 --- a/nix/repo/flake.lock +++ b/nix/repo/flake.lock @@ -13,24 +13,43 @@ "original": { "dir": "lib", "owner": "rensa-nix", + "ref": "v0.1.0", "repo": "devshell", "type": "gitlab" } }, + "devtools-lib": { + "locked": { + "dir": "lib", + "lastModified": 1767214272, + "narHash": "sha256-gvW7flZ60xdv3Z3Ksec5jcRjW2sqRHsGoJdwsNWQVPk=", + "owner": "rensa-nix", + "repo": "devtools", + "rev": "f40e59c32c48cdbf4cbc621c2f0f11e7bb80dbd3", + "type": "gitlab" + }, + "original": { + "dir": "lib", + "owner": "rensa-nix", + "ref": "v0.1.0", + "repo": "devtools", + "type": "gitlab" + } + }, "nix-gitlab-ci-lib": { "locked": { "dir": "lib", - "lastModified": 1756974596, - "narHash": "sha256-KxQj76sUqvPNtrqzNWMZeOWqTitc0aFCYj7UZzToiEA=", + "lastModified": 1765444672, + "narHash": "sha256-B0cMjRs9P50ym9Le0VUcRN69Yy6tbV13MXq81tTTEus=", "owner": "TECHNOFAB", "repo": "nix-gitlab-ci", - "rev": "00cf5b83c6c46698fba12a54b9cc15c6d4e5a4dd", + "rev": "8f88a53b5479773cd626420362631bc1da99e677", "type": "gitlab" }, "original": { "dir": "lib", "owner": "TECHNOFAB", - "ref": "3.0.0-alpha.2", + "ref": "3.1.2", "repo": "nix-gitlab-ci", "type": "gitlab" } @@ -72,6 +91,7 @@ "root": { "inputs": { "devshell-lib": "devshell-lib", + "devtools-lib": "devtools-lib", "nix-gitlab-ci-lib": "nix-gitlab-ci-lib", "nixmkdocs-lib": "nixmkdocs-lib", "nixtest-lib": "nixtest-lib", diff --git a/nix/repo/flake.nix b/nix/repo/flake.nix index 8a17542..87d2d37 100644 --- a/nix/repo/flake.nix +++ b/nix/repo/flake.nix @@ -1,9 +1,10 @@ { inputs = { - devshell-lib.url = "gitlab:rensa-nix/devshell?dir=lib"; - nixtest-lib.url = "gitlab:TECHNOFAB/nixtest?dir=lib"; + devshell-lib.url = "gitlab:rensa-nix/devshell/v0.1.0?dir=lib"; + devtools-lib.url = "gitlab:rensa-nix/devtools/v0.1.0?dir=lib"; + nixtest-lib.url = "gitlab:TECHNOFAB/nixtest/v1.2.1?dir=lib"; nixmkdocs-lib.url = "gitlab:TECHNOFAB/nixmkdocs?dir=lib"; - nix-gitlab-ci-lib.url = "gitlab:TECHNOFAB/nix-gitlab-ci/3.0.0-alpha.2?dir=lib"; + nix-gitlab-ci-lib.url = "gitlab:TECHNOFAB/nix-gitlab-ci/3.1.2?dir=lib"; treefmt-nix = { url = "github:numtide/treefmt-nix"; flake = false; From 5e479f3662db1c338679cdb3fd080cf06e4c67d4 Mon Sep 17 00:00:00 2001 From: technofab Date: Mon, 5 Jan 2026 22:11:36 +0100 Subject: [PATCH 2/2] chore(version): v0.1.0 --- CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..e56069d --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,34 @@ +# Changelog +All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines. + +- - - +## [v0.1.0](https://gitlab.com/TECHNOFAB/soonix/compare/25cc087b1da8dda965d47283c120a726b84ad6cf..v0.1.0) - 2026-01-05 +#### Features +- add nice to have `devshellModule` to soonix module for easy import - ([add807e](https://gitlab.com/TECHNOFAB/soonix/commit/add807ef8980197bbd06652a36d937b93b2a31c7)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- add CI with nix-gitlab-ci - ([93b282c](https://gitlab.com/TECHNOFAB/soonix/commit/93b282cd278770edd718e8fa54fabd004abd23f0)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- make soonix a bit more flexible with and without devshell - ([690332c](https://gitlab.com/TECHNOFAB/soonix/commit/690332ceea0e81185a71493e758c1ac2b8da6b63)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +#### Bug Fixes +- (**generator**) fix leading newline in generated json files - ([078034b](https://gitlab.com/TECHNOFAB/soonix/commit/078034b01e4eaf1f9436d46721f7cbe0d96eb8b4)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- (**gitignore**) correctly grep for file with / prefix - ([1433186](https://gitlab.com/TECHNOFAB/soonix/commit/1433186d9737638ae6fffbd1b7f2920a699c37c0)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +#### Documentation +- add style.css - ([e04b71c](https://gitlab.com/TECHNOFAB/soonix/commit/e04b71c07413251dcb52036b4a51c6c7c0dca2ad)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- use svg logo and set site_url for sitemap - ([086c408](https://gitlab.com/TECHNOFAB/soonix/commit/086c4086c6fc36695de07e5ef8b2ff0bcf508bb1)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- write docs - ([63a8dfa](https://gitlab.com/TECHNOFAB/soonix/commit/63a8dfab9c207ead3acb70f1440bf04457a14af6)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- add favicon and logo - ([3c1494a](https://gitlab.com/TECHNOFAB/soonix/commit/3c1494a455df2fdcc2a156955e3250b3920d824f)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- add initial docs base - ([ed75ed6](https://gitlab.com/TECHNOFAB/soonix/commit/ed75ed66957126397817969647eb29daed923448)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +#### Tests +- fix grep not being found - ([0ebe0da](https://gitlab.com/TECHNOFAB/soonix/commit/0ebe0da944426aaa315240ce87e987471ad8c641)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +#### Miscellaneous Chores +- (**deps**) lock file maintenance - ([d47294e](https://gitlab.com/TECHNOFAB/soonix/commit/d47294e7dd899651475170c389ab82d7c61c7a79)) - Renovate Bot +- (**lib**) add "auto generated" comment to nix generator outputs - ([3baef66](https://gitlab.com/TECHNOFAB/soonix/commit/3baef660cf8b87391d475a0455dd66fae0e60008)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- (**repo**) update nixmkdocs - ([6d8cbdc](https://gitlab.com/TECHNOFAB/soonix/commit/6d8cbdcdecfd88edb8874f4d85cc6000712a7e5e)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- add devtools - ([8e7fa27](https://gitlab.com/TECHNOFAB/soonix/commit/8e7fa27dc8e66d192d6d8d5c62b8670c7acde1ab)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- add renovate - ([e9860d6](https://gitlab.com/TECHNOFAB/soonix/commit/e9860d65a0123af948c1a2da65664a6d481efe05)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- add treefmt - ([1246175](https://gitlab.com/TECHNOFAB/soonix/commit/12461750823f62ac78bde369351dc9d32881de53)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- make output a bit nicer - ([2e25d42](https://gitlab.com/TECHNOFAB/soonix/commit/2e25d42c85ebf1d350d8f367291c6bacf8df0dfd)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- default to nix generator and prepend / to gitignore entries - ([af1494f](https://gitlab.com/TECHNOFAB/soonix/commit/af1494f3c6d0110fffe88a76a6288012deb71aa9)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) +- initial commit - ([25cc087](https://gitlab.com/TECHNOFAB/soonix/commit/25cc087b1da8dda965d47283c120a726b84ad6cf)) - [@TECHNOFAB](https://gitlab.com/TECHNOFAB) + +- - - + +Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto). \ No newline at end of file