From 1769397e4ad1d6b9b4229dd4a7742f0aaafdbee2 Mon Sep 17 00:00:00 2001
From: Alyxia Sother <alyxia@riseup.net>
Date: Mon, 8 May 2023 13:43:49 +0200
Subject: [PATCH 1/3] [nix] Install discord-ptb

---
 nix/darwin-configuration.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix
index 21dc483..1383f92 100644
--- a/nix/darwin-configuration.nix
+++ b/nix/darwin-configuration.nix
@@ -83,6 +83,7 @@
     taps = [
       "drud/ddev"
       "homebrew/cask"
+      "homebrew/cask-versions"
     ];
 
     # Please do not the brew.
@@ -101,6 +102,7 @@
       "background-music"
       "db-browser-for-sqlite"
       "discord"
+      "discord-ptb"
       "docker"
       "fig"
       "firefox"

From 31d6e4949e53f17b6371198a0740eb32dd49451c Mon Sep 17 00:00:00 2001
From: Alyxia Sother <alyxia@riseup.net>
Date: Mon, 8 May 2023 13:45:30 +0200
Subject: [PATCH 2/3] [nix] Java/Android Studio

---
 nix/darwin-configuration.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix
index 1383f92..fb92bc7 100644
--- a/nix/darwin-configuration.nix
+++ b/nix/darwin-configuration.nix
@@ -52,6 +52,7 @@
     deno
     dotnet-sdk
     go
+    jdk
     nodejs-19_x
     ruby_3_1
     shards
@@ -98,6 +99,7 @@
     casks = [
       "alt-tab"
       "amethyst"
+      "android-studio"
       "audacity"
       "background-music"
       "db-browser-for-sqlite"

From d3d12c598c94c091dfcf3199e38ef4a3a47be79d Mon Sep 17 00:00:00 2001
From: Alyxia Sother <alyxia@riseup.net>
Date: Mon, 8 May 2023 13:46:42 +0200
Subject: [PATCH 3/3] [nix] No more nix.extraOptions

---
 nix/darwin-configuration.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix
index fb92bc7..a09ae7d 100644
--- a/nix/darwin-configuration.nix
+++ b/nix/darwin-configuration.nix
@@ -130,10 +130,8 @@
     package = pkgs.nix;
     settings = {
       experimental-features = [ "nix-command" "flakes" ];
+      build-users-group = "nixbld";
     };
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
     gc = {
       automatic = true;
       options = "--delete-older-than 8d";