Compare commits

..

2 Commits

Author SHA1 Message Date
5c0abba619 feat(g2): mount /home2 on boot 2024-05-28 00:06:28 +08:00
0e89a2be01 feat(g2): enable zfs 2024-05-27 23:53:06 +08:00
3 changed files with 23 additions and 2 deletions

View File

@ -7,5 +7,8 @@
../modules/nasp.nix ../modules/nasp.nix
]; ];
nasp.serial = 2; nasp.serial = 2;
boot.supportedFilesystems = [ "zfs" ];
boot.zfs.forceImportRoot = false;
networking.hostId = "b500d22c";
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }

View File

@ -23,6 +23,12 @@
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/home2" =
{ device = "home2";
fsType = "zfs";
neededForBoot = false;
};
swapDevices = [ swapDevices = [
{ {
device = "/.swapfile"; device = "/.swapfile";

View File

@ -37,9 +37,12 @@ in
}; };
time.timeZone = lib.mkDefault "Asia/Shanghai"; time.timeZone = lib.mkDefault "Asia/Shanghai";
## networking ## networking
networking.nameservers = [ "192.168.16.118" ];
services.resolved.enable = true;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.interfaces = { networking.interfaces = {
eno1.wakeOnLan.enable = true; eno1.wakeOnLan.enable = true;
eno1.useDHCP = true;
eno1.ipv4 = { eno1.ipv4 = {
addresses = [ addresses = [
{ {
@ -52,9 +55,18 @@ in
address = "0.0.0.0"; address = "0.0.0.0";
prefixLength = 0; prefixLength = 0;
via = "192.168.16.118"; via = "192.168.16.118";
options = { metric = "90"; };
} }
]; ];
}; };
eno1.ipv6.routes = [
{
address = "::";
prefixLength = 0;
via = "fe80::2eea:7fff:feec:4689";
options = { metric = "90"; };
}
];
enp2s0np0.ipv4.addresses = [ enp2s0np0.ipv4.addresses = [
{ {
address = "12.12.12.${ipSuffix}"; address = "12.12.12.${ipSuffix}";
@ -98,7 +110,7 @@ in
## packages and services ## packages and services
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
bash cmake curl file fzf gcc git gnumake htop inetutils iproute2 iputils less man nettools bash cmake curl file fzf gcc git gnumake htop nettools inetutils iproute2 iputils less man
openssh openssl python3 rdma-core sops sudo tmux util-linux vim wget zsh openssh openssl python3 rdma-core sops sudo tmux util-linux vim wget zsh
# extended # extended
acpi atop btop dialog dig dmidecode dos2unix ethtool fish iftop iotop killall lshw lsof acpi atop btop dialog dig dmidecode dos2unix ethtool fish iftop iotop killall lshw lsof