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

Merge branch 'unstable' into edge

Browse Source
This commit is contained in:
陈浩南
2025-09-25 13:26:18 +08:00
parent f227e862f5 3143b2f3a4
commit 9899f0bb07
18 changed files with 223 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/default.nix
View File

@@ -14,8 +14,6 @@ inputs: let inherit (inputs) topInputs; in
topInputs.nixvirt.nixosModules.default
topInputs.niri.nixosModules.niri
{ config.niri-flake.cache.enable = false; }
# TODO: Remove after next release
"${topInputs.nixpkgs-unstable}/nixos/modules/services/hardware/lact.nix"
(inputs:
{
config =

12
modules/packages/desktop.nix
View File

@@ -59,12 +59,7 @@ inputs:
pkgs-2311.gnuplot
# math, physics and chemistry
octaveFull ovito localPackages.vesta localPackages.v-sim jmol mpi geogebra6 localPackages.ufo
(quantum-espresso.override
{
stdenv = gcc14Stdenv;
gfortran = gfortran14;
wannier90 = wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; };
})
(quantum-espresso.override { stdenv = gcc14Stdenv; gfortran = gfortran14; })
pkgs-2311.hdfview numbat qalculate-qt
# virtualization
virt-viewer bottles wineWowPackages.stagingFull genymotion playonlinux
@@ -78,10 +73,7 @@ inputs:
++ (builtins.filter (p: !((p.meta.broken or false) || (builtins.elem p.pname or null [ "falkon" "kalzium" ])))
(builtins.filter inputs.lib.isDerivation (builtins.attrValues kdePackages.kdeGear)));
_pythonPackages = [(pythonPackages: with pythonPackages;
[
phonopy scipy scikit-learn jupyterlab autograd inputs.pkgs.localPackages.phono3py
tensorflow keras numpy
])];
[ phonopy scipy scikit-learn jupyterlab autograd inputs.pkgs.localPackages.phono3py numpy ])];
};
user.sharedModules =
[{

2
modules/packages/root.nix
View File

@@ -12,7 +12,7 @@ inputs:
displayName = "ROOT";
language = "c++";
argv = [ "/run/current-system/sw/bin/python3" "-m" "JupyROOT.kernel.rootkernel" "-f" "{connection_file}" ];
logo64 = "${root}/etc/root/notebook/kernels/root/logo-64x64.png";
logo64 = "${root}/etc/notebook/kernels/root/logo-64x64.png";
logo32 = inputs.pkgs.runCommand "logo-32x32.png" {}
"${inputs.pkgs.imagemagick}/bin/convert ${logo64} -resize 32x32 $out";
};};

1
modules/services/gitea.nix
View File

@@ -56,7 +56,6 @@ inputs:
"cron.git_gc_repos" = { ENABLED = true; SCHEDULE = "@monthly"; TIMEOUT = "2h"; };
"cron.gc_lfs" = { ENABLED = true; SCHEDULE = "@monthly"; NUMBER_TO_CHECK_PER_REPO = 0; };
};
package = inputs.pkgs.pkgs-unstable.gitea;
};
anubis.instances.gitea.settings =
{

1
modules/services/nginx/default.nix
View File

@@ -55,7 +55,6 @@ inputs:
client_body_timeout 1h;
'';
proxyTimeout = "1d";
recommendedZstdSettings = true;
recommendedTlsSettings = true;
# do not set Host header
recommendedProxySettings = false;

1
modules/services/podman.nix
View File

@@ -18,6 +18,7 @@ inputs:
dockerCompat = true;
# Required for containers under podman-compose to be able to talk to each other.
defaultNetwork.settings.dns_enabled = true;
extraPackages = [ inputs.pkgs.nftables ];
};
};
hardware.nvidia-container-toolkit.enable = inputs.lib.mkIf (inputs.config.nixos.system.nixpkgs.cuda != null) true;

48
modules/system/fileSystems/cluster.nix
View File

@@ -11,29 +11,35 @@ inputs:
config = inputs.lib.mkMerge
[
# 将一部分由 home-manager 生成软链接的文件改为直接挂载，以兼容集群的设置
(let files = [ ".zshrc" ".zshenv" ".profile" ".bashrc" ".bash_profile" ".zlogin" ]; in
{
home-manager.users = builtins.listToAttrs (builtins.map
(user:
{
name = user;
value.config.home.file =
builtins.listToAttrs (builtins.map (file: { name = file; value.enable = false; }) files);
})
inputs.config.nixos.user.users);
systemd.mounts = builtins.concatLists (builtins.map
(user: builtins.map
(file:
(
let files = user:
[
"/home/${user}/.zshrc" "/home/${user}/.zshenv" "/home/${user}/.zlogin"
".profile" ".bashrc" ".bash_profile"
];
in
{
home-manager.users = builtins.listToAttrs (builtins.map
(user: inputs.lib.nameValuePair user
{
what = "${inputs.config.home-manager.users.${user}.home.file.${file}.source}";
where = "/home/${user}/${file}";
options = "bind";
wantedBy = [ "local-fs.target" ];
config.home.file = builtins.listToAttrs (builtins.map
(file: inputs.lib.nameValuePair "${file}" { enable = false; }) (files user));
})
files
)
inputs.config.nixos.user.users);
})
inputs.config.nixos.user.users);
systemd.mounts = builtins.concatLists (builtins.map
(user: builtins.map
(file:
{
what = "${inputs.config.home-manager.users.${user}.home.file.${file}.source}";
where = "/home/${user}/${file}";
options = "bind";
wantedBy = [ "local-fs.target" ];
})
(files user)
)
inputs.config.nixos.user.users);
}
)
(
let
fsCluster = inputs.config.nixos.system.fileSystems.cluster;

21
modules/system/gui.nix
View File

@@ -43,17 +43,22 @@ inputs:
programs.dconf.enable = true;
nixos.user.sharedModules = [(hmInputs:
{
config.gtk =
config =
{
enable = true;
theme.name = "Breeze";
gtk2 =
gtk =
{
extraConfig = ''gtk-im-module="fcitx"'';
configLocation = "${hmInputs.config.xdg.configHome}/gtk-2.0/gtkrc";
enable = true;
theme.name = "Breeze";
gtk2 =
{
extraConfig = ''gtk-im-module="fcitx"'';
configLocation = "${hmInputs.config.xdg.configHome}/gtk-2.0/gtkrc";
};
gtk3.extraConfig.gtk-im-module = "fcitx";
gtk4.extraConfig.gtk-im-module = "fcitx";
};
gtk3.extraConfig.gtk-im-module = "fcitx";
gtk4.extraConfig.gtk-im-module = "fcitx";
# TODO: infinite recursion
# home.file."${hmInputs.config.gtk.gtk2.configLocation}".force = true;
};
})];
})

10
modules/system/systemd.nix
View File

@@ -6,11 +6,11 @@ inputs:
services.journald.extraConfig = "MaxRetentionSec=7d";
systemd =
{
extraConfig =
''
DefaultTimeoutStopSec=10s
DefaultLimitNOFILE=1048576:1048576
'';
settings.Manager =
{
DefaultTimeoutStopSec = "10s";
DefaultLimitNOFILE = "1048576:1048576";
};
user.extraConfig = "DefaultTimeoutStopSec=10s";
services =
{