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;