afnix/infra
0
0
Fork 0
Code Issues 40 Pull requests 10 Projects Releases Packages Wiki Activity

WIP: treewide: add pre-commit nixfmt hook, reformat everything #96

Draft
k900 wants to merge 3 commits from format into main
pull from: format
merge into: afnix:main
Conversation 1 Commits 3 Files changed 48 +1320 -823
k900 commented 2024-08-09 15:41:48 +00:00 (Migrated from git.lix.systems)
Copy link

Do we want this? idk

I like some bits a lot and dislike some bits a lot but consistency is also good

Bring on the bikeshed

Do we want this? idk I like some bits a lot and dislike some bits a lot but consistency is also good Bring on the bikeshed
raito commented 2025-07-18 02:30:12 +00:00 (Migrated from git.lix.systems)
Copy link

without CI in this repo, it's not worth having formatting IMHO, moving to draft.

without CI in this repo, it's not worth having formatting IMHO, moving to draft.
This pull request has changes conflicting with the target branch.
  • .gitignore
  • common/admins.nix
  • common/base-server.nix
  • common/hardware/raito-vm.nix
  • common/raito-proxy-aware-nginx.nix
  • common/ssh-keys.nix
  • common/sysadmin/default.nix
  • common/zsh.nix
  • flake.lock
  • flake.nix
  • hosts/afnix/wob-vpn-gw/netboot.nix
  • hosts/floral/gerrit01/default.nix
  • overlays/default.nix
  • secrets.nix
  • services/baremetal-builder/assignments.nix
  • services/baremetal-builder/default.nix
  • services/baremetal-builder/netboot.nix
  • services/buildbot/default.nix
  • services/forgejo/default.nix
  • services/gerrit/default.nix
  • services/gerrit/one-way-sync.nix
  • services/gerrit/www.nix
  • services/hydra/default.nix
  • services/monitoring/agent.nix
  • services/monitoring/exporters/nginx.nix
  • services/monitoring/hookshot-adapter/default.nix
  • services/monitoring/lgtm/grafana.nix
  • services/monitoring/lgtm/mimir.nix
  • services/ofborg/default.nix
  • terraform/gandi.nix
  • terraform/hydra.nix
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin format:format
git switch format

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff format
git switch format
git rebase main
git switch main
git merge --ff-only format
git switch format
git rebase main
git switch main
git merge --no-ff format
git switch main
git merge --squash format
git switch main
git merge --ff-only format
git switch main
git merge format
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Compat/Breaking

Breaking change that won't be backward compatible

  
Difficulty/Architectural

Requires changes in multiple pieces of the stack: the Nix interpreter, etc.

  
Difficulty/Easy

Infrastructure beginner friendly tasks

  
Difficulty/Hard

Requires prior knowledge, research and design

  
Help Wanted

Looking for a first task to pick? This one is looking for somefew to do it as well!

  
Kind/Bug

Something is not working

  
Kind/Documentation

Documentation changes

  
Kind/Enhancement

Improve existing functionality

  
Kind/Feature

New functionality

  
Kind/Testing

Issue or pull request related to testing

  
Priority/Critical

The priority is critical

  
Priority/High

The priority is high

  
Priority/Low

The priority is low

  
Priority/Medium

The priority is medium

  
Reviewed/Confirmed

Issue has been confirmed

  
Reviewed/Duplicate

This issue or pull request already exists

  
Reviewed/Invalid

Invalid issue

  
Reviewed/Won't Fix

This issue won't be fixed

  
Security

This is a security issue

  
Silenced Alert

This issue was created to track a silenced alert which needs remediation work.

  
Status/Abandoned

Somebody has started to work on this but abandoned work

  
Status/Blocked

Something is blocking this issue or pull request

  
Status/Need More Info

Feedback is required to reproduce issue or to continue work

  
Status/Postponed

We can do this later

  
Tracking Issue

Umbrella issue of many things at the same time

No labels
Compat/Breaking
Difficulty/Architectural
Difficulty/Easy
Difficulty/Hard
Help Wanted
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Testing
Priority/Critical
Priority/High
Priority/Low
Priority/Medium
Reviewed/Confirmed
Reviewed/Duplicate
Reviewed/Invalid
Reviewed/Won't Fix
Security
Silenced Alert
Status/Abandoned
Status/Blocked
Status/Need More Info
Status/Postponed
Tracking Issue
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: afnix/infra#96
No description provided.
Delete branch "format"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?