diff --git a/home/seanomik/default.nix b/home/seanomik/default.nix index a20b663..4ee7720 100755 --- a/home/seanomik/default.nix +++ b/home/seanomik/default.nix @@ -68,9 +68,13 @@ google-chrome (callPackage ../../modules/pkgs/upwork.nix { inherit runCommandLocal; }) (libsForQt5.callPackage ../../modules/pkgs/jellyfin-media-player.nix { }) +# ytmdesktop + (callPackage ../../modules/pkgs/ytmdesktop.nix { }) jetbrains.idea-community renderdoc virt-manager + hexchat + kdenlive ]; }; } diff --git a/home/vscode.nix b/home/vscode.nix index ec62913..9a20c1d 100755 --- a/home/vscode.nix +++ b/home/vscode.nix @@ -160,6 +160,12 @@ version = "1.3.0"; sha256 = "sha256-rHST7CYCVins3fqXC+FYiS5Xgcjmi7QW7M4yFrUR04U="; } + { + name = "cpptools"; + publisher = "ms-vscode"; + version = "1.13.2"; + sha256 = "sha256-c45grknJPcIICYhDWH+dwr1XsCsshxTJFGHYZPHrCQs="; + } { name = "better-comments"; publisher = "aaron-bond"; diff --git a/modules/applications/discord.nix b/modules/applications/discord.nix index 8cdfc21..5bfa5d0 100755 --- a/modules/applications/discord.nix +++ b/modules/applications/discord.nix @@ -1,8 +1,8 @@ { pkgs, ... }: ((pkgs.discord.overrideAttrs (_: { src = builtins.fetchTarball { - url = "https://dl.discordapp.net/apps/linux/0.0.20/discord-0.0.20.tar.gz"; - sha256 = "sha256:0qaczvp79b4gzzafgc5ynp6h4nd2ppvndmj6pcs1zys3c0hrabpv"; + url = "https://dl.discordapp.net/apps/linux/0.0.21/discord-0.0.21.tar.gz"; + sha256 = "sha256:1pw9q4290yn62xisbkc7a7ckb1sa5acp91plp2mfpg7gp7v60zvz"; }; })).override { nss = pkgs.nss_latest; diff --git a/modules/pkgs/ytmdesktop.nix b/modules/pkgs/ytmdesktop.nix new file mode 100644 index 0000000..577d488 --- /dev/null +++ b/modules/pkgs/ytmdesktop.nix @@ -0,0 +1,35 @@ +{ lib, fetchurl, appimageTools, }: + +let + pname = "ytmdesktop"; + version = "1.14.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/ytmdesktop/ytmdesktop/releases/download/${version}/YouTube.Music.Desktop.App-${version}_Nightly.AppImage"; + sha256 = "sha256-1PcNYfQYYFKMwg+Z2YvsXuoZRxWSE1G8zO/5oF09Ddw="; + }; + + appimageContents = appimageTools.extract { inherit name src; }; +in appimageTools.wrapType2 rec { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -m 444 \ + -D ${appimageContents}/youtube-music-desktop-app.desktop \ + -t $out/share/applications + substituteInPlace \ + $out/share/applications/youtube-music-desktop-app.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A Desktop App for YouTube Music"; + homepage = "https://ytmdesktop.app/"; + license = licenses.cc0; + platforms = platforms.linux; + maintainers = with maintainers; [ lgcl seanomik ]; + }; +}