diff --git a/home/files/mpv/mpv.conf b/home/files/mpv/mpv.conf
index 6a8de69..a977de2 100644
--- a/home/files/mpv/mpv.conf
+++ b/home/files/mpv/mpv.conf
@@ -10,3 +10,4 @@ scale=ewa_lanczossharp
 cscale=ewa_lanczossharp
 
 audio-normalize-downmix=yes
+replaygain=track
diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index 0ccf762..b2ad6ce 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -21,7 +21,9 @@
       meson
       gruvbox
 
-      coc-go
+      coc-clangd
+      vim-lsp-cxx-highlight
+
       coc-json
       coc-rust-analyzer
     ];
@@ -34,6 +36,10 @@
 
   xdg.configFile."nvim/coc-settings.json".text = builtins.toJSON {
     rust-analyzer.serverPath = "${pkgs.rust-analyzer}/bin/rust-analyzer";
+    clangd = {
+      path = "${pkgs.llvmPackages_latest.clang-unwrapped}/bin/clangd}";
+      semanticHighlighting = true;
+    };
     languageserver.nix = {
       command = "${pkgs.rnix-lsp}/bin/rnix-lsp";
       filetypes = [ "nix" ];
diff --git a/system/rainbowdash/default.nix b/system/rainbowdash/default.nix
index 975da51..20892a8 100644
--- a/system/rainbowdash/default.nix
+++ b/system/rainbowdash/default.nix
@@ -14,6 +14,10 @@
     ../../sets/workstation.nix
   ];
 
+  environment.systemPackages = [
+    pkgs.pkgsCross.aarch64-multiplatform.buildPackages.gcc
+  ];
+
   networking.hostName = "rainbowdash";
   system.stateVersion = "20.03";
 }