From 2ec4213eb6c1a2f6f4c4f33c421d66f891d9591b Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 14 Apr 2020 12:12:13 +0530 Subject: [PATCH] Add Nixos module to flake, make check pass --- flake.nix | 7 +++++-- hosts/server7/default.nix | 5 +++++ hosts/server7/hardware-configuration.nix | 10 ---------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index b5aa89eb..ec1e9ff4 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,13 @@ edition = 201909; outputs = { self, nixpkgs }: { + nixosConfigurations.server7 = nixpkgs.lib.nixosSystem { - modules = - [ ./hosts/server7 ]; + modules = [ ./hosts/server7 ]; system = "x86_64-linux"; }; + + nixosModules.c3d2 = import ./lib; + }; } diff --git a/hosts/server7/default.nix b/hosts/server7/default.nix index 1ef1a4e4..663db6bf 100644 --- a/hosts/server7/default.nix +++ b/hosts/server7/default.nix @@ -13,6 +13,11 @@ in { ./nix-serve.nix ]; + security.acme = { + email = " mail@c3d2.de"; + acceptTerms = true; + }; + c3d2 = { users = { emery = true; diff --git a/hosts/server7/hardware-configuration.nix b/hosts/server7/hardware-configuration.nix index 46c05dfc..e198467f 100644 --- a/hosts/server7/hardware-configuration.nix +++ b/hosts/server7/hardware-configuration.nix @@ -163,16 +163,6 @@ fsType = "zfs"; }; - fileSystems."/nvme0n1/c3d2.de/admin" = { - device = "nvme0n1/c3d2.de/admin"; - fsType = "zfs"; - }; - - fileSystems."/nvme0n1/c3d2.de/templates" = { - device = "nvme0n1/c3d2.de/templates"; - fsType = "zfs"; - }; - fileSystems."/nvme0n1/c3d2.de/iso" = { device = "nvme0n1/c3d2.de/iso"; fsType = "zfs";