diff --git a/nixos/flake.lock b/nixos/flake.lock
index ea5c0f1..5e785ad 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -1,385 +1,419 @@
 {
-	"nodes": {
-		"fenix": {
-			"inputs": {
-				"nixpkgs": [
-					"nixpkgs"
-				],
-				"rust-analyzer-src": "rust-analyzer-src"
-			},
-			"locked": {
-				"lastModified": 1734590149,
-				"narHash": "sha256-NcfLaETnNMPHTlu7/oTrihCjTL6G2DIe6lHZ68o2n8w=",
-				"owner": "nix-community",
-				"repo": "fenix",
-				"rev": "81afc33397436c678482a1560bbc810cc3504dbc",
-				"type": "github"
-			},
-			"original": {
-				"owner": "nix-community",
-				"repo": "fenix",
-				"type": "github"
-			}
-		},
-		"flake-parts": {
-			"inputs": {
-				"nixpkgs-lib": [
-					"nur",
-					"nixpkgs"
-				]
-			},
-			"locked": {
-				"lastModified": 1733312601,
-				"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-				"owner": "hercules-ci",
-				"repo": "flake-parts",
-				"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-				"type": "github"
-			},
-			"original": {
-				"owner": "hercules-ci",
-				"repo": "flake-parts",
-				"type": "github"
-			}
-		},
-		"home-manager": {
-			"inputs": {
-				"nixpkgs": [
-					"nixpkgs"
-				]
-			},
-			"locked": {
-				"lastModified": 1734366194,
-				"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
-				"owner": "nix-community",
-				"repo": "home-manager",
-				"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
-				"type": "github"
-			},
-			"original": {
-				"owner": "nix-community",
-				"ref": "release-24.11",
-				"repo": "home-manager",
-				"type": "github"
-			}
-		},
-		"libcamera-src": {
-			"flake": false,
-			"locked": {
-				"lastModified": 1725630279,
-				"narHash": "sha256-KH30jmHfxXq4j2CL7kv18DYECJRp9ECuWNPnqPZajPA=",
-				"owner": "raspberrypi",
-				"repo": "libcamera",
-				"rev": "69a894c4adad524d3063dd027f5c4774485cf9db",
-				"type": "github"
-			},
-			"original": {
-				"owner": "raspberrypi",
-				"repo": "libcamera",
-				"rev": "69a894c4adad524d3063dd027f5c4774485cf9db",
-				"type": "github"
-			}
-		},
-		"libpisp-src": {
-			"flake": false,
-			"locked": {
-				"lastModified": 1724944683,
-				"narHash": "sha256-Fo2UJmQHS855YSSKKmGrsQnJzXog1cdpkIOO72yYAM4=",
-				"owner": "raspberrypi",
-				"repo": "libpisp",
-				"rev": "28196ed6edcfeda88d23cc5f213d51aa6fa17bb3",
-				"type": "github"
-			},
-			"original": {
-				"owner": "raspberrypi",
-				"ref": "v1.0.7",
-				"repo": "libpisp",
-				"type": "github"
-			}
-		},
-		"nix-flatpak": {
-			"locked": {
-				"lastModified": 1734128415,
-				"narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=",
-				"owner": "gmodena",
-				"repo": "nix-flatpak",
-				"rev": "8bdc2540da516006d07b04019eb57ae0781a04b3",
-				"type": "github"
-			},
-			"original": {
-				"owner": "gmodena",
-				"ref": "latest",
-				"repo": "nix-flatpak",
-				"type": "github"
-			}
-		},
-		"nixpkgs": {
-			"locked": {
-				"lastModified": 1734323986,
-				"narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
-				"owner": "nixos",
-				"repo": "nixpkgs",
-				"rev": "394571358ce82dff7411395829aa6a3aad45b907",
-				"type": "github"
-			},
-			"original": {
-				"owner": "nixos",
-				"ref": "nixos-24.11",
-				"repo": "nixpkgs",
-				"type": "github"
-			}
-		},
-		"nixpkgs-unstable": {
-			"locked": {
-				"lastModified": 1735471104,
-				"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
-				"owner": "nixos",
-				"repo": "nixpkgs",
-				"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
-				"type": "github"
-			},
-			"original": {
-				"owner": "nixos",
-				"ref": "nixos-unstable",
-				"repo": "nixpkgs",
-				"type": "github"
-			}
-		},
-		"nixpkgs_2": {
-			"locked": {
-				"lastModified": 1736061677,
-				"narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
-				"owner": "NixOS",
-				"repo": "nixpkgs",
-				"rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
-				"type": "github"
-			},
-			"original": {
-				"owner": "NixOS",
-				"ref": "nixos-24.11",
-				"repo": "nixpkgs",
-				"type": "github"
-			}
-		},
-		"nur": {
-			"inputs": {
-				"flake-parts": "flake-parts",
-				"nixpkgs": [
-					"nixpkgs"
-				],
-				"treefmt-nix": "treefmt-nix"
-			},
-			"locked": {
-				"lastModified": 1734554871,
-				"narHash": "sha256-adKmMR20KSMrSQLAq3HbI1Y8DpgB2Fs4Nyiq9OpI/E4=",
-				"owner": "nix-community",
-				"repo": "NUR",
-				"rev": "52adbe40112836626fb9ed51e14d217e8b2f81c1",
-				"type": "github"
-			},
-			"original": {
-				"owner": "nix-community",
-				"repo": "NUR",
-				"type": "github"
-			}
-		},
-		"raspberry-pi-nix": {
-			"inputs": {
-				"libcamera-src": "libcamera-src",
-				"libpisp-src": "libpisp-src",
-				"nixpkgs": "nixpkgs_2",
-				"rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
-				"rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
-				"rpi-firmware-src": "rpi-firmware-src",
-				"rpi-linux-6_12_17-src": "rpi-linux-6_12_17-src",
-				"rpi-linux-6_6_78-src": "rpi-linux-6_6_78-src",
-				"rpi-linux-stable-src": "rpi-linux-stable-src",
-				"rpicam-apps-src": "rpicam-apps-src"
-			},
-			"locked": {
-				"lastModified": 1740928520,
-				"narHash": "sha256-NL5qZi0iEEvQK9kMF6r48FOk5WMdQExCqodRH3kEr0g=",
-				"owner": "nix-community",
-				"repo": "raspberry-pi-nix",
-				"rev": "3bfda6add79c55f9bf143fac928f54484d450e87",
-				"type": "github"
-			},
-			"original": {
-				"owner": "nix-community",
-				"repo": "raspberry-pi-nix",
-				"type": "github"
-			}
-		},
-		"root": {
-			"inputs": {
-				"fenix": "fenix",
-				"home-manager": "home-manager",
-				"nix-flatpak": "nix-flatpak",
-				"nixpkgs": "nixpkgs",
-				"nixpkgs-unstable": "nixpkgs-unstable",
-				"nur": "nur",
-				"raspberry-pi-nix": "raspberry-pi-nix"
-			}
-		},
-		"rpi-bluez-firmware-src": {
-			"flake": false,
-			"locked": {
-				"lastModified": 1708969706,
-				"narHash": "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q=",
-				"owner": "RPi-Distro",
-				"repo": "bluez-firmware",
-				"rev": "78d6a07730e2d20c035899521ab67726dc028e1c",
-				"type": "github"
-			},
-			"original": {
-				"owner": "RPi-Distro",
-				"ref": "bookworm",
-				"repo": "bluez-firmware",
-				"type": "github"
-			}
-		},
-		"rpi-firmware-nonfree-src": {
-			"flake": false,
-			"locked": {
-				"lastModified": 1723266537,
-				"narHash": "sha256-T7eTKXqY9cxEMdab8Snda4CEOrEihy5uOhA6Fy+Mhnw=",
-				"owner": "RPi-Distro",
-				"repo": "firmware-nonfree",
-				"rev": "4b356e134e8333d073bd3802d767a825adec3807",
-				"type": "github"
-			},
-			"original": {
-				"owner": "RPi-Distro",
-				"ref": "bookworm",
-				"repo": "firmware-nonfree",
-				"type": "github"
-			}
-		},
-		"rpi-firmware-src": {
-			"flake": false,
-			"locked": {
-				"lastModified": 1728405098,
-				"narHash": "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=",
-				"owner": "raspberrypi",
-				"repo": "firmware",
-				"rev": "7bbb5f80d20a2335066a8781459c9f33e5eebc64",
-				"type": "github"
-			},
-			"original": {
-				"owner": "raspberrypi",
-				"ref": "1.20241008",
-				"repo": "firmware",
-				"type": "github"
-			}
-		},
-		"rpi-linux-6_12_17-src": {
-			"flake": false,
-			"locked": {
-				"lastModified": 1740765145,
-				"narHash": "sha256-hoCsGc4+RC/2LmxDtswLBL5ZhWlw4vSiL4Vkl39r2MU=",
-				"owner": "raspberrypi",
-				"repo": "linux",
-				"rev": "5985ce32e511f4e8279a841a1b06a8c7d972b386",
-				"type": "github"
-			},
-			"original": {
-				"owner": "raspberrypi",
-				"ref": "rpi-6.12.y",
-				"repo": "linux",
-				"type": "github"
-			}
-		},
-		"rpi-linux-6_6_78-src": {
-			"flake": false,
-			"locked": {
-				"lastModified": 1740503700,
-				"narHash": "sha256-Y8+ot4Yi3UKwlZK3ap15rZZ16VZDvmeFkD46+6Ku7bE=",
-				"owner": "raspberrypi",
-				"repo": "linux",
-				"rev": "2e071057fded90e789c0101498e45a1778be93fe",
-				"type": "github"
-			},
-			"original": {
-				"owner": "raspberrypi",
-				"ref": "rpi-6.6.y",
-				"repo": "linux",
-				"type": "github"
-			}
-		},
-		"rpi-linux-stable-src": {
-			"flake": false,
-			"locked": {
-				"lastModified": 1728403745,
-				"narHash": "sha256-phCxkuO+jUGZkfzSrBq6yErQeO2Td+inIGHxctXbD5U=",
-				"owner": "raspberrypi",
-				"repo": "linux",
-				"rev": "5aeecea9f4a45248bcf564dec924965e066a7bfd",
-				"type": "github"
-			},
-			"original": {
-				"owner": "raspberrypi",
-				"ref": "stable_20241008",
-				"repo": "linux",
-				"type": "github"
-			}
-		},
-		"rpicam-apps-src": {
-			"flake": false,
-			"locked": {
-				"lastModified": 1727515047,
-				"narHash": "sha256-qCYGrcibOeGztxf+sd44lD6VAOGoUNwRqZDdAmcTa/U=",
-				"owner": "raspberrypi",
-				"repo": "rpicam-apps",
-				"rev": "a8ccf9f3cd9df49875dfb834a2b490d41d226031",
-				"type": "github"
-			},
-			"original": {
-				"owner": "raspberrypi",
-				"ref": "v1.5.2",
-				"repo": "rpicam-apps",
-				"type": "github"
-			}
-		},
-		"rust-analyzer-src": {
-			"flake": false,
-			"locked": {
-				"lastModified": 1734531725,
-				"narHash": "sha256-IGe/elaXn5XXA62RIL9OuLMq1vgrUCm+bYPqYCZJ7Ug=",
-				"owner": "rust-lang",
-				"repo": "rust-analyzer",
-				"rev": "27fac08c82210837a2ac84fa5e39eee6993f1605",
-				"type": "github"
-			},
-			"original": {
-				"owner": "rust-lang",
-				"ref": "nightly",
-				"repo": "rust-analyzer",
-				"type": "github"
-			}
-		},
-		"treefmt-nix": {
-			"inputs": {
-				"nixpkgs": [
-					"nur",
-					"nixpkgs"
-				]
-			},
-			"locked": {
-				"lastModified": 1733222881,
-				"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-				"owner": "numtide",
-				"repo": "treefmt-nix",
-				"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-				"type": "github"
-			},
-			"original": {
-				"owner": "numtide",
-				"repo": "treefmt-nix",
-				"type": "github"
-			}
-		}
-	},
-	"root": "root",
-	"version": 7
+  "nodes": {
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1734590149,
+        "narHash": "sha256-NcfLaETnNMPHTlu7/oTrihCjTL6G2DIe6lHZ68o2n8w=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "81afc33397436c678482a1560bbc810cc3504dbc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1734366194,
+        "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "libcamera-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1725630279,
+        "narHash": "sha256-KH30jmHfxXq4j2CL7kv18DYECJRp9ECuWNPnqPZajPA=",
+        "owner": "raspberrypi",
+        "repo": "libcamera",
+        "rev": "69a894c4adad524d3063dd027f5c4774485cf9db",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "repo": "libcamera",
+        "rev": "69a894c4adad524d3063dd027f5c4774485cf9db",
+        "type": "github"
+      }
+    },
+    "libpisp-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1724944683,
+        "narHash": "sha256-Fo2UJmQHS855YSSKKmGrsQnJzXog1cdpkIOO72yYAM4=",
+        "owner": "raspberrypi",
+        "repo": "libpisp",
+        "rev": "28196ed6edcfeda88d23cc5f213d51aa6fa17bb3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "v1.0.7",
+        "repo": "libpisp",
+        "type": "github"
+      }
+    },
+    "musnix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1741303672,
+        "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=",
+        "owner": "musnix",
+        "repo": "musnix",
+        "rev": "d56a15f30329f304151e4e05fa82264d127da934",
+        "type": "github"
+      },
+      "original": {
+        "owner": "musnix",
+        "repo": "musnix",
+        "type": "github"
+      }
+    },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1734128415,
+        "narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "8bdc2540da516006d07b04019eb57ae0781a04b3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "latest",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1740695751,
+        "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1735471104,
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1734323986,
+        "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "394571358ce82dff7411395829aa6a3aad45b907",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1736061677,
+        "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1734554871,
+        "narHash": "sha256-adKmMR20KSMrSQLAq3HbI1Y8DpgB2Fs4Nyiq9OpI/E4=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "52adbe40112836626fb9ed51e14d217e8b2f81c1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
+    "raspberry-pi-nix": {
+      "inputs": {
+        "libcamera-src": "libcamera-src",
+        "libpisp-src": "libpisp-src",
+        "nixpkgs": "nixpkgs_3",
+        "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
+        "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
+        "rpi-firmware-src": "rpi-firmware-src",
+        "rpi-linux-6_12_17-src": "rpi-linux-6_12_17-src",
+        "rpi-linux-6_6_78-src": "rpi-linux-6_6_78-src",
+        "rpi-linux-stable-src": "rpi-linux-stable-src",
+        "rpicam-apps-src": "rpicam-apps-src"
+      },
+      "locked": {
+        "lastModified": 1740928520,
+        "narHash": "sha256-NL5qZi0iEEvQK9kMF6r48FOk5WMdQExCqodRH3kEr0g=",
+        "owner": "nix-community",
+        "repo": "raspberry-pi-nix",
+        "rev": "3bfda6add79c55f9bf143fac928f54484d450e87",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "raspberry-pi-nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "fenix": "fenix",
+        "home-manager": "home-manager",
+        "musnix": "musnix",
+        "nix-flatpak": "nix-flatpak",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nur": "nur",
+        "raspberry-pi-nix": "raspberry-pi-nix"
+      }
+    },
+    "rpi-bluez-firmware-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1708969706,
+        "narHash": "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q=",
+        "owner": "RPi-Distro",
+        "repo": "bluez-firmware",
+        "rev": "78d6a07730e2d20c035899521ab67726dc028e1c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "RPi-Distro",
+        "ref": "bookworm",
+        "repo": "bluez-firmware",
+        "type": "github"
+      }
+    },
+    "rpi-firmware-nonfree-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723266537,
+        "narHash": "sha256-T7eTKXqY9cxEMdab8Snda4CEOrEihy5uOhA6Fy+Mhnw=",
+        "owner": "RPi-Distro",
+        "repo": "firmware-nonfree",
+        "rev": "4b356e134e8333d073bd3802d767a825adec3807",
+        "type": "github"
+      },
+      "original": {
+        "owner": "RPi-Distro",
+        "ref": "bookworm",
+        "repo": "firmware-nonfree",
+        "type": "github"
+      }
+    },
+    "rpi-firmware-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1728405098,
+        "narHash": "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=",
+        "owner": "raspberrypi",
+        "repo": "firmware",
+        "rev": "7bbb5f80d20a2335066a8781459c9f33e5eebc64",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "1.20241008",
+        "repo": "firmware",
+        "type": "github"
+      }
+    },
+    "rpi-linux-6_12_17-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1740765145,
+        "narHash": "sha256-hoCsGc4+RC/2LmxDtswLBL5ZhWlw4vSiL4Vkl39r2MU=",
+        "owner": "raspberrypi",
+        "repo": "linux",
+        "rev": "5985ce32e511f4e8279a841a1b06a8c7d972b386",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "rpi-6.12.y",
+        "repo": "linux",
+        "type": "github"
+      }
+    },
+    "rpi-linux-6_6_78-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1740503700,
+        "narHash": "sha256-Y8+ot4Yi3UKwlZK3ap15rZZ16VZDvmeFkD46+6Ku7bE=",
+        "owner": "raspberrypi",
+        "repo": "linux",
+        "rev": "2e071057fded90e789c0101498e45a1778be93fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "rpi-6.6.y",
+        "repo": "linux",
+        "type": "github"
+      }
+    },
+    "rpi-linux-stable-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1728403745,
+        "narHash": "sha256-phCxkuO+jUGZkfzSrBq6yErQeO2Td+inIGHxctXbD5U=",
+        "owner": "raspberrypi",
+        "repo": "linux",
+        "rev": "5aeecea9f4a45248bcf564dec924965e066a7bfd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "stable_20241008",
+        "repo": "linux",
+        "type": "github"
+      }
+    },
+    "rpicam-apps-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1727515047,
+        "narHash": "sha256-qCYGrcibOeGztxf+sd44lD6VAOGoUNwRqZDdAmcTa/U=",
+        "owner": "raspberrypi",
+        "repo": "rpicam-apps",
+        "rev": "a8ccf9f3cd9df49875dfb834a2b490d41d226031",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "v1.5.2",
+        "repo": "rpicam-apps",
+        "type": "github"
+      }
+    },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1734531725,
+        "narHash": "sha256-IGe/elaXn5XXA62RIL9OuLMq1vgrUCm+bYPqYCZJ7Ug=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "27fac08c82210837a2ac84fa5e39eee6993f1605",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
 }
