diff --git a/dotfiles/dot_config/wezterm/wezterm.lua b/dotfiles/dot_config/wezterm/wezterm.lua index a9d281d..3e4e179 100644 --- a/dotfiles/dot_config/wezterm/wezterm.lua +++ b/dotfiles/dot_config/wezterm/wezterm.lua @@ -61,7 +61,7 @@ config.keys = { }, { key = 'k', - mods = 'CTRL', + mods = 'CTRL|SHIFT', action = act.Multiple { act.ClearScrollback 'ScrollbackAndViewport', act.SendKey { key = 'L', mods = 'CTRL' }, diff --git a/home/home.nix b/home/home.nix index e620685..6c56655 100644 --- a/home/home.nix +++ b/home/home.nix @@ -21,6 +21,7 @@ zip stdenv tldr + delta htop dconf dconf2nix @@ -153,9 +154,11 @@ fishPlugins.foreign-env fishPlugins.z - fishPlugins.fzf + fishPlugins.fzf-fish fishPlugins.bass fishPlugins.autopair + fishPlugins.forgit + fishPlugins.colored-man-pages via vial @@ -313,7 +316,10 @@ (callPackage ../packages/amplocker/package.nix {}) (callPackage ../packages/chair-audio/snare.nix {}) (callPackage ../packages/chair-audio/cymb.nix {}) - # (callPackage ../packages/u-he/twangstrom.nix {}) + (callPackage ../packages/the-usual-suspects/vavra/vavra.nix {}) + (callPackage ../packages/the-usual-suspects/xenia/xenia.nix {}) + (callPackage ../packages/the-usual-suspects/ostirus/ostirus.nix {}) + (callPackage ../packages/the-usual-suspects/osirus/osirus.nix {}) # Fonts fira-code @@ -366,6 +372,17 @@ ".j" = "just -g"; "em" = "emacsclient -n -r"; }; + plugins = [ + { + name = "upto"; + src = pkgs.fetchFromGitHub { + owner = "Markcial"; + repo = "upto"; + rev = "2d1f35453fb55747d50da8c1cb1809840f99a646"; + sha256 = "sha256-Lv2XtP2x9dkIkUUjMBWVpAs/l55Ztu7gIjKYH6ZzK4s="; + }; + } + ]; }; starship = { enable = true; @@ -569,6 +586,8 @@ MOZ_ENABLE_WAYLAND = 1; }; + + # moving files! home.file.".npmrc".source = ../dotfiles/dot_npmrc; # xdg.configFile."kmonad".source = ../dotfiles/dot_config/kmonad; xdg.configFile."just/justfile".source = ../dotfiles/dot_config/just/justfile; @@ -598,4 +617,25 @@ }; home.file.".local/share/flf".source = ../dotfiles/dot_local/share/flf; + + home.file.".local/share/The Usual Suspects/Vavra/roms" = { + recursive = true; + source = ../packages/the-usual-suspects/vavra/roms; + }; + home.file.".local/share/The Usual Suspects/Vavra/patchmanager" = { + recursive = true; + source = ../packages/the-usual-suspects/vavra/patchmanager; + }; + home.file.".local/share/The Usual Suspects/Xenia/roms" = { + recursive = true; + source = ../packages/the-usual-suspects/xenia/roms; + }; + home.file.".local/share/The Usual Suspects/Osirus/roms" = { + recursive = true; + source = ../packages/the-usual-suspects/osirus/roms; + }; + home.file.".local/share/The Usual Suspects/OsTIrus/roms" = { + recursive = true; + source = ../packages/the-usual-suspects/ostirus/roms; + }; } diff --git a/packages/the-usual-suspects/osirus/osirus.nix b/packages/the-usual-suspects/osirus/osirus.nix new file mode 100644 index 0000000..2b5df6f --- /dev/null +++ b/packages/the-usual-suspects/osirus/osirus.nix @@ -0,0 +1,37 @@ +{ stdenv, pkgs, fetchurl, lib, unzip, autoPatchelfHook, makeWrapper, ... }: + +stdenv.mkDerivation rec { + pname = "osirus"; + version = "latest"; + src = fetchurl { + url = "https://futurenoize.com/dsp56300/builds/osirus/beta/DSP56300Emu-1.4.0-Linux_x86_64-Osirus-CLAP.zip"; + sha256 = "sha256-Y0oCpt9Mk/PoZu/FkC7X4RY1hVWuZ6cFwJV83WdpDe0="; + }; + nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; + buildInputs = with pkgs; [ + freetype + fontconfig + alsa-lib + pipewire + stdenv.cc.cc.lib + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/lib/clap + cp -r usr/local/lib/clap/Osirus.clap $out/lib/clap/ + ''; + + postFixup = '' + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/lib/clap/Osirus.clap + ''; + + meta = with lib; { + homepage = "https://dsp56300.wordpress.com/osirus/"; + description = "Osirus"; + platforms = platforms.linux; + }; +} diff --git a/packages/the-usual-suspects/osirus/roms/Access Virus C (am29f040b_6v6).BIN b/packages/the-usual-suspects/osirus/roms/Access Virus C (am29f040b_6v6).BIN new file mode 100644 index 0000000..becae17 Binary files /dev/null and b/packages/the-usual-suspects/osirus/roms/Access Virus C (am29f040b_6v6).BIN differ diff --git a/packages/the-usual-suspects/ostirus/ostirus.nix b/packages/the-usual-suspects/ostirus/ostirus.nix new file mode 100644 index 0000000..e8648bf --- /dev/null +++ b/packages/the-usual-suspects/ostirus/ostirus.nix @@ -0,0 +1,37 @@ +{ stdenv, pkgs, fetchurl, lib, unzip, autoPatchelfHook, makeWrapper, ... }: + +stdenv.mkDerivation rec { + pname = "ostirus"; + version = "latest"; + src = fetchurl { + url = "https://futurenoize.com/dsp56300/builds/ostirus/beta/DSP56300Emu-1.4.0-Linux_x86_64-OsTIrus-CLAP.zip"; + sha256 = "sha256-F+n/0gtJ0U7pF7KWr0EQbDSW1oGlG0az17l5zlE3H0s="; + }; + nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; + buildInputs = with pkgs; [ + freetype + fontconfig + alsa-lib + pipewire + stdenv.cc.cc.lib + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/lib/clap + cp -r usr/local/lib/clap/OsTIrus.clap $out/lib/clap/ + ''; + + postFixup = '' + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/lib/clap/OsTIrus.clap + ''; + + meta = with lib; { + homepage = "https://dsp56300.wordpress.com/ostirus/"; + description = "OsTIrus"; + platforms = platforms.linux; + }; +} diff --git a/packages/the-usual-suspects/ostirus/roms/Access Virus TI.bin b/packages/the-usual-suspects/ostirus/roms/Access Virus TI.bin new file mode 100644 index 0000000..df1521f Binary files /dev/null and b/packages/the-usual-suspects/ostirus/roms/Access Virus TI.bin differ diff --git a/packages/the-usual-suspects/vavra/patchmanager/mQ_factory2001.mid b/packages/the-usual-suspects/vavra/patchmanager/mQ_factory2001.mid new file mode 100644 index 0000000..9560d86 Binary files /dev/null and b/packages/the-usual-suspects/vavra/patchmanager/mQ_factory2001.mid differ diff --git a/packages/the-usual-suspects/vavra/patchmanager/microq_factoryset_2000.mid b/packages/the-usual-suspects/vavra/patchmanager/microq_factoryset_2000.mid new file mode 100644 index 0000000..8df71ff Binary files /dev/null and b/packages/the-usual-suspects/vavra/patchmanager/microq_factoryset_2000.mid differ diff --git a/packages/the-usual-suspects/vavra/roms/microQ223.BIN b/packages/the-usual-suspects/vavra/roms/microQ223.BIN new file mode 100644 index 0000000..789bf07 Binary files /dev/null and b/packages/the-usual-suspects/vavra/roms/microQ223.BIN differ diff --git a/packages/the-usual-suspects/vavra/roms/mq_2_23.mid b/packages/the-usual-suspects/vavra/roms/mq_2_23.mid new file mode 100644 index 0000000..59499d9 Binary files /dev/null and b/packages/the-usual-suspects/vavra/roms/mq_2_23.mid differ diff --git a/packages/the-usual-suspects/vavra/vavra.nix b/packages/the-usual-suspects/vavra/vavra.nix new file mode 100644 index 0000000..e3d09c3 --- /dev/null +++ b/packages/the-usual-suspects/vavra/vavra.nix @@ -0,0 +1,37 @@ +{ stdenv, pkgs, fetchurl, lib, unzip, autoPatchelfHook, makeWrapper, ... }: + +stdenv.mkDerivation rec { + pname = "vavra"; + version = "latest"; + src = fetchurl { + url = "https://futurenoize.com/dsp56300/builds/vavra/beta/DSP56300Emu-1.4.0-Linux_x86_64-Vavra-CLAP.zip"; + sha256 = "sha256-ed5Rd3gk0ySe85232RDSIDknnw74EtQBrmkWwmick0g="; + }; + nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; + buildInputs = with pkgs; [ + freetype + fontconfig + alsa-lib + pipewire + stdenv.cc.cc.lib + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/lib/clap + cp -r usr/local/lib/clap/Vavra.clap $out/lib/clap/ + ''; + + postFixup = '' + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/lib/clap/Vavra.clap + ''; + + meta = with lib; { + homepage = "https://dsp56300.wordpress.com/vavra/"; + description = "Vavra"; + platforms = platforms.linux; + }; +} diff --git a/packages/the-usual-suspects/xenia/roms/lower_Am29F010.bin b/packages/the-usual-suspects/xenia/roms/lower_Am29F010.bin new file mode 100644 index 0000000..926a26d Binary files /dev/null and b/packages/the-usual-suspects/xenia/roms/lower_Am29F010.bin differ diff --git a/packages/the-usual-suspects/xenia/roms/upper_Am29F010.bin b/packages/the-usual-suspects/xenia/roms/upper_Am29F010.bin new file mode 100644 index 0000000..a4ea5ae Binary files /dev/null and b/packages/the-usual-suspects/xenia/roms/upper_Am29F010.bin differ diff --git a/packages/the-usual-suspects/xenia/xenia.nix b/packages/the-usual-suspects/xenia/xenia.nix new file mode 100644 index 0000000..3db09a0 --- /dev/null +++ b/packages/the-usual-suspects/xenia/xenia.nix @@ -0,0 +1,45 @@ +{ stdenv, pkgs, fetchurl, lib, unzip, autoPatchelfHook, makeWrapper, ... }: + +stdenv.mkDerivation rec { + pname = "xenia"; + version = "latest"; + src = fetchurl { + url = "https://futurenoize.com/dsp56300/builds/xenia/beta/DSP56300Emu-1.4.0-Linux_x86_64-Xenia-CLAP.zip"; + sha256 = "sha256-iCsJfzif6NHPSxZbNxKmUxTNhQeKGlx9E2V3+2sbgww="; + }; + nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; + buildInputs = with pkgs; [ + freetype + fontconfig + alsa-lib + pipewire + mesa + freeglut + pkg-config + stdenv.cc.cc.lib + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXinerama + xorg.libXcomposite + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/lib/clap + cp -r usr/local/lib/clap/Xenia.clap $out/lib/clap/ + ''; + + postFixup = '' + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/lib/clap/Xenia.clap + ''; + + meta = with lib; { + homepage = "https://dsp56300.wordpress.com/xenia/"; + description = "Xenia"; + platforms = platforms.linux; + }; +}