chore(flake): update flakes, add rensa devtools, etc.

This commit is contained in:
technofab 2025-12-20 21:29:21 +01:00
parent a7e20e203c
commit 11a21210d0
Signed by: technofab
SSH key fingerprint: SHA256:bV4h88OqS/AxjbPn66uUdvK9JsgIW4tv3vwJQ8tpMqQ
8 changed files with 158 additions and 36 deletions

View file

@ -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

22
.gitlab/renovate.json5 Normal file
View file

@ -0,0 +1,22 @@
{
"extends": [
"config:recommended"
],
"gitlabci": {
"enabled": false
},
"lockFileMaintenance": {
"enabled": true,
"extends": [
"schedule:monthly"
]
},
"nix": {
"enabled": true
},
"postUpgradeTasks": {
"commands": [
"nix-portable nix run .#soonix:update"
]
}
}

View file

@ -3,21 +3,67 @@
cell,
...
}: let
inherit (inputs) pkgs dslib soonix treefmt;
inherit (cell) ci;
in {
default = dslib.mkShell {
imports = [soonix.devshellModule];
packages = [
(treefmt.mkWrapper pkgs {
inherit (inputs) pkgs dslib treefmt devtools-lib;
inherit (cell) soonix;
treefmtWrapper = treefmt.mkWrapper pkgs {
programs = {
alejandra.enable = true;
mdformat.enable = true;
};
settings.global.excludes = ["*LICENSE*.md"];
})
settings.formatter.mdformat = {
command = let
pkg = pkgs.python3.withPackages (p: [
p.mdformat
p.mdformat-mkdocs
]);
in "${pkg}/bin/mdformat";
excludes = [
"CHANGELOG.md"
"*LICENSE*.md"
];
};
};
in {
default = dslib.mkShell {
imports = [soonix.devshellModule devtools-lib.devshellModule];
packages = [
treefmtWrapper
];
enterShellCommands."ren".text = "echo Hello rensa!";
soonix.hooks.ci = ci.soonix;
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 = "core";
owner = "rensa-nix";
};
};
};
}

50
cells/repo/flake.lock generated
View file

@ -3,11 +3,11 @@
"devshell": {
"locked": {
"dir": "lib",
"lastModified": 1755673398,
"narHash": "sha256-51MmR+Eo1+bKDd/Ss77wwTqi4yAR2xgmyCSEbKWSpj0=",
"lastModified": 1758204313,
"narHash": "sha256-ainbY0Oajb1HMdvy+A8QxF/P5qwcbEzJGEY5pzKdDdc=",
"owner": "rensa-nix",
"repo": "devshell",
"rev": "e76bef387e8a4574f9b6d37b1a424e706491af08",
"rev": "7d0c4bc78d9f017a739b0c7eb2f4e563118353e6",
"type": "gitlab"
},
"original": {
@ -17,20 +17,37 @@
"type": "gitlab"
}
},
"devtools-lib": {
"locked": {
"dir": "lib",
"lastModified": 1766237846,
"narHash": "sha256-7n3WFabnf49SFHXD/e4zfLit3BniZZOecUXfBm3d1d0=",
"owner": "rensa-nix",
"repo": "devtools",
"rev": "5c8712f48c5bcb6b79d3da1afd1268f84f5e35e3",
"type": "gitlab"
},
"original": {
"dir": "lib",
"owner": "rensa-nix",
"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"
}
@ -38,11 +55,11 @@
"nixmkdocs": {
"locked": {
"dir": "lib",
"lastModified": 1755785622,
"narHash": "sha256-xBb9PCkszmrWSEqUiPC7oBJABm1thF572S5QHtloZ+M=",
"lastModified": 1766062227,
"narHash": "sha256-jhr5CUi9eDeMIAJn7ayXP8Wr+Y2loV5EhdDIKDkRIdw=",
"owner": "TECHNOFAB",
"repo": "nixmkdocs",
"rev": "61da605a9bff12f66c4b743f43aea59ca200f533",
"rev": "cb0bb5dc3382e8ba5d81324a2f1fd94ccd5a5df4",
"type": "gitlab"
},
"original": {
@ -55,6 +72,7 @@
"root": {
"inputs": {
"devshell": "devshell",
"devtools-lib": "devtools-lib",
"nix-gitlab-ci-lib": "nix-gitlab-ci-lib",
"nixmkdocs": "nixmkdocs",
"soonix-lib": "soonix-lib",
@ -64,11 +82,11 @@
"soonix-lib": {
"locked": {
"dir": "lib",
"lastModified": 1757424411,
"narHash": "sha256-x99obZwqDAhUB+VUhAV9sKH00NnsVi481n/8bdvZCUY=",
"lastModified": 1766044966,
"narHash": "sha256-VB8PgA5QYmehFCGGz8YmlmuhCG43ab9rK9ufdKmfjao=",
"owner": "TECHNOFAB",
"repo": "soonix",
"rev": "add807ef8980197bbd06652a36d937b93b2a31c7",
"rev": "e9860d65a0123af948c1a2da65664a6d481efe05",
"type": "gitlab"
},
"original": {
@ -81,11 +99,11 @@
"treefmt-nix": {
"flake": false,
"locked": {
"lastModified": 1755934250,
"narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=",
"lastModified": 1766000401,
"narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5",
"rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
"type": "github"
},
"original": {

View file

@ -3,7 +3,8 @@
devshell.url = "gitlab:rensa-nix/devshell?dir=lib";
nixmkdocs.url = "gitlab:TECHNOFAB/nixmkdocs?dir=lib";
soonix-lib.url = "gitlab:TECHNOFAB/soonix?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";
devtools-lib.url = "gitlab:rensa-nix/devtools?dir=lib";
treefmt-nix = {
url = "github:numtide/treefmt-nix";
flake = false;

33
cells/repo/soonix.nix Normal file
View file

@ -0,0 +1,33 @@
{
inputs,
cell,
...
}: let
inherit (inputs) soonix;
inherit (cell) ci;
in
(soonix.make {
hooks = {
ci = ci.soonix;
renovate = {
output = ".gitlab/renovate.json5";
data = {
extends = ["config:recommended"];
postUpgradeTasks.commands = [
"nix-portable nix run .#soonix:update"
];
lockFileMaintenance = {
enabled = true;
extends = ["schedule:monthly"];
};
nix.enabled = true;
gitlabci.enabled = false;
};
hook = {
mode = "copy";
gitignore = false;
};
opts.format = "json";
};
};
}).config

12
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1754340878,
"narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
"lastModified": 1766125104,
"narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cab778239e705082fe97bb4990e0d24c50924c04",
"rev": "7d853e518814cca2a657b72eeba67ae20ebf7059",
"type": "github"
},
"original": {
@ -18,11 +18,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1754184128,
"narHash": "sha256-AjhoyBL4eSyXf01Bmc6DiuaMrJRNdWopmdnMY0Pa/M0=",
"lastModified": 1765674936,
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "02e72200e6d56494f4a7c0da8118760736e41b60",
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
"type": "github"
},
"original": {

View file

@ -22,11 +22,13 @@
(simple "devShells")
(simple "docs")
(simple "ci")
(simple "soonix")
];
} {
packages = rensa.select inputs.self [
["repo" "docs"]
["repo" "ci" "packages"]
["repo" "soonix" "packages"]
];
};
}