move some packages to workstation

modules/packages/desktop-fat/default.nix

@@ -16,9 +16,9 @@ inputs:
           _packages =
           [
             # system management
-            etcher btrfs-assistant
+            etcher btrfs-assistant snapper-gui libsForQt5.qtstyleplugin-kvantum
             # password and key management
-            yubikey-manager yubikey-manager-qt yubikey-personalization yubikey-personalization-gui electrum jabref
+            yubikey-manager yubikey-manager-qt yubikey-personalization yubikey-personalization-gui bitwarden
             # download
             qbittorrent nur-xddxdd.baidupcs-go wgetpaste
             # development
@@ -26,33 +26,21 @@ inputs:
             # media
             spotify yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk vlc
             # editor
-            localPackages.typora hdfview
+            localPackages.typora
             # themes
             orchis-theme plasma-overdose-kde-theme materia-kde-theme graphite-kde-theme arc-kde-theme materia-theme
             # news
-            fluent-reader rssguard newsflash newsboat
+            fluent-reader
             # nix tools
             deploy-rs.deploy-rs nixpkgs-fmt
             # instant messager
-            element-desktop telegram-desktop discord inputs.config.nur.repos.linyinfeng.wemeet # native
+            element-desktop telegram-desktop discord # native
-            cinny-desktop # nur-xddxdd.wine-wechat thunder
             # browser
-            google-chrome microsoft-edge
+            google-chrome
+            # office
+            crow-translate zotero pandoc ydict
           ] ++ (with inputs.lib; filter isDerivation (attrValues plasma5Packages.kdeGear));
         };
-        users.sharedModules =
-        [{
-          config.programs =
-          {
-            obs-studio =
-            {
-              enable = true;
-              plugins = with inputs.pkgs.obs-studio-plugins;
-                [ wlrobs obs-vaapi obs-nvfbc droidcam-obs obs-vkcapture ];
-            };
-            doom-emacs = { enable = true; doomPrivateDir = ./doom.d; };
-          };
-        }];
       };
       programs = { steam.enable = true; kdeconnect.enable = true; };
     };

modules/packages/desktop/default.nix

@@ -11,14 +11,10 @@ inputs:
         packages._packages = with inputs.pkgs;
         [
           # system management
-          gparted snapper-gui libsForQt5.qtstyleplugin-kvantum wl-clipboard-x11 kio-fuse wl-mirror
+          gparted wl-clipboard-x11 kio-fuse
-          wayland-utils clinfo glxinfo vulkan-tools dracut                
+          wayland-utils clinfo glxinfo vulkan-tools dracut
           # networking
           remmina putty mtr-gui
-          # password and key management
-          bitwarden
-          # office
-          crow-translate zotero pandoc ydict logseq
           # media
           mpv nomacs
           # themes
@@ -35,6 +31,7 @@ inputs:
       };
       programs =
       {
+        adb.enable = true;
         wireshark = { enable = true; package = inputs.pkgs.wireshark; };
         firefox = { enable = true; languagePacks = [ "zh-CN" "en-US" ]; };
         vim.package = inputs.pkgs.vim-full;

modules/packages/server/default.nix

@@ -49,11 +49,6 @@ inputs:
             # development
             gdb try inputs.topInputs.plasma-manager.packages.x86_64-linux.rc2nix
           ] ++ (with inputs.config.boot.kernelPackages; [ cpupower usbip ]);
