diff --git a/flake.lock b/flake.lock index c0b2355..e128101 100755 --- a/flake.lock +++ b/flake.lock @@ -307,6 +307,24 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -706,6 +724,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -820,7 +854,8 @@ "nixpkgs": "nixpkgs_3", "personal-neovim": "personal-neovim", "spicetify": "spicetify", - "stablepkgs": "stablepkgs" + "stablepkgs": "stablepkgs", + "vesktop-bin": "vesktop-bin" } }, "rust-overlay": { @@ -961,6 +996,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -982,6 +1032,25 @@ "repo": "treefmt-nix", "type": "github" } + }, + "vesktop-bin": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1724591359, + "narHash": "sha256-BOjN/xLegrPM02Uhhs3WyyTvin4tdWC+iBamoA7EtHY=", + "owner": "youwen5", + "repo": "vesktop-bin-flake", + "rev": "fe8b5fff01426dcb04dee671d228032c6894316f", + "type": "github" + }, + "original": { + "owner": "youwen5", + "repo": "vesktop-bin-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 547912c..95d4723 100755 --- a/flake.nix +++ b/flake.nix @@ -55,6 +55,8 @@ }; personal-neovim.url = "github:youwen5/neovim-flake"; + + vesktop-bin.url = "github:youwen5/vesktop-bin-flake"; }; outputs = { diff --git a/hosts/callisto/configuration.nix b/hosts/callisto/configuration.nix index 9c09738..c4fcd2a 100755 --- a/hosts/callisto/configuration.nix +++ b/hosts/callisto/configuration.nix @@ -40,6 +40,8 @@ stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system}; in [ inputs.apple-silicon.overlays.apple-silicon-overlay + inputs.vesktop-bin.overlays.default + (final: prev: { hyprland = prev.hyprland.overrideAttrs (oldAttrs: { src = oldAttrs.src; @@ -50,47 +52,6 @@ ./0001-linux-dmabuf-allow-on-split-node-systems.patch ]; }); - - vesktop = with pkgs; let - pname = "vesktop"; - version = "1.5.3"; - - src = fetchurl { - url = "https://github.com/Vencord/Vesktop/releases/download/v${version}/${pname}-${version}-arm64.AppImage"; - hash = "sha256-4F1oR2nc54EZ2heGVkz4vqZzmwn0exa2+AcYHpeTb98="; - }; - - appimageContents = appimageTools.extract { - inherit pname version src; - }; - - desktopItem = makeDesktopItem { - name = pname; - desktopName = "Vesktop"; - exec = "vesktop %U --ozone-platform-hint=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime"; - icon = "vesktop"; - startupWMClass = "Vesktop"; - genericName = "Internet Messenger"; - keywords = [ - "discord" - ]; - categories = [ - "Network" - "InstantMessaging" - "Chat" - ]; - }; - in - appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - mkdir -p $out/share - cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons - chmod -R +w $out/share - mv $out/share/icons/hicolor/{16x16,256x256} - ''; - }; }) ];