diff --git a/flake.nix b/flake.nix index 54c5023..b950f1d 100644 --- a/flake.nix +++ b/flake.nix @@ -256,8 +256,8 @@ pkgs, ... }: { - audacity4 = pkgs.callPackage ./packages/audacity4 {}; neovim = inputs.neovim.packages.${pkgs.system}.default; + audacity = pkgs.callPackage ./packages/audacity.nix {}; cal-sans = pkgs.callPackage ./packages/cal-sans.nix {}; devkit = { ghostty = pkgs.callPackage ./packages/devkit/ghostty.nix { diff --git a/home/terminal/home.nix b/home/terminal/home.nix index f48b651..eb82245 100644 --- a/home/terminal/home.nix +++ b/home/terminal/home.nix @@ -11,7 +11,9 @@ ]; home.packages = + # Programs (with pkgs; [ + self.packages.${pkgs.stdenv.hostPlatform.system}.audacity bitwarden-desktop obs-studio wezterm diff --git a/home/terminal/impermanence.nix b/home/terminal/impermanence.nix index 7b58bc2..73499a9 100644 --- a/home/terminal/impermanence.nix +++ b/home/terminal/impermanence.nix @@ -22,6 +22,7 @@ with lib; { ["0700" ".gnupg"] ["0700" ".ssh"] ["0755" ".steam"] + ["0755" ".cache/Audacity"] ["0755" ".cache/blender"] ["0755" ".cache/go-build"] ["0755" ".cache/godot"] @@ -32,11 +33,15 @@ with lib; { ["0755" ".cache/zellij"] ["0700" ".cache/zen"] ["0755" ".config/sops/age"] + ["0755" ".config/Audacity"] + ["0755" ".config/audacity4"] ["0755" ".config/blender"] ["0751" ".config/inkscape"] ["0600" ".config/kritarc"] ["0644" ".config/kritadisplayrc"] ["0755" ".config/zen"] + ["0755" ".local/share/Audacity"] + ["0755" ".local/share/audacity4"] ["0755" ".local/share/direnv"] ["0700" ".local/share/keyrings"] ]; diff --git a/packages/audacity.nix b/packages/audacity.nix new file mode 100644 index 0000000..b1bc214 --- /dev/null +++ b/packages/audacity.nix @@ -0,0 +1,46 @@ +{ + appimageTools, + fetchurl, + lib, + ... +}: +appimageTools.wrapType2 rec { + name = "Audacity"; + pname = "audacity"; + version = "4.0.0-alpha-2"; + src = fetchurl { + url = "https://github.com/audacity/audacity/releases/download/Audacity-${version}/Audacity-4.0.0.253031629.f3e3e3b.-x86_64.AppImage"; + hash = "sha256-HMT01OOSSXe609A6SlYBBdg69zyuciNLl9mzTFRByAE="; + }; + extraInstallCommands = '' + mkdir -p $out/bin + mkdir -p $out/share/applications + cat < $out/share/applications/${pname}.desktop + [Desktop Entry] + Name=${name} + Exec=$out/bin/${pname} %f + Type=Application + INI + ''; + + meta = { + description = "Sound editor with graphical UI"; + mainProgram = "audacity"; + homepage = "https://www.audacityteam.org"; + changelog = "https://github.com/audacity/audacity/releases"; + license = with lib.licenses; [ + gpl2Plus + # Must be GPL3 when building with "technologies that require it, + # such as the VST3 audio plugin interface". + # https://github.com/audacity/audacity/discussions/2142. + gpl3 + # Documentation. + cc-by-30 + ]; + maintainers = with lib.maintainers; [ + veprbl + wegank + ]; + platforms = lib.platforms.unix; + }; +} diff --git a/packages/audacity4/AudacityNightly-4.0.0.253640331-x86_64.AppImage b/packages/audacity4/AudacityNightly-4.0.0.253640331-x86_64.AppImage deleted file mode 100755 index e84308f..0000000 Binary files a/packages/audacity4/AudacityNightly-4.0.0.253640331-x86_64.AppImage and /dev/null differ diff --git a/packages/audacity4/default.nix b/packages/audacity4/default.nix deleted file mode 100644 index 31b0525..0000000 --- a/packages/audacity4/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - appimageTools, - makeDesktopItem, - ... -}: let - name = "Audacity 4"; - pname = "audacity4"; - version = "4.0.0.253640331"; - - src = ./AudacityNightly-4.0.0.253640331-x86_64.AppImage; - # appimageContents = appimageTools.extractType1 {inherit name src;}; -in - appimageTools.wrapType2 rec { - inherit name pname version src; - - extraInstallCommands = '' - mkdir -p $out/bin - mkdir -p $out/share/applications - cat < $out/share/applications/${pname}.desktop - [Desktop Entry] - Name=${name} - Exec=$out/bin/${pname} %f - Type=Application - INI - ''; - - meta = { - platforms = ["x86_64-linux"]; - }; - }