unfuck optionsHEADmain

1 files changed, 19 insertions, 42 deletions

diff --git a/options.nix b/options.nix
index 47404e7..4ed92ee 100644
--- a/options.nix
+++ b/options.nix
@@ -19,22 +19,15 @@ with lib; let
         default = "";
       };
 
-      laptop = mkEnableOption {
-        description = "Flags this monitor to be part of a laptop and not docked.";
-        default = false;
-      };
+      laptop = mkEnableOption "Flags this monitor to be part of a laptop and not docked.";
 
       position = {
-        enabled = mkEnableOption {
-          description = "Enables hardcoded position of the monitor.";
-        };
-
+        enabled = mkEnableOption "Enables hardcoded position of the monitor.";
         x = mkOption {
           type = types.int;
           description = "The X position of the monitor.";
           default = 0;
         };
-
         y = mkOption {
           type = types.int;
           description = "The Y position of the monitor.";
@@ -43,16 +36,12 @@ with lib; let
       };
 
       size = {
-        enabled = mkEnableOption {
-          description = "Enables hardcoded size of the monitor.";
-        };
-
+        enabled = mkEnableOption "Enables hardcoded size of the monitor.";
         x = mkOption {
           type = types.int;
           description = "The X size of the monitor.";
           default = 0;
         };
-
         y = mkOption {
           type = types.int;
           description = "The Y size of the monitor.";
@@ -287,51 +276,38 @@ in {
     #
     # System modules
     #
-    battery.enable = mkEnableOption {
-      description = "Install battery and power system services and programs.";
-    };
-    bluetooth.enable = mkEnableOption {
-      description = "Install bluetooth system services and programs.";
-    };
-    fingerprint.enable = mkEnableOption {
-      description = "Install fingerprint system services and programs.";
-    };
+    battery.enable = mkEnableOption "Install battery and power system services and programs.";
+    bluetooth.enable = mkEnableOption "Install bluetooth system services and programs.";
+    fingerprint.enable = mkEnableOption "Install fingerprint system services and programs.";
     network = {
-      enable = mkEnableOption {
-        description = "Install networking system services and programs.";
-      };
-      firewall.enable = mkEnableOption {
+      enable = mkEnableOption "Install networking system services and programs.";
+      firewall.enable = mkOption {
         description = "Enable the networking firewall";
         default = !config.minimal;
+        type = types.bool;
       };
-      dns.enable = mkEnableOption {
+      dns.enable = mkOption {
         description = "Run a local dns server";
         default = !config.minimal;
+        type = types.bool;
       };
-      ssh.enable = mkEnableOption {
+      ssh.enable = mkOption {
         description = "Run a local ssh server";
         default = !config.minimal;
+        type = types.bool;
       };
     };
-    tpm.enable = mkEnableOption {
-      description = "Enable system TPM";
-    };
+    tpm.enable = mkEnableOption "Enable system TPM";
     nvidia = {
-      enable = mkEnableOption {
-        description = "Enable the nvidia graphics driver";
-      };
-      cuda.enable = mkEnableOption {
-        description = "Enable cuda support and modules";
-      };
+      enable = mkEnableOption "Enable the nvidia graphics driver";
+      cuda.enable = mkEnableOption "Enable cuda support and modules";
       primeBusIds = mkOption {
         type = types.attrs;
         description = "Set of nvidia prime gpu bus ids";
         default = {};
       };
     };
-    minimal = mkEnableOption {
-      description = "Install only required system services, drivers, and programs.";
-    };
+    minimal = mkEnableOption "Install only required system services, drivers, and programs.";
 
     #
     # Primary user of the system
@@ -450,9 +426,10 @@ in {
         default = 3;
       };
 
-      blur = mkEnableOption {
+      blur = mkOption {
         description = "If to enable blur in some programs.";
         default = false;
+        type = types.bool;
       };
 
       wallpaper = mkOption {