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

change some default settings

Browse Source
This commit is contained in:
陈浩南 2023-11-19 17:29:15 +08:00
parent 3209e0aa60
commit be8cf779c9
4 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
flake.nix
View File

@ -135,7 +135,6 @@
impermanence.enable = true; impermanence.enable = true;
networking = networking =
{ hostname = "pc"; nebula = { enable = true; lighthouse = "vps6.chn.moe"; useRelay = true; }; }; { hostname = "pc"; nebula = { enable = true; lighthouse = "vps6.chn.moe"; useRelay = true; }; };
sops = { enable = true; keyPathPrefix = "/nix/persistent"; };
}; };
hardware = hardware =
{ {
@ -159,7 +158,7 @@
}; };
services = services =
{ {
snapper = { enable = true; configs.persistent = "/nix/persistent"; }; snapper.enable = true;
fontconfig.enable = true; fontconfig.enable = true;
samba = samba =
{ {
@ -249,20 +248,15 @@
substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ]; substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
autoOptimiseStore = true; autoOptimiseStore = true;
}; };
initrd = initrd.sshd.enable = true;
{
network.enable = true;
sshd = { enable = true; hostKeys = [ "/nix/persistent/etc/ssh/initrd_ssh_host_ed25519_key" ]; };
};
kernel.patches = [ "preempt" ]; kernel.patches = [ "preempt" ];
impermanence.enable = true; impermanence.enable = true;
networking = { hostname = "vps6"; nebula.enable = true; }; networking = { hostname = "vps6"; nebula.enable = true; };
sops = { enable = true; keyPathPrefix = "/nix/persistent"; };
}; };
packages.packageSet = "server"; packages.packageSet = "server";
services = services =
{ {
snapper = { enable = true; configs.persistent = "/nix/persistent"; }; snapper.enable = true;
sshd.enable = true; sshd.enable = true;
xrayServer = { enable = true; serverName = "vps6.xserver.chn.moe"; }; xrayServer = { enable = true; serverName = "vps6.xserver.chn.moe"; };
frpServer = { enable = true; serverName = "frp.chn.moe"; }; frpServer = { enable = true; serverName = "frp.chn.moe"; };
@ -323,21 +317,16 @@
grub.installDevice = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0"; grub.installDevice = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0";
nixpkgs.march = "broadwell"; nixpkgs.march = "broadwell";
nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ]; nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
initrd = initrd.sshd.enable = true;
{
network.enable = true;
sshd = { enable = true; hostKeys = [ "/nix/persistent/etc/ssh/initrd_ssh_host_ed25519_key" ]; };
};
kernel.patches = [ "preempt" ]; kernel.patches = [ "preempt" ];
impermanence.enable = true; impermanence.enable = true;
networking = { hostname = "vps7"; nebula = { enable = true; lighthouse = "vps6.chn.moe"; }; }; networking = { hostname = "vps7"; nebula = { enable = true; lighthouse = "vps6.chn.moe"; }; };
sops = { enable = true; keyPathPrefix = "/nix/persistent"; };
gui.enable = true; gui.enable = true;
}; };
packages.packageSet = "desktop"; packages.packageSet = "desktop";
services = services =
{ {
snapper = { enable = true; configs.persistent = "/nix/persistent"; }; snapper.enable = true;
fontconfig.enable = true; fontconfig.enable = true;
sshd.enable = true; sshd.enable = true;
rsshub.enable = true; rsshub.enable = true;
@ -402,11 +391,7 @@
swap = [ "/nix/swap/swap" ]; swap = [ "/nix/swap/swap" ];
rollingRootfs = { device = "/dev/mapper/root1"; path = "/nix/rootfs"; }; rollingRootfs = { device = "/dev/mapper/root1"; path = "/nix/rootfs"; };
}; };
initrd = initrd.sshd.enable = true;
{
network.enable = true;
sshd = { enable = true; hostKeys = [ "/nix/persistent/etc/ssh/initrd_ssh_host_ed25519_key" ]; };
};
grub.installDevice = "efi"; grub.installDevice = "efi";
nixpkgs.march = "silvermont"; nixpkgs.march = "silvermont";
nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ]; nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
@ -414,14 +399,13 @@
impermanence.enable = true; impermanence.enable = true;
networking = networking =
{ hostname = "nas"; nebula = { enable = true; lighthouse = "vps6.chn.moe"; useRelay = true; }; }; { hostname = "nas"; nebula = { enable = true; lighthouse = "vps6.chn.moe"; useRelay = true; }; };
sops = { enable = true; keyPathPrefix = "/nix/persistent"; };
gui.enable = true; gui.enable = true;
}; };
hardware = { cpus = [ "intel" ]; gpus = [ "intel" ]; }; hardware = { cpus = [ "intel" ]; gpus = [ "intel" ]; };
packages.packageSet = "desktop"; packages.packageSet = "desktop";
services = services =
{ {
snapper = { enable = true; configs.persistent = "/nix/persistent"; }; snapper.enable = true;
fontconfig.enable = true; fontconfig.enable = true;
samba = samba =
{ {
@ -495,7 +479,6 @@
kernel.patches = [ "cjktty" "preempt" ]; kernel.patches = [ "cjktty" "preempt" ];
impermanence.enable = true; impermanence.enable = true;
networking.hostname = "yoga"; networking.hostname = "yoga";
sops = { enable = true; keyPathPrefix = "/nix/persistent"; };
}; };
hardware = hardware =
{ {
@ -511,7 +494,7 @@
virtualization.docker.enable = true; virtualization.docker.enable = true;
services = services =
{ {
snapper = { enable = true; configs.persistent = "/nix/persistent"; }; snapper.enable = true;
fontconfig.enable = true; fontconfig.enable = true;
sshd.enable = true; sshd.enable = true;
xrayClient = xrayClient =

2
modules/services/snapper.nix
View File

@ -3,7 +3,7 @@ inputs:
options.nixos.services.snapper = let inherit (inputs.lib) mkOption types; in options.nixos.services.snapper = let inherit (inputs.lib) mkOption types; in
{ {
enable = mkOption { type = types.bool; default = false; }; enable = mkOption { type = types.bool; default = false; };
configs = mkOption { type = types.attrsOf types.nonEmptyStr; default = {}; }; configs = mkOption { type = types.attrsOf types.nonEmptyStr; default.persistent = "/nix/persistent"; };
}; };
config = config =
let let

31
modules/system/initrd.nix
View File

@ -2,23 +2,32 @@ inputs:
{ {
options.nixos.system.initrd = let inherit (inputs.lib) mkOption types; in options.nixos.system.initrd = let inherit (inputs.lib) mkOption types; in
{ {
network.enable = mkOption { type = types.bool; default = false; };
sshd = sshd =
{ {
enable = mkOption { type = types.bool; default = false; }; enable = mkOption { type = types.bool; default = false; };
hostKeys = mkOption { type = types.listOf types.nonEmptyStr; default = []; }; hostKeys = mkOption
{
type = types.listOf types.nonEmptyStr;
default = [ "/nix/persistent/etc/ssh/initrd_ssh_host_ed25519_key" ];
};
}; };
}; };
config = config =
let let
inherit (inputs.config.nixos.system) initrd; inherit (inputs.config.nixos.system) initrd;
in { boot = inherit (inputs.lib) mkIf mkMerge;
{ in mkMerge
initrd = [
{ { boot.initrd.systemd.enable = true; }
systemd.enable = true; (
network = { enable = initrd.network.enable; ssh = { enable = true; hostKeys = initrd.sshd.hostKeys; }; }; mkIf (initrd.sshd.enable)
}; {
kernelParams = if initrd.network.enable then [ "ip=dhcp" ] else []; boot =
};}; {
initrd.network = { enable = true; ssh = { enable = true; hostKeys = initrd.sshd.hostKeys; }; };
kernelParams = [ "ip=dhcp" ];
};
}
)
];
} }

4
modules/system/sops.nix
View File

@ -2,8 +2,8 @@ inputs:
{ {
options.nixos.system.sops = let inherit (inputs.lib) mkOption types; in options.nixos.system.sops = let inherit (inputs.lib) mkOption types; in
{ {
enable = mkOption { type = types.bool; default = false; }; enable = mkOption { type = types.bool; default = true; };
keyPathPrefix = mkOption { type = types.str; default = ""; }; keyPathPrefix = mkOption { type = types.str; default = "/nix/persistent"; };
}; };
config = config =
let let