Compare commits

..

No commits in common. "5c0abba6199efa3f5b63df6625b1d4f91c5daa6c" and "533bf6fe025e3341c94adf7dd17659b1502ff7f4" have entirely different histories.

3 changed files with 2 additions and 23 deletions

View File

@ -7,8 +7,5 @@
../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,12 +23,6 @@
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/home2" =
{ device = "home2";
fsType = "zfs";
neededForBoot = false;
};
swapDevices = [ swapDevices = [
{ {
device = "/.swapfile"; device = "/.swapfile";

View File

@ -37,12 +37,9 @@ 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 = [
{ {
@ -55,18 +52,9 @@ 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}";
@ -110,7 +98,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 nettools inetutils iproute2 iputils less man bash cmake curl file fzf gcc git gnumake htop inetutils iproute2 iputils less man nettools
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