diff --git a/modules/packages/desktop-fat/default.nix b/modules/packages/desktop-fat/default.nix index 46b048db..87f4313b 100644 --- a/modules/packages/desktop-fat/default.nix +++ b/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 - cinny-desktop # nur-xddxdd.wine-wechat thunder + element-desktop telegram-desktop discord # native # 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; }; }; diff --git a/modules/packages/desktop/default.nix b/modules/packages/desktop/default.nix index 141db558..bf71f88f 100644 --- a/modules/packages/desktop/default.nix +++ b/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 - wayland-utils clinfo glxinfo vulkan-tools dracut + gparted wl-clipboard-x11 kio-fuse + 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; diff --git a/modules/packages/server/default.nix b/modules/packages/server/default.nix index 6dfc3116..92fd23cf 100644 --- a/modules/packages/server/default.nix +++ b/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: { @@ -182,7 +177,6 @@ inputs: }; }; command-not-found.enable = false; - adb.enable = true; gnupg.agent = { enable = true; enableSSHSupport = true; }; autojump.enable = true; git = diff --git a/modules/packages/workstation/default.nix b/modules/packages/workstation/default.nix index 63779162..272761a5 100644 --- a/modules/packages/workstation/default.nix +++ b/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 = - [ - # nix tools - nix-template appimage-run nil nixd nix-alien nix-serve node2nix nix-prefetch-github prefetch-npm-deps - nix-prefetch-docker pnpm-lock-export bundix - # instant messager - zoom-us signal-desktop qq nur-xddxdd.wechat-uos slack # jail - # office - libreoffice-qt texstudio poppler_utils pdftk gnuplot pdfchain - (texlive.combine { inherit (texlive) scheme-full; inherit (localPackages) citation-style-language; }) - # development - jetbrains.clion android-studio dbeaver cling clang-tools_16 ccls fprettify aircrack-ng - # media - nur-xddxdd.svp obs-studio waifu2x-converter-cpp inkscape blender - # virtualization - wineWowPackages.stagingFull virt-viewer bottles # wine64 - # text editor - appflowy notion-app-enhanced joplin-desktop standardnotes - # math, physics and chemistry - mathematica octaveFull root ovito paraview localPackages.vesta qchem.quantum-espresso - localPackages.vasp localPackages.vaspkit jmol localPackages.v_sim - # encryption and password management - john crunch hashcat - # container and vm - genymotion # davinci-resolve playonlinux - ]; - _pythonPackages = [(pythonPackages: with pythonPackages; - [ - phonopy tensorflow keras openai scipy scikit-learn jupyterlab autograd - # localPackages.pix2tex - ])]; - _prebuildPackages = - [ - httplib magic-enum xtensor boost cereal cxxopts ftxui yaml-cpp gfortran gcc10 python2 - gcc13Stdenv - ]; + packages = with inputs.pkgs; + { + _packages = + [ + # password and key management + electrum jabref + # system management + wl-mirror + # nix tools + nix-template appimage-run nil nixd nix-alien nix-serve node2nix nix-prefetch-github prefetch-npm-deps + nix-prefetch-docker pnpm-lock-export bundix + # instant messager + zoom-us signal-desktop qq nur-xddxdd.wechat-uos slack inputs.config.nur.repos.linyinfeng.wemeet + cinny-desktop + # office + libreoffice-qt texstudio poppler_utils pdftk gnuplot pdfchain hdfview + (texlive.combine { inherit (texlive) scheme-full; inherit (localPackages) citation-style-language; }) + # development + jetbrains.clion android-studio dbeaver cling clang-tools_16 ccls fprettify aircrack-ng + # media + nur-xddxdd.svp obs-studio waifu2x-converter-cpp inkscape blender + # virtualization + wineWowPackages.stagingFull virt-viewer bottles # wine64 + # text editor + appflowy notion-app-enhanced joplin-desktop standardnotes logseq + # math, physics and chemistry + mathematica octaveFull root ovito paraview localPackages.vesta qchem.quantum-espresso + localPackages.vasp localPackages.vaspkit jmol localPackages.v_sim + # encryption and password management + john crunch hashcat + # container and vm + genymotion # davinci-resolve playonlinux + # browser + microsoft-edge + # 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 = { diff --git a/modules/packages/desktop-fat/doom.d/config.el b/modules/packages/workstation/doom.d/config.el similarity index 100% rename from modules/packages/desktop-fat/doom.d/config.el rename to modules/packages/workstation/doom.d/config.el diff --git a/modules/packages/desktop-fat/doom.d/init.el b/modules/packages/workstation/doom.d/init.el similarity index 100% rename from modules/packages/desktop-fat/doom.d/init.el rename to modules/packages/workstation/doom.d/init.el diff --git a/modules/packages/desktop-fat/doom.d/packages.el b/modules/packages/workstation/doom.d/packages.el similarity index 100% rename from modules/packages/desktop-fat/doom.d/packages.el rename to modules/packages/workstation/doom.d/packages.el