diff --git a/flake.lock b/flake.lock
index 13c203f..023d936 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1690200740,
-        "narHash": "sha256-aRkEXGmCbAGcvDcdh/HB3YN+EvoPoxmJMOaqRZmf6vM=",
+        "lastModified": 1691179816,
+        "narHash": "sha256-WSMwqzU70ZMRHv1CUAfHEEKJuB0c9c9r0F+lJehXfSI=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "ba9650b14e83b365fb9e731f7d7c803f22d2aecf",
+        "rev": "87e3122b67587492a617764f88c71991893fcf8a",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1690470004,
-        "narHash": "sha256-l57RmPhPz9r1LGDg/0v8bYgJO8R+GGTQZtkIxE7negU=",
+        "lastModified": 1691155011,
+        "narHash": "sha256-O15tC0ysw+fcacEbOzrDrkVNIR+SgtArSGvpgsEqpvA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9462344318b376e157c94fa60c20a25b913b2381",
+        "rev": "9652a97d9738d3e65cf33c0bc24429e495a7868f",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1690367991,
-        "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=",
+        "lastModified": 1691186842,
+        "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703",
+        "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42",
         "type": "github"
       },
       "original": {
diff --git a/sets/disc.nix b/sets/disc.nix
new file mode 100644
index 0000000..e504434
--- /dev/null
+++ b/sets/disc.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    cyanrip
+    makemkv
+  ];
+
+  users.users.artemis.extraGroups = [ "cdrom" ];
+}
diff --git a/sets/music.nix b/sets/music.nix
new file mode 100644
index 0000000..29be8f1
--- /dev/null
+++ b/sets/music.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    pipewire.jack
+
+    carla
+    lsp-plugins
+  ];
+}
diff --git a/system/starlight/default.nix b/system/starlight/default.nix
index fbf0fe6..cedf11a 100644
--- a/system/starlight/default.nix
+++ b/system/starlight/default.nix
@@ -5,17 +5,19 @@
     ./boot-config.nix
     ./hardware-configuration.nix
     ./scripts.nix
+    ../../sets/1password.nix
     ../../sets/builder.nix
+    ../../sets/disc.nix
     ../../sets/fpga.nix
     ../../sets/hacking.nix
     ../../sets/hardware.nix
+    ../../sets/ime.nix
     ../../sets/krb5.nix
+    ../../sets/music.nix
     ../../sets/radio.nix
     ../../sets/sshd.nix
     ../../sets/virtualization.nix
     ../../sets/workstation.nix
-    ../../sets/ime.nix
-    ../../sets/1password.nix
     inputs.nixos-hardware.nixosModules.common-cpu-amd
     inputs.nixos-hardware.nixosModules.common-gpu-amd
   ];
@@ -81,14 +83,6 @@
 
   # Packages
   boot.binfmt.emulatedSystems = [ "aarch64-linux" "riscv64-linux" ];
-  environment.systemPackages = with pkgs; [
-    (weechat.override {
-      configure = { availablePlugins, ... }: {
-        plugins = (builtins.attrValues availablePlugins);
-        scripts = [ weechatScripts.weechat-matrix ];
-      };
-    })
-  ];
 
   services.printing.drivers = [
     (pkgs.brlaser.overrideAttrs (old: {