-
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 9d18fe3..23ef22f 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -2,7 +2,7 @@
 	description = "rae's nixOS config flake";
 
 	inputs = {
-		nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+		nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
 		nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 		nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
 		home-manager = {
@@ -21,6 +21,8 @@
 		};
 		# Raspberry Pi support
 		raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix";
+		# Real-time audio
+		musnix.url = "github:musnix/musnix";
 	};
 
 	outputs = { self, nixpkgs, home-manager, nix-flatpak, ... }@inputs: {
diff --git a/nixos/home/mozilla.nix b/nixos/home/mozilla.nix
index 6a90004..bba2493 100644
--- a/nixos/home/mozilla.nix
+++ b/nixos/home/mozilla.nix
@@ -81,8 +81,8 @@
 								url = "http://127.0.0.1:631/";
 							}
 							{
-								name = "Pinky & Pepper Forever";
-								url = "https://www.silversprocket.net/2020/05/02/pinky-and-pepper-forever-by-eddy-atoms-part-1-of-2/";
+								name = "Battle of the Bits";
+								url = "https://battleofthebits.com/";
 							}
 						];
 					}
diff --git a/nixos/hosts/ioides/configuration.nix b/nixos/hosts/ioides/configuration.nix
index 77409a3..fe269fa 100644
--- a/nixos/hosts/ioides/configuration.nix
+++ b/nixos/hosts/ioides/configuration.nix
@@ -1,5 +1,6 @@
 { inputs, config, pkgs, ... }: {
 	imports = [
+		inputs.musnix.nixosModules.musnix
 		inputs.nix-flatpak.nixosModules.nix-flatpak
 		./hardware-configuration.nix
 		./packages.nix
@@ -20,19 +21,11 @@
 			hardwareAcceleration = {
 				enable = true;
 				intel = {
-					# TODO: change these when you get to your desktop pc
-					videoPlayback = {
-						enable = true;
-						package = pkgs.intel-vaapi-driver;
-					};
-					qsv = {
-						enable = true;
-						package = pkgs.intel-media-sdk;
-					};
+					videoPlayback.enable = true;
+					qsv.enable = true;
 				};
 				nvidia = {
 					enable = true;
-					# TODO: this also needs to be changed back to default on your desktop
 					package = config.boot.kernelPackages.nvidiaPackages.legacy_390;
 				};
 			};
@@ -60,12 +53,12 @@
 		supportedFilesystems = [ "ntfs" ];
 	};
 
-#	# Music pendrive
-#	fileSystems."/mnt/world" = {
-#		device = "/dev/disk/by-uuid/639bae80-0f5d-481c-ae4e-d2c70f754a1c";
-#		fsType = "ext4";
-#		neededForBoot = false;
-#	};
+	# Music pendrive
+	fileSystems."/mnt/world" = {
+		device = "/dev/disk/by-uuid/639bae80-0f5d-481c-ae4e-d2c70f754a1c";
+		fsType = "ext4";
+		neededForBoot = false;
+	};
 #	# Big fucking thing
 #	fileSystems."/mnt/rae2" = {
 #		device = "/dev/disk/by-uuid/fbbcc72f-34af-425c-9151-ef8919a6ae07";
@@ -210,6 +203,12 @@
 		};
 	};
 
