Skip to content

Commit

Permalink
hosts/zatsune-nixos: use oci-common where possible
Browse files Browse the repository at this point in the history
  • Loading branch information
thiagokokada committed Nov 24, 2023
1 parent a9fe998 commit 8d76c40
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions hosts/zatsune-nixos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,20 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).

{ flake, ... }:
{ modulesPath, flake, config, lib, pkgs, ... }:

let
oci-common = import "${modulesPath}/virtualisation/oci-common.nix" { inherit config lib pkgs; };
in
{
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
../../nixos
flake.inputs.disko.nixosModules.disko
];
] ++ oci-common.imports;

boot.kernelParams = [
"nvme.shutdown_timeout=10"
"nvme_core.shutdown_timeout=10"
"libiscsi.debug_libiscsi_eh=1"
"crash_kexec_post_notifiers"

# VNC console
"console=tty1"

# x86_64-linux
"console=ttyS0"

# aarch64-linux
"console=ttyAMA0,115200"
];
boot = { inherit (oci-common.boot) kernelParams; };

disko.devices = import ./disk-config.nix;

Expand Down Expand Up @@ -58,5 +47,8 @@
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

networking.hostName = "zatsune-nixos";
networking = {
inherit (oci-common.networking) timeServers;
hostName = "zatsune-nixos";
};
}

0 comments on commit 8d76c40

Please sign in to comment.