Skip to content

Commit

Permalink
chore: update
Browse files Browse the repository at this point in the history
  • Loading branch information
GTrunSec committed Feb 25, 2024
1 parent 9a97f5d commit bfb5ee0
Show file tree
Hide file tree
Showing 9 changed files with 113 additions and 854 deletions.
4 changes: 2 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Disable the automatic menu displaying on every environment reload.
# export DEVSHELL_NO_MOTD=1
watch_file flakes.nix flake.lock
watch_file ./flakes.nix ./flake.lock
watch_file local/flake.nix local/flake.lock
# shellcheck disable=SC1090
source "$(fetchurl "https://raw.githubusercontent.com/gtrunsec/direnv/main/lib" "sha256-tuMA8WGkwcYq9V3MtlN6xdVvKd2YkdEpdK4ZyAN6VDM=")"

registry="$PRJ_ROOT/local#__std"

use envreload //repo/devshells/default
use envreload //repo/shells/default
2 changes: 1 addition & 1 deletion .github/workflows/checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
push:
branches:
- master
- main
jobs:
nix:
runs-on: ubuntu-latest
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@ on:

jobs:
lockfile:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@main
- name: Enable magic Nix cache
uses: DeterminateSystems/magic-nix-cache-action@main
- name: Check flake
uses: DeterminateSystems/flake-checker-action@main
- name: Update flake.lock
uses: DeterminateSystems/update-flake-lock@main
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions local/cells/repo/nixago.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ inputs, cell }:
with inputs.std.inputs.dmerge;
let
cfg = {
inherit (cell.pops.configs.exports.default) treefmt lefthook conform;
};
inherit (cell.pops.configs.exports.stdNixago) treefmt lefthook conform;
in
{
lefthook = {
inherit (lefthook) default;
};
treefmt = {
default = treefmt.default;
};
conform = rec {
default = conform.default custom;
custom = {
data = {
commit.conventional.scopes = append [ ".*." ];
};
};
};
}
16 changes: 16 additions & 0 deletions local/cells/repo/pops.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{ inputs, cell }:
let
inherit (inputs) nixpkgs omnibus;
inputs' = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs;
in
{
configs = inputs.omnibus.pops.configs {
inputs = {
inputs = {
inherit (inputs') nixfmt pre-commit-hooks;
inherit (inputs) std;
inherit nixpkgs;
};
};
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ in
# This is Standard's devshell integration.
# It runs the startup hook when entering the shell.
nixago = [
(inputs.std-ext.presets.nixago.conform cell.configs.conform)
(inputs.std-ext.presets.nixago.treefmt)
(inputs.std-ext.presets.nixago.lefthook)
cell.nixago.treefmt.default
cell.nixago.lefthook.default
cell.nixago.conform.default
];

commands = [ ];
Expand Down
Loading

0 comments on commit bfb5ee0

Please sign in to comment.