From a17c8f44d4e7dd55fd2de96e4ee9de46ea0c398c Mon Sep 17 00:00:00 2001 From: randomuser Date: Sat, 8 Jul 2023 14:22:13 -0500 Subject: [PATCH] push changes --- configuration.nix | 2 +- mail.nix | 6 +++--- netbox.nix | 5 ++--- virtbox.nix | 5 ++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/configuration.nix b/configuration.nix index 15bc4a2..fe6fb95 100644 --- a/configuration.nix +++ b/configuration.nix @@ -41,7 +41,7 @@ in services.virtbox.enable = true; }; - test = lib.mkIf isNetbox { + test_ = lib.mkIf isNetbox { services.netbox.enable = true; }; } diff --git a/mail.nix b/mail.nix index d2d2478..bc686b1 100644 --- a/mail.nix +++ b/mail.nix @@ -1,10 +1,10 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: let release = "nixos-23.05"; cfg = config.services.nixosmail; in { options.services.nixosmail = { - enable = mkEnableOption "NixOS mail server"; + enable = lib.mkEnableOption "NixOS mail server"; }; imports = [ @@ -15,7 +15,7 @@ in { }) ]; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { mailserver = { enable = true; fqdn = "mail.beepboop.systems"; diff --git a/netbox.nix b/netbox.nix index fdb8f57..d124827 100644 --- a/netbox.nix +++ b/netbox.nix @@ -1,11 +1,10 @@ { lib, config, pkgs, ... }: -with lib; let cfg = config.services.netbox; in { options.serviecs.netbox = { - enable = mkEnableOption "netbox configs"; + enable = lib.mkEnableOption "netbox configs"; }; imports = @@ -13,7 +12,7 @@ in { ./mail.nix ]; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/vda"; diff --git a/virtbox.nix b/virtbox.nix index ee649c5..ffd4aa1 100644 --- a/virtbox.nix +++ b/virtbox.nix @@ -1,6 +1,5 @@ { lib, config, pkgs, ...}: -with lib; let cfg = config.services.virtbox; home-manager = builtins.fetchTarball { @@ -9,14 +8,14 @@ let }; in { options.serviecs.virtbox = { - enable = mkEnableOption "virtbox configs"; + enable = lib.mkEnableOption "virtbox configs"; }; imports = [ (import "${home-manager}/nixos") ]; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/vda";