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

Merge branch 'production' into next

Browse Source
This commit is contained in:
陈浩南
2025-04-29 21:10:43 +08:00
parent 910fcaf669 700b058620
commit 1fe989f3e7
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
devices/cross/luks-manual/default.nix
View File

@@ -3,9 +3,8 @@ let devices =
{
nas =
{
"/dev/disk/by-uuid/a47f06e1-dc90-40a4-89ea-7c74226a5449".mapper = "root3";
"/dev/disk/by-uuid/b3408fb5-68de-405b-9587-5e6fbd459ea2".mapper = "root4";
"/dev/disk/by-uuid/a779198f-cce9-4c3d-a64a-9ec45f6f5495" = { mapper = "nix"; ssd = true; };
"/dev/disk/by-partlabel/nas-root3".mapper = "root3";
"/dev/disk/by-partlabel/nas-root4".mapper = "root4";
};
vps6."/dev/disk/by-uuid/961d75f0-b4ad-4591-a225-37b385131060" = { mapper = "root"; ssd = true; };
vps7."/dev/disk/by-uuid/db48c8de-bcf7-43ae-a977-60c4f390d5c4" = { mapper = "root"; ssd = true; };

15
devices/nas/default.nix
View File

@@ -12,25 +12,14 @@ inputs:
mount =
{
vfat."/dev/disk/by-uuid/627D-1FAA" = "/boot";
btrfs =
{
"/dev/mapper/nix"."/nix" = "/nix";
"/dev/mapper/root3" =
{
"/nix/rootfs" = "/nix/rootfs";
"/nix/persistent" = "/nix/persistent";
"/nix/nodatacow" = "/nix/nodatacow";
"/nix/rootfs/current" = "/";
"/nix/backup" = "/nix/backup";
};
};
btrfs."/dev/mapper/root3" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
};
swap = [ "/nix/swap/swap" ];
rollingRootfs.waitDevices = [ "/dev/mapper/root4" ];
};
initrd.sshd = {};
nixpkgs.march = "silvermont";
nix.substituters = [ "https://nix-store.pc.chn.moe" ];
nix.substituters = [ "https://nix-store.pc.chn.moe?want-mass-query=true" ];
networking = {};
};
hardware = { cpus = [ "intel" ]; gpu.type = "intel"; };

3
modules/system/nix.nix
View File

@@ -4,7 +4,8 @@ inputs:
{
# marches allowed to be compiled on this machine
marches = mkOption { type = types.nullOr (types.listOf types.nonEmptyStr); default = null; };
substituters = mkOption { type = types.listOf types.nonEmptyStr; default = [ "https://nix-store.chn.moe" ]; };
substituters = mkOption
{ type = types.listOf types.nonEmptyStr; default = [ "https://nix-store.chn.moe?want-mass-query=true" ]; };
remote =
{
slave =