chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 04:59:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
陈浩南
2023-08-20 23:44:15 +08:00
parent 5f6db7ee9b
commit cb0363c439
2 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@@ -526,11 +526,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1692447429,
"narHash": "sha256-nKtgrXrRFCfU7gQcWlf8d0r985a6Y0aN8Eym7+tr5bU=",
"lastModified": 1692546204,
"narHash": "sha256-RaXp7mQKpvGFnfcBCl7RwT94CAExXZkZuEg6hxz6VEE=",
"owner": "CHN-beta",
"repo": "nixpkgs",
"rev": "08077df82a6c25abf59d31a5e1a810668f243537",
"rev": "e692927818ad07921ad94d973d1b76214b2be84d",
"type": "github"
},
"original": {

73
modules/packages/default.nix
View File

@@ -58,11 +58,9 @@ inputs:
# networking
ipset iptables iproute2 dig nettools traceroute tcping-go whois tcpdump nmap inetutils
# nix tools
nix-output-monitor pnpm-lock-export
# development
clang-tools_16 ccls fprettify
nix-output-monitor
# office
todo-txt-cli pandoc pdfchain
todo-txt-cli
] ++ (with inputs.config.boot.kernelPackages; [ cpupower usbip ]);
};
programs =
@@ -115,12 +113,10 @@ inputs:
gparted snapper-gui libsForQt5.qtstyleplugin-kvantum wl-clipboard-x11 kio-fuse wl-mirror
wayland-utils clinfo glxinfo vulkan-tools dracut etcher
# nix tools
nix-template appimage-run nil nixd nix-alien ssh-to-age nix-serve node2nix nix-prefetch-github
prefetch-npm-deps nix-prefetch-docker deploy-rs.deploy-rs
ssh-to-age deploy-rs.deploy-rs
# instant messager
element-desktop telegram-desktop discord qq nur-xddxdd.wechat-uos # jail
inputs.config.nur.repos.linyinfeng.wemeet # native # nur-xddxdd.wine-wechat thunder
zoom-us signal-desktop cinny-desktop
element-desktop telegram-desktop discord inputs.config.nur.repos.linyinfeng.wemeet # native
cinny-desktop # nur-xddxdd.wine-wechat thunder
# browser
google-chrome
# networking
@@ -130,23 +126,18 @@ inputs:
# download
qbittorrent yt-dlp nur-xddxdd.baidupcs-go wgetpaste
# office
crow-translate libreoffice-qt zotero texlive.combined.scheme-full texstudio gnuplot poppler_utils pdftk
crow-translate zotero pandoc
# development
scrcpy jetbrains.clion android-studio dbeaver cling
scrcpy
# media
nur-xddxdd.svp spotify yesplaymusic mpv nomacs simplescreenrecorder obs-studio imagemagick gimp
netease-cloud-music-gtk waifu2x-converter-cpp inkscape blender
# virtualization
wine virt-viewer bottles # wine64
spotify yesplaymusic mpv nomacs simplescreenrecorder imagemagick gimp netease-cloud-music-gtk
# text editor
localPackages.typora appflowy notion-app-enhanced joplin-desktop standardnotes
# math, physics and chemistry
octave root ovito paraview localPackages.vesta qchem.quantum-espresso # vsim
localPackages.typora
# themes
orchis-theme tela-circle-icon-theme plasma-overdose-kde-theme materia-kde-theme graphite-kde-theme
arc-kde-theme materia-theme
# news
fluent-reader newsflash rssguard newsboat
fluent-reader rssguard
# davinci-resolve playonlinux
(
vscode-with-extensions.override
@@ -182,20 +173,15 @@ inputs:
] ++ (with inputs.lib; filter isDerivation (attrValues plasma5Packages.kdeGear));
_pythonPackages = [(pythonPackages: with pythonPackages;
[
phonopy inquirerpy requests tensorflow keras python-telegram-bot tqdm
fastapi pypdf2 pandas openai matplotlib scipy plotly gunicorn scikit-learn redis jinja2
inquirerpy requests python-telegram-bot tqdm fastapi pypdf2 pandas matplotlib plotly gunicorn redis jinja2
])];
_prebuildPackages = [ httplib magic-enum xtensor boost cereal cxxopts ftxui yaml-cpp gfortran gcc10 python2 ];
};
programs =
{
anime-game-launcher.enable = true;
honkers-railway-launcher.enable = true;
steam.enable = true;
kdeconnect.enable = true;
wireshark = { enable = true; package = inputs.pkgs.wireshark; };
firefox = { enable = true; languagePacks = [ "zh-CN" "en-US" ]; };
nix-ld.enable = true;
};
nixpkgs.config.packageOverrides = pkgs:
{
@@ -211,7 +197,42 @@ inputs:
(
mkIf (inputs.config.nixos.packages.packageSet == "workstation")
{
nixos.packages._packages = with inputs.pkgs; [ mathematica ];
nixos.packages = with inputs.pkgs;
{
_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
# instant messager
zoom-us signal-desktop qq nur-xddxdd.wechat-uos # jail
# office
libreoffice-qt texlive.combined.scheme-full texstudio poppler_utils pdftk gnuplot pdfchain
# development
jetbrains.clion android-studio dbeaver cling clang-tools_16 ccls fprettify
# media
nur-xddxdd.svp obs-studio waifu2x-converter-cpp inkscape blender
# virtualization
wine virt-viewer bottles # wine64
# text editor
appflowy notion-app-enhanced joplin-desktop standardnotes
# math, physics and chemistry
mathematica octave root ovito paraview localPackages.vesta qchem.quantum-espresso # vsim
# news
newsflash newsboat
];
_pythonPackages = [(pythonPackages: with pythonPackages;
[
phonopy tensorflow keras openai scipy scikit-learn
])];
_prebuildPackages = [ httplib magic-enum xtensor boost cereal cxxopts ftxui yaml-cpp gfortran gcc10 python2 ];
};
programs =
{
anime-game-launcher.enable = true;
honkers-railway-launcher.enable = true;
nix-ld.enable = true;
};
}
)
# apply package configs