major refactor and reorg

homes/emenel/default.nix

@@ -20,12 +20,10 @@
       ]
 
       (with nix-config.packages.x86_64-linux; [
-        # bitwig-beta
-        mioctl.mioctl
+        mioctl
         tal.bassline
         tal.j8
         tal.u-no-lx
-        amplocker.amplocker
         chair-audio.snare
         chair-audio.cymb
         the-usual-suspects.vavra
@@ -39,6 +37,8 @@
         guix
         thonny
 
+        bitwig-studio
+
         wayback
         just
         yt-dlp
@@ -301,8 +301,6 @@
         handbrake
         renoise
         krita
-        darling
-        darling-dmg
         rawtherapee
         inkscape
         gimp
@@ -611,7 +609,7 @@
     firefox.enable = true;
     rbw = {
       enable = true;
-      package = nix-config.packages.x86_64-linux.rbw.rbw;
+      package = nix-config.packages.x86_64-linux.rbw-latest;
     };
   };
 

hosts/eddie/configuration.nix

@@ -18,8 +18,7 @@
     };
     overlays = builtins.attrValues nix-config.overlays
                ++ [ inputs.emacs-overlay.overlays.default
-                    inputs.niri.overlays.default
-                  ];
+                    inputs.niri.overlays.default ];
   };
 
   # environment.etc."nix/inputs/nixpkgs".source = "${nixpkgs}";

packages/amplocker/package.nix

@@ -1,51 +0,0 @@
-{ stdenv, pkgs, fetchurl, lib, unzip, autoPatchelfHook, makeWrapper, ... }:
-
-stdenv.mkDerivation rec {
-  pname = "amplocker";
-  version = "latest";
-  src = fetchurl {
-    url = "https://audioassaultdownloads.s3.amazonaws.com/AmpLocker/AmpLocker109/AmpLockerLinux.zip";
-    sha256 = "sha256-p4mmq/g0bA2d1ophcbXf/Tn2n0tkXzAKoLWUMe95RhU=";
-  };
-  nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
-  buildInputs = with pkgs; [
-    freetype
-    fontconfig
-    alsa-lib
-    pipewire
-    curl
-    stdenv.cc.cc.lib
-  ];
-
-  unpackPhase = ''
-    unzip $src
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib/vst3 $out/
-    mv "Amp Locker.vst3/Contents/x86_64-linux/Amp Locker.so" "Amp Locker.vst3/Contents/x86_64-linux/AmpLocker.so"
-    cp -r "Amp Locker.vst3" $out/lib/vst3/AmpLocker.vst3
-  '';
-
-  NIX_LDFLAGS = (toString [
-    "-lX11"
-    "-lXext"
-    "-lXcursor"
-    "-lXinerama"
-    "-lXrandr"
-  ]);
-
-  postFixup = ''
-    for file in \
-      $out/lib/vst3/AmpLocker.vst3/Contents/x86_64-linux/AmpLocker.so
-    do
-      patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $file
-    done
-  '';
-
-  meta = with lib; {
-    homepage = "https://audioassault.mx/getamplocker#Get_Amp_Locker";
-    description = "Amp Locker";
-    platforms = platforms.linux;
-  };
-}