NASP/NixOS-Config
35
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: g18-next ok

Browse Source
This commit is contained in:
Dict Xiong 2024-06-18 00:29:22 +08:00
parent 21cda95000
commit 94ccff2d72
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -22,6 +22,7 @@
"g13" "g13"
"g14" "g14"
"g17" "g17"
"g18-next"
]; ];
in in
{ {

6
hosts/g18-next/configuration.nix
View File

@ -16,12 +16,16 @@
nginx.enableCodeServer = false; nginx.enableCodeServer = false;
nvidia.enable = false; nvidia.enable = false;
}; };
boot.loader.systemd-boot.enable = lib.mkForce false;
boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";
networking.hostName = lib.mkForce "g18-next"; networking.hostName = lib.mkForce "g18-next";
networking.hostId = "11f1fad0"; networking.hostId = "11f1fad0";
systemd.network.networks."10-veth0" = { systemd.network.networks."10-veth0" = {
matchConfig.Name = "enp1s0"; matchConfig.Name = "enp1s0";
networkConfig = { networkConfig = {
DHCP = "yes"; DHCP = "no";
IPv6AcceptRA = true; IPv6AcceptRA = true;
}; };
address = [ "192.168.122.118/24" ]; address = [ "192.168.122.118/24" ];

5
hosts/g18-next/hardware-configuration.nix
View File

@ -24,6 +24,11 @@
options = [ "fmask=0022" "dmask=0022" ]; options = [ "fmask=0022" "dmask=0022" ];
}; };
fileSystems."/data0" =
{ device = "192.168.122.1:/data0";
fsType = "nfs";
};
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/ba441743-a8b0-4f0c-af9c-294ca4526350"; } [ { device = "/dev/disk/by-uuid/ba441743-a8b0-4f0c-af9c-294ca4526350"; }
]; ];

9
hosts/modules/nasp.nix
View File

@ -353,8 +353,7 @@ in
}; };
}) })
# g series # g series
(lib.mkIf (gCfg.enable) (let (lib.mkIf (gCfg.enable) {
ipSuffix = (builtins.toString (gCfg.serial + 100)); in {
## network ## network
networking.hostName = assert (gCfg.serial > 0); "g" + (builtins.toString gCfg.serial); networking.hostName = assert (gCfg.serial > 0); "g" + (builtins.toString gCfg.serial);
networking.search = [ "nasp" ]; networking.search = [ "nasp" ];
@ -404,7 +403,7 @@ in
enable = true; enable = true;
servers = [ "192.168.16.118" ]; servers = [ "192.168.16.118" ];
}; };
})) })
(lib.mkIf (gCfg.enable && gCfg.eth0Name != "") { (lib.mkIf (gCfg.enable && gCfg.eth0Name != "") {
systemd.network.networks."10-eth0" = { systemd.network.networks."10-eth0" = {
matchConfig.Name = gCfg.eth0Name; matchConfig.Name = gCfg.eth0Name;
@ -412,7 +411,7 @@ in
DHCP = "no"; DHCP = "no";
IPv6AcceptRA = true; IPv6AcceptRA = true;
}; };
address = [ "192.168.16.${ipSuffix}/24" ]; address = [ "192.168.16.${builtins.toString (gCfg.serial + 100)}/24" ];
routes = [ routes = [
{ {
routeConfig = { routeConfig = {
@ -445,7 +444,7 @@ in
(lib.mkIf (gCfg.enable && gCfg.eth2Name != "") { (lib.mkIf (gCfg.enable && gCfg.eth2Name != "") {
systemd.network.networks."10-eth2" = { systemd.network.networks."10-eth2" = {
matchConfig.Name = gCfg.eth2Name; matchConfig.Name = gCfg.eth2Name;
address = [ "12.12.12.${ipSuffix}/24" ]; address = [ "12.12.12.${builtins.toString (gCfg.serial + 100)}/24" ];
linkConfig.RequiredForOnline = "no"; linkConfig.RequiredForOnline = "no";
}; };
networking.rxe = { networking.rxe = {