Skip to content

Commit

Permalink
Astro/catchup site content since diverge (#1211)
Browse files Browse the repository at this point in the history
See meeting notes (31 Jan 2024). Captures many of the updates to the
site since `main` was forked from `master` to start the site refactor.
Commit messages capture the PR that was migrated.

From #1182. There isn't a Tokodon icon in simple icons so the Mastodon
icon was used. This creates 2 Mastodon icons on the community page.

From #1152. Since the teams page had a layout change. I organized the
content as best as possible.

From #1159. Since the teams page had a layout change. I organized the
content as best as possible.
  • Loading branch information
djacu authored Feb 2, 2024
1 parent 27fa3ff commit 4d697d1
Show file tree
Hide file tree
Showing 11 changed files with 84 additions and 24 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
name: "Hourly Build & Deploy to Netlify"
name: "Daily Build & Deploy to Netlify"
on:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

jobs:
hourly-build-and-deploy:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -50,7 +52,7 @@ jobs:
- name: Commit updated files and push them to master branch
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "Hourly update [ci skip]"
commit_message: "Daily update [ci skip]"
branch: "master"
file_pattern: flake.lock blog/announcements.xml
commit_user_name: NixOS webmaster
Expand Down
38 changes: 38 additions & 0 deletions public/images/commercial-support-logos/cyberus-technology.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/content/community/commercial-support.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,10 @@
- Switzerland
- Remote
description: Numtide is a Nix and DevOps consulting company. We help our customers with declarative development, cloud and bare-metal infrastructures.
- href: https://www.cyberus-technology.de/services
name: Cyberus Technology
logo: /images/commercial-support-logos/cyberus-technology.svg
locations:
- Remote
- Germany
description: Let's unlock the full potential of your projects together. We offer professional services around virtualization, low-level Linux engineering and operating system development. We can also help with test automation projects.
3 changes: 3 additions & 0 deletions src/content/community/community-platforms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ other:
- href: https://mastodon.social/tags/nixos
name: Mastodon
iconName: simple-icons:mastodon
- href: web+ap://tag:nixos@mastodon.social/
name: Tokodon
iconName: simple-icons:mastodon
- href: https://twitter.com/hashtag/NixOS
name: Twitter
iconName: simple-icons:twitter
Expand Down
2 changes: 2 additions & 0 deletions src/content/community/meetups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ europe:
location: Stuttgart (Germany)
- href: https://www.meetup.com/NixOS-User-Group-Zurich/
location: Zürich (Switzerland)
- href: https://matrix.to/#/#nixos-aalen:matrix.org
location: Aalen (Germany)
asia:
- href: https://www.meetup.com/Singapore-NixOS-Nix-User-Group/
location: Singapore (Singapore)
Expand Down
14 changes: 7 additions & 7 deletions src/content/teams/01_foundation-board.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ contact:

The role of the board is to provide operational and organizational support to the NixOS project and community. In particular, its responsibilities are to:

- Handle the administrative, legal and financial tasks of the Foundation
- Serve as an interface between the community and the corporate/governmental world
- Handle the administrative, legal and financial tasks of the foundation
- Serve as an interface between the community and the corporate/governmental world:
- Handle sponsoring and donations
- Build and maintain beneficial and collaborative relationships
- Provide a framework for teams to self-organize
- Hand out the credentials and permissions as needed by the teams' work
- Provide a framework for teams to self-organize:
- Hand out the credentials and permissions required for the teams' work
- Fund community events and efforts
- Unblock things that would be stuck otherwise
- Unblock things that would be stuck otherwise, and serve as:
- Arbiter in case of conflicts
- Serve as a backup for critical tasks when needed
- Backup for critical tasks when needed

The board is not responsible for technical leadership, decisions, or direction.
The board is not responsible for technical leadership, decisions, or direction.
2 changes: 2 additions & 0 deletions src/content/teams/03_security.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ To privately report a security issue with NixOS, Nix, and its ecosystem, please
- Linus Heckemann: **linus@sphalerite.org**, GPG Fingerprint: `58FB 812B 0FCF 7B87 343C 35D4 9EF3 625A C8C1 9C9C`

- Robert Scott: **secure@humanleg.org.uk**, GPG Fingerprint: `8868 8AE4 8AE6 3195 BCF5 F732 3A7B 7B7A 2611 CE25`

- Thomas Gerbet: **thomas@gerbet.me**, GPG Fingerprint: `E256 878A F684 6EB3 F1B9 7D51 AE83 1DC0`
5 changes: 5 additions & 0 deletions src/content/teams/06_nixcon.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,8 @@ contact:
# Responsibilities

Organizing NixCons

# Team News

The NixCon team is transitioning.
See [Governance through “project leads” in NixCon 2024](https://discourse.nixos.org/t/governance-through-project-leads-in-nixcon-2024/33981).
17 changes: 12 additions & 5 deletions src/content/teams/08_moderation.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,29 @@ members:
- name: Martin Weinelt
username: hexa
title:
- name: Rok Garbas
username: garbas
title:
- name: Ryan Mulligan
username: ryantm
title:
- name: piegames
username: piegamesde
title:
contact:
- name: Email (for reporting)
href: mailto:community@nixos.org
href: mailto:moderation@nixos.org
- name: Matrix
href: https://matrix.to/#/#moderation:nixos.org
- name: Discourse
href: https://discourse.nixos.org/c/meta/moderation-team/40
- name: GitHub
href: https://github.com/NixOS/moderation
---
# Responsibility

This team is responsible for moderating participation on [official community platforms](/community/#platforms) in accord with [RFC 102](https://github.com/NixOS/rfcs/blob/master/rfcs/0102-moderation-team.md).
More information can be found at [the team's GitHub repository](https://github.com/NixOS/moderation).

# Reporting issues

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [community@nixos.org](mailto:community@nixos.org). The project team is obligated to maintain confidentiality with regard to the reporter of an incident.
Contact any of the current team members directly, e.g. via Matrix, or through the Contact links.

The project team is obligated to maintain confidentiality with regard to the reporter of an incident.
9 changes: 3 additions & 6 deletions src/content/teams/11_documentation.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ members:
- name: henrik-ch
username: henrik-ch
title:
- name: zmitchell
username: zmitchell
title:
- name: asymmetric
username: asymmetric
title:
Expand All @@ -29,12 +26,12 @@ members:
- name: proofconstruction
username: proofconstruction
title:
- name: Robert Hensing
username: roberth
title:
- name: alejandrosame
username: alejandrosame
title:
- name: Bernardo Stein
username: danielsidhion
title:
contact:
- name: Discourse
href: https://discourse.nixos.org/c/dev/documentation/25
Expand Down
5 changes: 1 addition & 4 deletions src/content/teams/12_nixpkgs-architecture.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ members:
- name: Alex Ameen
username:
title: From Tulip Interfaces
- name: Paul Haerle
username:
title:
- name: David Hauer
username:
title:
Expand Down Expand Up @@ -55,4 +52,4 @@ Check out [this GitHub board](https://github.com/orgs/nixpkgs-architecture/proje

# Administration and Communication

Information about how to join or leave the team and the meetings can be found on the [team page on GitHub](https://github.com/nixpkgs-architecture). Discussions are held on Matrix, Discourse, and GitHub issues (link in *Contact* section).
Information about how to join or leave the team and the meetings can be found on the [team page on GitHub](https://github.com/nixpkgs-architecture). Discussions are held on Matrix, Discourse, and GitHub issues (link in *Contact* section).

0 comments on commit 4d697d1

Please sign in to comment.