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

修正一部分错误

Browse Source
This commit is contained in:
陈浩南
2023-07-28 20:15:49 +08:00
parent dca603a583
commit 3dcf316310
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@@ -224,7 +224,7 @@
# 增加 impermanence
# 增加 initrd 中的网络
# 使用 yubikey 解锁
"vps6.chn.moe" = inputs.nixpkgs.lib.nixosSystem
"vps6" = inputs.nixpkgs.lib.nixosSystem
{
system = "x86_64-linux";
specialArgs = { topInputs = inputs; inherit localLib; };
@@ -253,7 +253,7 @@
packageSet = "server";
};
boot.grub.installDevice = "/dev/disk/by-path/pci-0000:05:00.0";
system.hostname = "vps6.chn.moe";
system.hostname = "vps6";
};})
];
};

36
modules/fileSystems/default.nix
View File

@@ -5,25 +5,39 @@ inputs:
mount =
{
# device = mountPoint;
vfat = mkOption { type = types.attrsOf types.nonEmptyStr; };
vfat = mkOption { type = types.attrsOf types.nonEmptyStr; default = {}; };
# device.subvol = mountPoint;
btrfs = mkOption { type = types.attrsOf (types.attrsOf types.nonEmptyStr); };
btrfs = mkOption { type = types.attrsOf (types.attrsOf types.nonEmptyStr); default = {}; };
};
decrypt.auto = mkOption { type = types.attrsOf (types.submodule { options =
{
mapper = mkOption { type = types.nonEmptyStr; };
ssd = mkOption { type = types.bool; default = false; };
before = mkOption { type = types.nullOr (types.listOf types.nonEmptyStr); default = null; };
}; }); };
mdadm = mkOption { type = types.nullOr types.str; };
swap = mkOption { type = types.listOf types.nonEmptyStr; };
resume = mkOption { type = types.nullOr (types.str or (types.submodule { options =
{ device = mkOption { type = types.nonEmptyStr; }; offset = mkOption { type = types.ints.unsigned; }; }; })); };
rollingRootfs = mkOption { type = types.nullOr (types.submodule { options =
}; }); default = {}; };
mdadm = mkOption { type = types.nullOr types.str; default = null; };
swap = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
resume = mkOption
{
device = mkOption { type = types.nonEmptyStr; };
path = mkOption { type = types.nonEmptyStr; };
}; }); };
type = types.nullOr (types.str or (types.submodule
{
options =
{
device = mkOption { type = types.nonEmptyStr; };
offset = mkOption { type = types.ints.unsigned; };
};
}));
default = null;
};
rollingRootfs = mkOption
{
type = types.nullOr (types.submodule { options =
{
device = mkOption { type = types.nonEmptyStr; };
path = mkOption { type = types.nonEmptyStr; };
}; });
default = null;
};
};
config =
let