diff --git a/home/common-linux.nix b/home/common-linux.nix index 4a2fa39..b03de05 100644 --- a/home/common-linux.nix +++ b/home/common-linux.nix @@ -10,25 +10,14 @@ with lib; { home.packages = with pkgs; [ psmisc # killall and friends file # Query file type + nix-output-monitor pinentry-gnome # Java stuff jdk21 sbt - ] ++ ( - if pkgs.stdenv.isx86_64 - then [ - vivaldi - mpv # for anki - pkgs.unstable.anki-bin - - tdesktop - whatsapp-for-linux - obs-studio - ] - else [ ] - ); + ]; ## Gnome-keyring services.gnome-keyring = { diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix index 876736c..7ea874b 100644 --- a/home/modules/linux/graphical/default.nix +++ b/home/modules/linux/graphical/default.nix @@ -49,6 +49,7 @@ in sublime-music # For navidrome pkgs.unstable.cinny-desktop pkgs.unstable.gajim + vivaldi # Note taking pkgs.unstable.logseq # Audio @@ -57,6 +58,13 @@ in # (if stdenv.isAarch64 then zotero else pkgs.unstable.zotero) // kinda fucked for now from CVE libreoffice + mpv # for anki + pkgs.unstable.anki-bin + + tdesktop + whatsapp-for-linux + obs-studio + ## CLI stuff dex # .desktop file management, startup # sct # Display color temperature @@ -68,10 +76,10 @@ in ])); nki.programs.discord.enable = pkgs.stdenv.isx86_64; - nki.programs.discord.package = pkgs.vesktop.overrideAttrs (attrs: { + nki.programs.discord.package = pkgs.unstable.vesktop.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.nss_latest ]; postInstall = '' - ln -s $out/bin/vencorddesktop $out/bin/discord + ln -s $out/bin/vesktop $out/bin/discord ''; });