From fdbc7d09311e52eb115c47b8e303c7cf7c0e4969 Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 16 Jul 2024 13:38:18 +0800 Subject: [PATCH] packages: move some packages from workstation to desktop-extra --- modules/packages/desktop-extra.nix | 4 ++-- modules/packages/workstation.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/packages/desktop-extra.nix b/modules/packages/desktop-extra.nix index 3976dc6b..195d37b1 100644 --- a/modules/packages/desktop-extra.nix +++ b/modules/packages/desktop-extra.nix @@ -19,7 +19,7 @@ inputs: scrcpy weston cage openbox krita # media spotify yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk vlc obs-studio - waifu2x-converter-cpp inkscape blender whalebird + waifu2x-converter-cpp inkscape blender whalebird paraview # editor typora # news @@ -30,7 +30,7 @@ inputs: # instant messager element-desktop telegram-desktop discord fluffychat zoom-us signal-desktop slack nur-linyinfeng.wemeet # browser - google-chrome + google-chrome tor-browser # office crow-translate zotero pandoc ydict libreoffice-qt texstudio poppler_utils pdftk gnuplot pdfchain hdfview texliveFull diff --git a/modules/packages/workstation.nix b/modules/packages/workstation.nix index 232dee43..1cbb513c 100644 --- a/modules/packages/workstation.nix +++ b/modules/packages/workstation.nix @@ -29,13 +29,13 @@ inputs: # math, physics and chemistry (mathematica.overrideAttrs (prev: { postInstall = prev.postInstall or "" + "ln -s ${src} $out/src"; })) (quantum-espresso.override { stdenv = gcc14Stdenv; gfortran = gfortran14; }) - paraview jmol mpi + jmol mpi # encryption and password management john crunch hashcat # container and vm genymotion davinci-resolve playonlinux # browser - microsoft-edge tor-browser + microsoft-edge # news rssguard newsflash newsboat ] ++ inputs.lib.optional (inputs.config.nixos.system.nixpkgs.march != null) localPackages.mumax;