-          _pythonPackages = [(pythonPackages: with pythonPackages;
-          [
-            inquirerpy requests python-telegram-bot tqdm fastapi pypdf2 pandas matplotlib plotly gunicorn redis jinja2
-            certifi charset-normalizer idna orjson psycopg2 localPackages.eigengdb
-          ])];
         };
         users.sharedModules = [(home-inputs:
         {
@@ -181,8 +176,7 @@ inputs:
             customPkgs = with inputs.pkgs; [ zsh-nix-shell ];
           };
         };
-        command-not-found.enable = false;
+        command-not-found.enable = true;
-        adb.enable = true;
         gnupg.agent = { enable = true; enableSSHSupport = true; };
         autojump.enable = true;
         git =

modules/packages/workstation/default.nix

@@ -5,44 +5,71 @@ inputs:
       inherit (inputs.lib) mkIf;
     in mkIf (builtins.elem "workstation" inputs.config.nixos.packages._packageSets)
     {
-      nixos.packages = with inputs.pkgs;
+      nixos =
       {
-        _packages =
+        packages = with inputs.pkgs;
-        [
+        {
-          # nix tools
+          _packages =
-          nix-template appimage-run nil nixd nix-alien nix-serve node2nix nix-prefetch-github prefetch-npm-deps
+          [
-          nix-prefetch-docker pnpm-lock-export bundix
+            # password and key management
-          # instant messager
+            electrum jabref
-          zoom-us signal-desktop qq nur-xddxdd.wechat-uos slack # jail
+            # system management
-          # office
+            wl-mirror
-          libreoffice-qt texstudio poppler_utils pdftk gnuplot pdfchain
+            # nix tools
-          (texlive.combine { inherit (texlive) scheme-full; inherit (localPackages) citation-style-language; })
+            nix-template appimage-run nil nixd nix-alien nix-serve node2nix nix-prefetch-github prefetch-npm-deps
-          # development
+            nix-prefetch-docker pnpm-lock-export bundix
-          jetbrains.clion android-studio dbeaver cling clang-tools_16 ccls fprettify aircrack-ng
+            # instant messager
-          # media
+            zoom-us signal-desktop qq nur-xddxdd.wechat-uos slack inputs.config.nur.repos.linyinfeng.wemeet
-          nur-xddxdd.svp obs-studio waifu2x-converter-cpp inkscape blender
+            cinny-desktop
-          # virtualization
+            # office
-          wineWowPackages.stagingFull virt-viewer bottles # wine64
+            libreoffice-qt texstudio poppler_utils pdftk gnuplot pdfchain hdfview
-          # text editor
+            (texlive.combine { inherit (texlive) scheme-full; inherit (localPackages) citation-style-language; })
-          appflowy notion-app-enhanced joplin-desktop standardnotes
+            # development
-          # math, physics and chemistry
+            jetbrains.clion android-studio dbeaver cling clang-tools_16 ccls fprettify aircrack-ng
-          mathematica octaveFull root ovito paraview localPackages.vesta qchem.quantum-espresso
+            # media
-          localPackages.vasp localPackages.vaspkit jmol localPackages.v_sim
+            nur-xddxdd.svp obs-studio waifu2x-converter-cpp inkscape blender
-          # encryption and password management
+            # virtualization
-          john crunch hashcat
+            wineWowPackages.stagingFull virt-viewer bottles # wine64
-          # container and vm
+            # text editor
-          genymotion # davinci-resolve playonlinux
+            appflowy notion-app-enhanced joplin-desktop standardnotes logseq
-        ];
+            # math, physics and chemistry
-        _pythonPackages = [(pythonPackages: with pythonPackages;
+            mathematica octaveFull root ovito paraview localPackages.vesta qchem.quantum-espresso
-        [
+            localPackages.vasp localPackages.vaspkit jmol localPackages.v_sim
-          phonopy tensorflow keras openai scipy scikit-learn jupyterlab autograd
+            # encryption and password management
-          # localPackages.pix2tex
+            john crunch hashcat
-        ])];
+            # container and vm
-        _prebuildPackages =
+            genymotion # davinci-resolve playonlinux
-        [
+            # browser
-          httplib magic-enum xtensor boost cereal cxxopts ftxui yaml-cpp gfortran gcc10 python2
+            microsoft-edge
-          gcc13Stdenv
+            # news
-        ];
+            rssguard newsflash newsboat
+          ];
+          _pythonPackages = [(pythonPackages: with pythonPackages;
+          [
+            phonopy tensorflow keras openai scipy scikit-learn jupyterlab autograd
+            # localPackages.pix2tex
+            inquirerpy requests python-telegram-bot tqdm fastapi pypdf2 pandas matplotlib plotly gunicorn redis jinja2
+            certifi charset-normalizer idna orjson psycopg2 localPackages.eigengdb
+          ])];
+          _prebuildPackages =
+          [
+            httplib magic-enum xtensor boost cereal cxxopts ftxui yaml-cpp gfortran gcc10 python2
+            gcc13Stdenv
+          ];
+        };
+        users.sharedModules =
+        [{
+          config.programs =
+          {
+            obs-studio =
+            {
+              enable = true;
+              plugins = with inputs.pkgs.obs-studio-plugins;
+                [ wlrobs obs-vaapi obs-nvfbc droidcam-obs obs-vkcapture ];
+            };
+            doom-emacs = { enable = true; doomPrivateDir = ./doom.d; };
+          };
+        }];
       };
       programs =
       {