From 4da9b4919e6b83b0fa886159ac5b512139bbd940 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Tue, 4 Feb 2025 18:15:35 -0500 Subject: [PATCH] major refactor and reorg --- homes/emenel/default.nix | 10 ++-- hosts/eddie/configuration.nix | 3 +- packages/amplocker/package.nix | 51 ------------------- packages/{mioctl => }/mioctl.nix | 0 packages/{paulxstretch => }/paulxstretch.nix | 0 packages/{rbw/rbw.nix => rbw-latest.nix} | 0 .../nodal-red/{nodal-red.nix => package.nix} | 0 .../osirus/{osirus.nix => package.nix} | 0 .../ostirus/{ostirus.nix => package.nix} | 0 .../vavra/{vavra.nix => package.nix} | 0 .../xenia/{xenia.nix => package.nix} | 0 11 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 packages/amplocker/package.nix rename packages/{mioctl => }/mioctl.nix (100%) rename packages/{paulxstretch => }/paulxstretch.nix (100%) rename packages/{rbw/rbw.nix => rbw-latest.nix} (100%) rename packages/the-usual-suspects/nodal-red/{nodal-red.nix => package.nix} (100%) rename packages/the-usual-suspects/osirus/{osirus.nix => package.nix} (100%) rename packages/the-usual-suspects/ostirus/{ostirus.nix => package.nix} (100%) rename packages/the-usual-suspects/vavra/{vavra.nix => package.nix} (100%) rename packages/the-usual-suspects/xenia/{xenia.nix => package.nix} (100%) diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 9b41579..b1753c6 100644 --- a/homes/emenel/default.nix +++ b/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; }; }; diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index b46dc47..3a870e3 100644 --- a/hosts/eddie/configuration.nix +++ b/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}"; diff --git a/packages/amplocker/package.nix b/packages/amplocker/package.nix deleted file mode 100644 index 10ca2af..0000000 --- a/packages/amplocker/package.nix +++ /dev/null @@ -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; - }; -} diff --git a/packages/mioctl/mioctl.nix b/packages/mioctl.nix similarity index 100% rename from packages/mioctl/mioctl.nix rename to packages/mioctl.nix diff --git a/packages/paulxstretch/paulxstretch.nix b/packages/paulxstretch.nix similarity index 100% rename from packages/paulxstretch/paulxstretch.nix rename to packages/paulxstretch.nix diff --git a/packages/rbw/rbw.nix b/packages/rbw-latest.nix similarity index 100% rename from packages/rbw/rbw.nix rename to packages/rbw-latest.nix diff --git a/packages/the-usual-suspects/nodal-red/nodal-red.nix b/packages/the-usual-suspects/nodal-red/package.nix similarity index 100% rename from packages/the-usual-suspects/nodal-red/nodal-red.nix rename to packages/the-usual-suspects/nodal-red/package.nix diff --git a/packages/the-usual-suspects/osirus/osirus.nix b/packages/the-usual-suspects/osirus/package.nix similarity index 100% rename from packages/the-usual-suspects/osirus/osirus.nix rename to packages/the-usual-suspects/osirus/package.nix diff --git a/packages/the-usual-suspects/ostirus/ostirus.nix b/packages/the-usual-suspects/ostirus/package.nix similarity index 100% rename from packages/the-usual-suspects/ostirus/ostirus.nix rename to packages/the-usual-suspects/ostirus/package.nix diff --git a/packages/the-usual-suspects/vavra/vavra.nix b/packages/the-usual-suspects/vavra/package.nix similarity index 100% rename from packages/the-usual-suspects/vavra/vavra.nix rename to packages/the-usual-suspects/vavra/package.nix diff --git a/packages/the-usual-suspects/xenia/xenia.nix b/packages/the-usual-suspects/xenia/package.nix similarity index 100% rename from packages/the-usual-suspects/xenia/xenia.nix rename to packages/the-usual-suspects/xenia/package.nix