From 13090dd594ca1ce16f7b17c2b2cfbb17aff0d84a Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Wed, 2 Aug 2023 17:03:35 +0000 Subject: [PATCH] Add beatific module to catacomb --- flake.nix | 5 ++++- machine/catacomb/default.nix | 12 ++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 5f8ae7c..a29983e 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,10 @@ }; catacomb = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; - modules = [ ./machine/catacomb ]; + modules = [ + self.nixosModules.beatific + ./machine/catacomb + ]; }; empyrean = nixpkgs-next.lib.nixosSystem { system = "x86_64-linux"; diff --git a/machine/catacomb/default.nix b/machine/catacomb/default.nix index 3c295e6..e576830 100644 --- a/machine/catacomb/default.nix +++ b/machine/catacomb/default.nix @@ -8,6 +8,16 @@ in { ./fileserver.nix ]; + beatific.hostName = "catacomb"; + beatific.defaults = { + time = false; + i18n = false; + programs = false; + ssh = false; + nebula = false; + tvb = false; + }; + boot = { loader = { # Use the extlinux boot loader. (NixOS wants to enable GRUB by default) @@ -46,7 +56,6 @@ in { ]; networking = { - hostName = "catacomb"; hostId = "beeeeee5"; firewall = { enable = true; @@ -208,5 +217,4 @@ in { }; nix.settings.cores = 4; - nix.extraOptions = "experimental-features = nix-command flakes"; }