From 43c70202cfda3522b8a50c897f1287d583452616 Mon Sep 17 00:00:00 2001
From: Alyxia Sother <alyxia@riseup.net>
Date: Mon, 3 Apr 2023 10:32:10 +0200
Subject: [PATCH 1/3] [nix] Add some more software

---
 dmitmel-dotfiles             | 2 +-
 nix/darwin-configuration.nix | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dmitmel-dotfiles b/dmitmel-dotfiles
index 7e90b70..c2f72e6 160000
--- a/dmitmel-dotfiles
+++ b/dmitmel-dotfiles
@@ -1 +1 @@
-Subproject commit 7e90b704e3e5ab13e8d53ac8c6d028c843bb2c6d
+Subproject commit c2f72e61dbb37d68c5a971f0675ed92341d3dcc7
diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix
index dd1fe19..d725a43 100644
--- a/nix/darwin-configuration.nix
+++ b/nix/darwin-configuration.nix
@@ -8,21 +8,27 @@
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages = with pkgs; [
+    act
     bat
     bitwarden-cli
     crystal
     delta
     deno
+    dotnet-sdk
     exa
     ffmpeg
     fzf
     git
     gnupg
     go
+    jetbrains.phpstorm
+    jetbrains.rider
     jq
+    libtool
     mosh
     neovim
     nixpkgs-fmt
+    nodePackages.http-server
     nodePackages.pnpm
     nodePackages.prettier
     nodePackages.yarn
@@ -63,11 +69,14 @@
     casks = [
       "alt-tab"
       "amethyst"
+      "audacity"
+      "db-browser-for-sqlite"
       "discord"
       "docker"
       "fig"
       "firefox"
       "google-chrome"
+      "itch"
       "iterm2"
       "nss"
       "obs"

From abb6cdd614f6466037f1dc353e46586505580eee Mon Sep 17 00:00:00 2001
From: Alyxia Sother <alyxia@riseup.net>
Date: Tue, 4 Apr 2023 10:00:43 +0200
Subject: [PATCH 2/3] [nix] Add Fyra's Vala toolset

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

diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix
index d725a43..b1a5400 100644
--- a/nix/darwin-configuration.nix
+++ b/nix/darwin-configuration.nix
@@ -46,6 +46,16 @@
     vim
     wget
     zig
+
+    # Fyra vala crap
+    gtk4
+    gobject-introspection
+    glib
+    glib-networking
+    libgee
+    meson
+    ninja
+    vala
   ];
 
   homebrew = {

From 81eb36f3233e8fc1314323f381adf05e01de2e82 Mon Sep 17 00:00:00 2001
From: Alyxia Sother <alyxia@riseup.net>
Date: Thu, 6 Apr 2023 09:38:45 +0200
Subject: [PATCH 3/3] [nix] Order the systemPackages

---
 nix/darwin-configuration.nix | 54 +++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix
index b1a5400..639a2b9 100644
--- a/nix/darwin-configuration.nix
+++ b/nix/darwin-configuration.nix
@@ -8,50 +8,59 @@
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages = with pkgs; [
+    # System tools
+    libtool
+    pcre
+    pkg-config
+
+    # CLI tools
     act
     bat
     bitwarden-cli
-    crystal
     delta
-    deno
-    dotnet-sdk
     exa
     ffmpeg
     fzf
     git
+    gitui
     gnupg
-    go
-    jetbrains.phpstorm
-    jetbrains.rider
     jq
-    libtool
     mosh
     neovim
     nixpkgs-fmt
+    ripgrep
+    vim
+    wget
+
+    # Programs
+    jetbrains.phpstorm
+    jetbrains.rider
+    rectangle
+    slack
+    tailscale
+
+    # Programming languages
+    crystal
+    deno
+    dotnet-sdk
+    go
+    nodejs-19_x
+    ruby_3_1
+    shards
+    zig
+
+    # Libraries
     nodePackages.http-server
     nodePackages.pnpm
     nodePackages.prettier
     nodePackages.yarn
-    nodejs-19_x
     openssl
-    pcre
-    pkg-config
-    rectangle
-    ripgrep
-    ruby_3_1
-    shards
-    slack
-    slack-term
-    tailscale
-    vim
-    wget
-    zig
 
     # Fyra vala crap
-    gtk4
-    gobject-introspection
     glib
     glib-networking
+    gobject-introspection
+    gtk4
     libgee
     meson
     ninja
@@ -80,6 +89,7 @@
       "alt-tab"
       "amethyst"
       "audacity"
+      "background-music"
       "db-browser-for-sqlite"
       "discord"
       "docker"