From 5c90a78937df408fac4a20670f48aca4e4519931 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 21 Sep 2025 14:46:16 +0100 Subject: [PATCH 1/6] feat: remove non committee and reorganise based on who was already on committee. Also added labels for Core --- config/users.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/config/users.nix b/config/users.nix index f7c3f84..f2ccef4 100644 --- a/config/users.nix +++ b/config/users.nix @@ -52,24 +52,25 @@ in { committee = lib.lists.unique ( # Committee - Core [ + # President "silver" - "eoghanconlon73" - "nanda" + # Secretary + "kaiden" + # Treasurer + "peace" + # PRO + "amymucko" + # HSO "skyapples" - "generically" ] # Committee - OCM ++ [ "eliza" - "amymucko" - "archiedms" - "kaiden" + "generically" + "nanda" ] # Committee - SISTEM - ++ [ - "peace" - "milan" - ] + ++ [] # Admins are part of Committee as well ++ cfg.admin ); @@ -78,8 +79,6 @@ in { "evanc" "eliza" "esy" - # for temp reasons - "peace" ]; trainee = []; lifetime = []; From 39e4e1108e20f358b137aec5ad21addd9597b931 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 21 Sep 2025 15:00:57 +0100 Subject: [PATCH 2/6] feat: initial batch of new committee --- config/users.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/users.nix b/config/users.nix index f2ccef4..8d6b611 100644 --- a/config/users.nix +++ b/config/users.nix @@ -65,9 +65,13 @@ in { ] # Committee - OCM ++ [ + "connormc" + "cordlesscoder" "eliza" "generically" + "mysticwolf" "nanda" + "sunny" ] # Committee - SISTEM ++ [] From 2be5d3759455d59d4df56db5d46cb2461a8b0794 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 22 Sep 2025 11:35:54 +0100 Subject: [PATCH 3/6] feat: second batch of new committee --- config/users.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/users.nix b/config/users.nix index 8d6b611..7ab18bf 100644 --- a/config/users.nix +++ b/config/users.nix @@ -67,11 +67,14 @@ in { ++ [ "connormc" "cordlesscoder" + "dca_" "eliza" + "emilyrutai" "generically" "mysticwolf" "nanda" "sunny" + "tatabbyi" ] # Committee - SISTEM ++ [] From 5e74e181ae631aa0f9d1f9f716f7b68504a67a2b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 22 Sep 2025 18:38:53 +0100 Subject: [PATCH 4/6] feat: third batch of new committee --- config/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/users.nix b/config/users.nix index 7ab18bf..f4758b2 100644 --- a/config/users.nix +++ b/config/users.nix @@ -73,6 +73,7 @@ in { "generically" "mysticwolf" "nanda" + "rituk_0817" "sunny" "tatabbyi" ] From 8ae0d53932ca8f172be6a7ebde8f58caef935f95 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 22 Sep 2025 21:44:55 +0000 Subject: [PATCH 5/6] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3083a51..34445f1 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1758222226, - "narHash": "sha256-/PkJgIquoXAnh7LgiYp41XGkg3s8ET+TMJELtYrMNVg=", + "lastModified": 1758577443, + "narHash": "sha256-tNUJw0LV+kiVg0JOkRkWIul589ecWezOA/67dZo1S1g=", "ref": "refs/heads/main", - "rev": "a4213f2d3ae4558270fc01090715e3b11ca37f94", - "revCount": 128, + "rev": "f21056566c8304d20aa6065fbb88d480f5e7e9ea", + "revCount": 129, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 85fe376560261dc7508a96fb4dbfac554264b18a Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 22 Sep 2025 23:01:41 +0000 Subject: [PATCH 6/6] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 34445f1..8144a6c 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1758577443, - "narHash": "sha256-tNUJw0LV+kiVg0JOkRkWIul589ecWezOA/67dZo1S1g=", + "lastModified": 1758582048, + "narHash": "sha256-SIt6rPXx7O3YMrEw8YrwHNMjOrrJLu/Tf1sMll1Qp9A=", "ref": "refs/heads/main", - "rev": "f21056566c8304d20aa6065fbb88d480f5e7e9ea", - "revCount": 129, + "rev": "4d825caf25cb966ddb5ce33a0e9b2aa73b0262c6", + "revCount": 130, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" },