+	musnix = {
+		enable = true;
+		rtcqs.enable = true;
+		soundcardPciId = "00:1f.3";
+	};
+
 	users.users.rae.shell = pkgs.fish;
 
 	virtualisation.docker.enable = true;
diff --git a/nixos/hosts/ioides/packages.nix b/nixos/hosts/ioides/packages.nix
index b367f01..757c5aa 100644
--- a/nixos/hosts/ioides/packages.nix
+++ b/nixos/hosts/ioides/packages.nix
@@ -73,7 +73,7 @@
 		qbittorrent                                              # Featureful free software BitTorrent client
 		slack                                                    # Desktop client for Slack
 		tiny                                                     # Console IRC client
-		vesktop                                                  # Alternate client for Discord with Vencord built-in
+		unstable.vesktop                                                  # Alternate client for Discord with Vencord built-in
 		yt-dlp                                                   # Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)
 		# system tools
 		android-tools                                            # Android SDK platform tools
@@ -109,6 +109,7 @@
 		playerctl                                                # Command-line utility and library for controlling media players that implement MPRIS
 		reaper                                                   # Digital audio workstation
 		unstable.rmpc                                            # TUI music player client for MPD with album art support via kitty image protocol
+		supercollider                                            # Programming language for real time audio synthesis
 #   vcv-rack                                                 # Open-source virtual modular synthesizer
 		# X11
 		hsetroot                                                 # Allows you to compose wallpapers ('root pixmaps') for X
diff --git a/nixos/modules/system/home.nix b/nixos/modules/system/home.nix
index d042e88..83005bb 100644
--- a/nixos/modules/system/home.nix
+++ b/nixos/modules/system/home.nix
@@ -2,7 +2,7 @@
 { pkgs, config, lib, ... }: let
 	cfg = config.r5e.home;
 in with lib; {
-	options.r5e.home = mkOption {
+	options.r5e.user = mkOption {
 		type = types.attrsOf {
 			wallpaper = mkOption {
 				type = types.str;