From f5ad5d9258f5336d87589345bf51456feeb443e3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 3 Nov 2021 20:01:06 -0700 Subject: [PATCH 01/29] RFC#114: initial commit --- rfcs/0114-nixos-code-of-conduct.md | 107 +++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 rfcs/0114-nixos-code-of-conduct.md diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md new file mode 100644 index 000000000..882192e8d --- /dev/null +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -0,0 +1,107 @@ +--- +feature: NixOS Code of Conduct +start-date: 2021-11-03 +author: @jonringer +co-authors: +shepherd-team: +shepherd-leader: +related-issues: #98 #102 +--- + +# Summary +[summary]: #summary + +The NixOS Community needs some foundation of shared values which can be used +to determine appropriate when contributing and interacting with the community. +We currently have a [community ethos](https://nixos.org/community/index.html), but +this only states that we are an inclusive community, but doesn't define +inappropriate behavior when interacting with the community. This RFC aims +to established they shared values, so they can be used to identify behavior +which is disruptive to the community. + +This RFC does not intend to define moderation practices. This is intended to only lay +a framework of shared values for the community. + +# Motivation +[motivation]: #motivation + +The NixOS community struggles with a clearly defined way in which someone's behavior may +be disruptive. A well-defined Code of Conduct gives an explicit +set of expectations for all contributors, which will also make it easier to identify +when behavior becomes disruptive. + +# Detailed design +[design]: #detailed-design + +These statutes are largely taken from [rust-lang's Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), +which provides a great compromise between explicit behaviors and subjective goals. + +- We are committed to providing a friendly, safe and welcoming environment for +all, regardless of level of experience, gender identity and expression, +sexual orientation, disability, personal appearance, body size, race, ethnicity, age, +religion, nationality, or other similar characteristics. +- Please avoid using overtly sexual aliases or other nicknames that might +detract from a friendly, safe and welcoming environment for all. +- Please be kind and courteous. There’s no need to be mean or rude. +- Respect that people have differences of opinion and that every design or +implementation choice carries a trade-off and numerous costs. There is seldom a right answer. +- Please keep unstructured critique to a minimum. If you have solid ideas +you want to experiment with, make a fork and see how it works. +- We will exclude you from interaction if you insult, demean or harass anyone. +That is not welcome behavior. We interpret the term “harassment” as including the definition in the +[Citizen Code of Conduct](https://github.com/stumpsyn/policies/blob/master/citizen_code_of_conduct.md); +if you have any lack of clarity about what might be included in that concept, +please read their definition. In particular, we don’t tolerate behavior that excludes +people in socially marginalized groups. +- Private harassment is also unacceptable. No matter who you are, if you feel +you have been or are being harassed or made uncomfortable by a community member, +please contact one of the channel ops or any of the NixOS moderation team immediately. +Whether you’re a regular contributor or a newcomer, we care about making this community +a safe place for you and we’ve got your back. +- Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome. + +# Examples and Interactions +[examples-and-interactions]: #examples-and-interactions + +There have been a few spectacular failures of communication and good faith within the community. +Most notable recent examples include the [block evasion thread](https://discourse.nixos.org/t/github-block-evasion-is-not-acceptable/12763), +heated discussions in [RFC #98](https://github.com/NixOS/rfcs/pull/98) and [RFC #111](https://github.com/NixOS/rfcs/pull/111). +Each of these incidents have caused significant discussion on IRC (when it was still official), +matrix, discourse, and would bleed over into github and even non-official platforms. +These discussions are generally very polarizing, and causes an enormous amount +of emotional and mental stress to those involved. +These incidents are also very embarressing for the greater nix community, +and not having a way to identify disruptive before it becomes a heated +issue is detrimental to the health of the community. + +In conjunction with a moderation team (out-of-scope for this RFC), these incidents could have been +better arbitrated as to have a more satisfactory resolution before escalation. This +Code of Conduct will better equip the moderation process by providing clear expectations +for behavior within the community. + +# Drawbacks +[drawbacks]: #drawbacks + +- There are more "rules" for the community to follow. However, these statutes are intended to +still allow individuals to participate within the community in a healthy way for all. + +# Alternatives +[alternatives]: #alternatives + +- #98 Also provides an opinionated values and goals for the moderation team. However, +these rules are less well-defined, and allow for broader interpretations +of unacceptable behavior. + +- #102 Codifies some of the existing moderation practices, and uses the +existing [community ethos](https://nixos.org/community/index.html) as moderation criteria. + +# Unresolved questions +[unresolved]: #unresolved-questions + +# Future work +[future]: #future-work + +- Ratification of a "NixOS moderation team" as described in the second to last bullet. +- Add Code of Conduct to nixos.org, and mention the Code of Conduct on all relevant +repositories under the NixOS organization. + From 13cf8953da8b41a2b6ae30d8c33fdf97cec85776 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 3 Nov 2021 20:15:21 -0700 Subject: [PATCH 02/29] Clarify in what way CoC differs from rust CoC --- rfcs/0114-nixos-code-of-conduct.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 882192e8d..ee0422cbe 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -33,8 +33,9 @@ when behavior becomes disruptive. # Detailed design [design]: #detailed-design -These statutes are largely taken from [rust-lang's Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), +These statutes are taken from [rust-lang's Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), which provides a great compromise between explicit behaviors and subjective goals. +Only the moderation body name has been changed. - We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, From 254d9a03145b10753676228444294dc29259d37a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 3 Nov 2021 20:46:23 -0700 Subject: [PATCH 03/29] they -> the Co-authored-by: tomberek --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index ee0422cbe..48620cad1 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -16,7 +16,7 @@ to determine appropriate when contributing and interacting with the community. We currently have a [community ethos](https://nixos.org/community/index.html), but this only states that we are an inclusive community, but doesn't define inappropriate behavior when interacting with the community. This RFC aims -to established they shared values, so they can be used to identify behavior +to established the shared values, so they can be used to identify behavior which is disruptive to the community. This RFC does not intend to define moderation practices. This is intended to only lay From 1bb9a184e96d55f34c94f6c844cce5451bda0363 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 3 Nov 2021 21:17:30 -0700 Subject: [PATCH 04/29] established -> establish Co-authored-by: Samuel Dionne-Riel --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 48620cad1..490b136e7 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -16,7 +16,7 @@ to determine appropriate when contributing and interacting with the community. We currently have a [community ethos](https://nixos.org/community/index.html), but this only states that we are an inclusive community, but doesn't define inappropriate behavior when interacting with the community. This RFC aims -to established the shared values, so they can be used to identify behavior +to establish the shared values, so they can be used to identify behavior which is disruptive to the community. This RFC does not intend to define moderation practices. This is intended to only lay From e4299a3106aaf1c2d79fb154f0b4cace74d6a063 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 4 Nov 2021 08:20:57 -0700 Subject: [PATCH 05/29] embarressing -> embarrassing Co-authored-by: asymmetric --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 490b136e7..7980ab804 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -71,7 +71,7 @@ Each of these incidents have caused significant discussion on IRC (when it was s matrix, discourse, and would bleed over into github and even non-official platforms. These discussions are generally very polarizing, and causes an enormous amount of emotional and mental stress to those involved. -These incidents are also very embarressing for the greater nix community, +These incidents are also very embarrassing for the greater nix community, and not having a way to identify disruptive before it becomes a heated issue is detrimental to the health of the community. From 25b6b5f3dcd29f429db570aea613340bb42bfa32 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 4 Nov 2021 09:44:29 -0700 Subject: [PATCH 06/29] right -> "single right" Co-authored-by: Michael Raskin <7c6f434c@mail.ru> --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 7980ab804..19dbd62e6 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -45,7 +45,7 @@ religion, nationality, or other similar characteristics. detract from a friendly, safe and welcoming environment for all. - Please be kind and courteous. There’s no need to be mean or rude. - Respect that people have differences of opinion and that every design or -implementation choice carries a trade-off and numerous costs. There is seldom a right answer. +implementation choice carries a trade-off and numerous costs. There is seldom a single right answer. - Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works. - We will exclude you from interaction if you insult, demean or harass anyone. From dd80852a1ac3666fef37591b8f0ff574fd4129e3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 4 Nov 2021 10:43:42 -0700 Subject: [PATCH 07/29] expand accepted characteristics to include socioeconomic and lack of religion Co-authored-by: asymmetric --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 19dbd62e6..d1698446b 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -40,7 +40,7 @@ Only the moderation body name has been changed. - We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, -religion, nationality, or other similar characteristics. +religion (or lack thereof), socioeconomic status, nationality, or other similar characteristics. - Please avoid using overtly sexual aliases or other nicknames that might detract from a friendly, safe and welcoming environment for all. - Please be kind and courteous. There’s no need to be mean or rude. From 08bd6a258d2795f8663fb4398f01a8515b099530 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 4 Nov 2021 10:43:59 -0700 Subject: [PATCH 08/29] clarify behavior Co-authored-by: asymmetric --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index d1698446b..b90094cac 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -12,7 +12,7 @@ related-issues: #98 #102 [summary]: #summary The NixOS Community needs some foundation of shared values which can be used -to determine appropriate when contributing and interacting with the community. +to determine appropriate behavior when contributing and interacting with the community. We currently have a [community ethos](https://nixos.org/community/index.html), but this only states that we are an inclusive community, but doesn't define inappropriate behavior when interacting with the community. This RFC aims From 7c4ba48bc763635b824ccc078443bd1753d30332 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 4 Nov 2021 10:46:16 -0700 Subject: [PATCH 09/29] "struggles with" -> lacks Co-authored-by: asymmetric --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index b90094cac..c2980c7a9 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -25,7 +25,7 @@ a framework of shared values for the community. # Motivation [motivation]: #motivation -The NixOS community struggles with a clearly defined way in which someone's behavior may +The NixOS community lacks a clearly defined way in which someone's behavior may be disruptive. A well-defined Code of Conduct gives an explicit set of expectations for all contributors, which will also make it easier to identify when behavior becomes disruptive. From 635b826ac3d4f50f5cb2a71bd5d8edff1a5a2b22 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 4 Nov 2021 10:46:34 -0700 Subject: [PATCH 10/29] More than just moderation name has now changed Co-authored-by: asymmetric --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index c2980c7a9..393b5c1df 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -35,7 +35,7 @@ when behavior becomes disruptive. These statutes are taken from [rust-lang's Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), which provides a great compromise between explicit behaviors and subjective goals. -Only the moderation body name has been changed. +Only minor changes have been made. - We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, From ad897b216dc228b88b6961d1eb00aa8a3ca76e7f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 4 Nov 2021 10:47:23 -0700 Subject: [PATCH 11/29] clarify bullet point Co-authored-by: asymmetric --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 393b5c1df..e019a7118 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -102,7 +102,7 @@ existing [community ethos](https://nixos.org/community/index.html) as moderation # Future work [future]: #future-work -- Ratification of a "NixOS moderation team" as described in the second to last bullet. +- Ratification of a "NixOS moderation team" as described in the second to last bullet point. - Add Code of Conduct to nixos.org, and mention the Code of Conduct on all relevant repositories under the NixOS organization. From 95cb6f03a22ebd52f04230113b58724278eb66f4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 4 Nov 2021 10:56:07 -0700 Subject: [PATCH 12/29] clarify drawbacks --- rfcs/0114-nixos-code-of-conduct.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index e019a7118..32b1976ec 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -83,8 +83,8 @@ for behavior within the community. # Drawbacks [drawbacks]: #drawbacks -- There are more "rules" for the community to follow. However, these statutes are intended to -still allow individuals to participate within the community in a healthy way for all. +- There are potentially more "rules" for the community to follow. However, many of these rules +are enforced already under the current moderation team, but without an explicit definition. # Alternatives [alternatives]: #alternatives From 44e15e5383582d999567d7cf8adc9aef1ea45c6d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 4 Nov 2021 11:08:06 -0700 Subject: [PATCH 13/29] Add community ethos as alternative --- rfcs/0114-nixos-code-of-conduct.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 32b1976ec..766cb1e1d 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -96,6 +96,9 @@ of unacceptable behavior. - #102 Codifies some of the existing moderation practices, and uses the existing [community ethos](https://nixos.org/community/index.html) as moderation criteria. +- Use existing [community ethos](https://nixos.org/community/index.html) as moderation criteria. +However, this only includes inclusive statements, and doesn't define unacceptable behavior. + # Unresolved questions [unresolved]: #unresolved-questions From 7f859525da799f769ceb5797cf83a91b026eff8a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 4 Nov 2021 15:06:46 -0700 Subject: [PATCH 14/29] Clarify origin of discourse thread --- rfcs/0114-nixos-code-of-conduct.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 766cb1e1d..6ab6151a3 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -65,7 +65,8 @@ a safe place for you and we’ve got your back. [examples-and-interactions]: #examples-and-interactions There have been a few spectacular failures of communication and good faith within the community. -Most notable recent examples include the [block evasion thread](https://discourse.nixos.org/t/github-block-evasion-is-not-acceptable/12763), +Most notable recent examples include [ad-hominem attacks in a PR review](https://github.com/NixOS/nixpkgs/pull/120729#discussion_r621885348) +and associated [block evasion discourse thread](https://discourse.nixos.org/t/github-block-evasion-is-not-acceptable/12763), heated discussions in [RFC #98](https://github.com/NixOS/rfcs/pull/98) and [RFC #111](https://github.com/NixOS/rfcs/pull/111). Each of these incidents have caused significant discussion on IRC (when it was still official), matrix, discourse, and would bleed over into github and even non-official platforms. From 0c18e56a6a98d49d0dd55846114da163fb882c8c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 5 Nov 2021 10:13:25 -0700 Subject: [PATCH 15/29] Use stable url for citizen code-of-conduct --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 6ab6151a3..ec55e55d0 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -50,7 +50,7 @@ implementation choice carries a trade-off and numerous costs. There is seldom a you want to experiment with, make a fork and see how it works. - We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term “harassment” as including the definition in the -[Citizen Code of Conduct](https://github.com/stumpsyn/policies/blob/master/citizen_code_of_conduct.md); +[Citizen Code of Conduct](https://github.com/stumpsyn/policies/blob/b8ee50e7a9fc79c39c936830901f8863d493b7cd/citizen_code_of_conduct.md); if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don’t tolerate behavior that excludes people in socially marginalized groups. From b73719bafaeb2114d617ab987c2fe3975c765ba5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Feb 2023 15:51:22 +0100 Subject: [PATCH 16/29] Update 0114-nixos-code-of-conduct.md --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index ec55e55d0..7f97d1eea 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -3,7 +3,7 @@ feature: NixOS Code of Conduct start-date: 2021-11-03 author: @jonringer co-authors: -shepherd-team: +shepherd-team: @edolstra @zimbatm @winterqt shepherd-leader: related-issues: #98 #102 --- From 91b75f96677039c5c9674ffc41c0f81c2b36a85a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:39:45 -0800 Subject: [PATCH 17/29] Remove mention of moderation team Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 1 - 1 file changed, 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 7f97d1eea..7ba5b1066 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -106,7 +106,6 @@ However, this only includes inclusive statements, and doesn't define unacceptabl # Future work [future]: #future-work -- Ratification of a "NixOS moderation team" as described in the second to last bullet point. - Add Code of Conduct to nixos.org, and mention the Code of Conduct on all relevant repositories under the NixOS organization. From dd485f475c06f611715451134c40433f824dbe37 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:43:47 -0800 Subject: [PATCH 18/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 7ba5b1066..23ffc9d6c 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -11,7 +11,7 @@ related-issues: #98 #102 # Summary [summary]: #summary -The NixOS Community needs some foundation of shared values which can be used +The Nix community needs some foundation of shared values which can be used to determine appropriate behavior when contributing and interacting with the community. We currently have a [community ethos](https://nixos.org/community/index.html), but this only states that we are an inclusive community, but doesn't define From 535eaaea50a5a1124b230c7a9138fd12b181ac03 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:44:44 -0800 Subject: [PATCH 19/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 23ffc9d6c..7a3cc9a1f 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -70,7 +70,7 @@ and associated [block evasion discourse thread](https://discourse.nixos.org/t/gi heated discussions in [RFC #98](https://github.com/NixOS/rfcs/pull/98) and [RFC #111](https://github.com/NixOS/rfcs/pull/111). Each of these incidents have caused significant discussion on IRC (when it was still official), matrix, discourse, and would bleed over into github and even non-official platforms. -These discussions are generally very polarizing, and causes an enormous amount +These discussions are generally very polarizing, and cause an enormous amount of emotional and mental stress to those involved. These incidents are also very embarrassing for the greater nix community, and not having a way to identify disruptive before it becomes a heated From 29923df02556c8e9b88d975f6149e9bdaef8f10e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:44:58 -0800 Subject: [PATCH 20/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 7a3cc9a1f..ec23a8c23 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -69,7 +69,7 @@ Most notable recent examples include [ad-hominem attacks in a PR review](https:/ and associated [block evasion discourse thread](https://discourse.nixos.org/t/github-block-evasion-is-not-acceptable/12763), heated discussions in [RFC #98](https://github.com/NixOS/rfcs/pull/98) and [RFC #111](https://github.com/NixOS/rfcs/pull/111). Each of these incidents have caused significant discussion on IRC (when it was still official), -matrix, discourse, and would bleed over into github and even non-official platforms. +Matrix, Discourse, and would bleed over into GitHub and even non-official platforms. These discussions are generally very polarizing, and cause an enormous amount of emotional and mental stress to those involved. These incidents are also very embarrassing for the greater nix community, From 65c87dadff68f0574972fa4fc4ea8c57bab5d89b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:45:16 -0800 Subject: [PATCH 21/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index ec23a8c23..f56d7c4da 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -13,7 +13,7 @@ related-issues: #98 #102 The Nix community needs some foundation of shared values which can be used to determine appropriate behavior when contributing and interacting with the community. -We currently have a [community ethos](https://nixos.org/community/index.html), but +We currently have a [community ethos](https://github.com/NixOS/nixos-homepage/blob/3f30d59a663c565dd3e43490898f5ab75d06e07f/community/index.tt#L11-L24), but this only states that we are an inclusive community, but doesn't define inappropriate behavior when interacting with the community. This RFC aims to establish the shared values, so they can be used to identify behavior From 6f311158d0b3dc06656e607da7cad7b5a5bc2b68 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:46:17 -0800 Subject: [PATCH 22/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index f56d7c4da..e12a47b2f 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -72,7 +72,7 @@ Each of these incidents have caused significant discussion on IRC (when it was s Matrix, Discourse, and would bleed over into GitHub and even non-official platforms. These discussions are generally very polarizing, and cause an enormous amount of emotional and mental stress to those involved. -These incidents are also very embarrassing for the greater nix community, +These incidents are also very embarrassing for the entire Nix community, and not having a way to identify disruptive before it becomes a heated issue is detrimental to the health of the community. From ba3775f00cd5351d94540925e4a41acc645377d5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:47:06 -0800 Subject: [PATCH 23/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index e12a47b2f..21d7b1f48 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -19,8 +19,7 @@ inappropriate behavior when interacting with the community. This RFC aims to establish the shared values, so they can be used to identify behavior which is disruptive to the community. -This RFC does not intend to define moderation practices. This is intended to only lay -a framework of shared values for the community. +This RFC does not intend to define moderation practices. # Motivation [motivation]: #motivation From 5a6caf5a6f64ae9795058ab66fc2681c6fcbb577 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:48:30 -0800 Subject: [PATCH 24/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 21d7b1f48..e981311a8 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -24,7 +24,7 @@ This RFC does not intend to define moderation practices. # Motivation [motivation]: #motivation -The NixOS community lacks a clearly defined way in which someone's behavior may +The Nix community lacks a clearly defined way to determine if someone's behavior may be disruptive. A well-defined Code of Conduct gives an explicit set of expectations for all contributors, which will also make it easier to identify when behavior becomes disruptive. From 8abd01d9b5d668c3781798fc494ce86ec1708483 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:49:15 -0800 Subject: [PATCH 25/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index e981311a8..69cdc8966 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -26,8 +26,7 @@ This RFC does not intend to define moderation practices. The Nix community lacks a clearly defined way to determine if someone's behavior may be disruptive. A well-defined Code of Conduct gives an explicit -set of expectations for all contributors, which will also make it easier to identify -when behavior becomes disruptive. +set of expectations for all contributors, and makes it easier to identify disruptive behavior. # Detailed design [design]: #detailed-design From 2762131752abeb96993994ed4c759af5a8c44050 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:49:49 -0800 Subject: [PATCH 26/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 69cdc8966..804a8ad33 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -1,5 +1,5 @@ --- -feature: NixOS Code of Conduct +feature: Nix Community Code of Conduct start-date: 2021-11-03 author: @jonringer co-authors: From 854dc990f666b50defcd28b9ba6c8685c25e47ab Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:50:06 -0800 Subject: [PATCH 27/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 804a8ad33..07c8532eb 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -16,7 +16,7 @@ to determine appropriate behavior when contributing and interacting with the com We currently have a [community ethos](https://github.com/NixOS/nixos-homepage/blob/3f30d59a663c565dd3e43490898f5ab75d06e07f/community/index.tt#L11-L24), but this only states that we are an inclusive community, but doesn't define inappropriate behavior when interacting with the community. This RFC aims -to establish the shared values, so they can be used to identify behavior +to establish such shared values, so they can be used to identify behavior which is disruptive to the community. This RFC does not intend to define moderation practices. From ee0aba26d8d4a2a2f5c7db12ab7e465bc7e14a36 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 07:50:29 -0800 Subject: [PATCH 28/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 07c8532eb..5da123339 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -31,7 +31,7 @@ set of expectations for all contributors, and makes it easier to identify disrup # Detailed design [design]: #detailed-design -These statutes are taken from [rust-lang's Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), +These statutes are taken from [Rust's Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), which provides a great compromise between explicit behaviors and subjective goals. Only minor changes have been made. From 2215c1496ff2552e66a7c759e6932eb10bda5adb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Mar 2023 08:03:52 -0800 Subject: [PATCH 29/29] Update rfcs/0114-nixos-code-of-conduct.md Co-authored-by: Valentin Gagarin --- rfcs/0114-nixos-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rfcs/0114-nixos-code-of-conduct.md b/rfcs/0114-nixos-code-of-conduct.md index 5da123339..ecdae4626 100644 --- a/rfcs/0114-nixos-code-of-conduct.md +++ b/rfcs/0114-nixos-code-of-conduct.md @@ -38,7 +38,7 @@ Only minor changes have been made. - We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, -religion (or lack thereof), socioeconomic status, nationality, or other similar characteristics. +religion (or absence thereof), socioeconomic status, nationality, or other similar characteristics. - Please avoid using overtly sexual aliases or other nicknames that might detract from a friendly, safe and welcoming environment for all. - Please be kind and courteous. There’s no need to be mean or rude.