hosts/tower/configuration.nix

@@ -29,14 +29,8 @@
       locate.enable = true;
     };
     system = {
-      boot = {
+      boot.grub.enable = true;
-        grub.enable = true;
+      services.forgejo.enable = true;
-        timeout = 30;
-      };
-      services = {
-        forgejo.enable = true;
-        grafana.enable = true;
-      };
       programs = {
         editors = {
           helix.enable = true;

modules/services/forgejo/module.nix

@@ -6,7 +6,6 @@
 }: let
   inherit (pkgs) fetchurl;
   inherit (lib.modules) mkIf;
-  inherit (lib.options) mkEnableOption;
   inherit (config.services.forgejo) customDir user group;
 
   cfg = config.modules.system.services.forgejo;
@@ -17,7 +16,7 @@
   acmeRoot = "/var/lib/acme/challenges-forgejo";
   dataDir = "/srv/data/forgejo";
 in {
-  options.modules.system.services.forgejo.enable = mkEnableOption "forgejo";
+  options.modules.system.services.forgejo.enable = lib.mkEnableOption "forgejo";
 
   config = mkIf cfg.enable {
     modules.system.services = {

modules/system/boot/module.nix

@@ -5,21 +5,13 @@
   ...
 }: let
   inherit (lib.modules) mkForce;
-  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.options) mkEnableOption;
-  inherit (lib.types) int;
 
   cfg = config.modules.system.boot;
 in {
   options.modules.system.boot = {
     grub.enable = mkEnableOption "Grub, a bloated boot loader";
     systemd-boot.enable = mkEnableOption "Poetteringboot";
-    timeout = mkOption {
-      description = ''
-        Set the boot loader's timeout. This is 0 by default, but preferably longer on remote servers to make switching to previous generations easier.
-      '';
-      type = int;
-      default = 0;
-    };
   };
   config = {
     assertions = [
@@ -41,7 +33,7 @@ in {
       loader = {
         efi.canTouchEfiVariables = true;
         # I love spamming space
-        timeout = cfg.timeout;
+        timeout = 0;
         systemd-boot = {
           enable = cfg.systemd-boot.enable;
           editor = mkForce false;