diff --git a/default.nix b/default.nix
index decd630f..03446b6b 100644
--- a/default.nix
+++ b/default.nix
@@ -6,32 +6,6 @@
     # modules
     #i dont think this is right
     #./modules
-    outputs.nixosModules.desktop
-    outputs.nixosModules.desktop.bspwm
-    outputs.nixosModules.desktop.kitty
-    outputs.nixosModules.desktop.keepassxc
-    outputs.nixosModules.desktop.web.qutebrowser
-    outputs.nixosModules.desktop.game.steam
-    outputs.nixosModules.desktop.game.wine
-    outputs.nixosModules.desktop.game.lutris
-    outputs.nixosModules.desktop.chat.discord
-    outputs.nixosModules.dev
-    outputs.nixosModules.dev.editors
-    outputs.nixosModules.dev.editors.nvim
-    outputs.nixosModules.dev.cpp
-    outputs.nixosModules.dev.javascript
-    outputs.nixosModules.dev.python
-    outputs.nixosModules.dev.rust
-    outputs.nixosModules.devices
-    outputs.nixosModules.devices.nvidia
-    outputs.nixosModules.devices.pipewire
-    outputs.nixosModules.devices.bluetooth
-    outputs.nixosModules.media
-    outputs.nixosModules.media.mpd
-    outputs.nixosModules.media.ncmpcpp
-    outputs.nixosModules.shell
-    outputs.nixosModules.shell.newsboat
-    outputs.nixosModules.shell.zsh
   ];
 
   nix.settings.experimental-features = [ "nix-command" "flakes"];
diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix
index e049671f..aaaac686 100644
--- a/hosts/sakotop/configuration.nix
+++ b/hosts/sakotop/configuration.nix
@@ -7,7 +7,6 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ../../default.nix
-      
     ];
 
   modules = {
diff --git a/modules/desktop/bspwm.nix b/modules/desktop/bspwm.nix
index 3bd50595..4fb5bcd7 100644
--- a/modules/desktop/bspwm.nix
+++ b/modules/desktop/bspwm.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.desktop.bspwm;
 in {
   options.modules.desktop.bspwm = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/desktop/chat/discord.nix b/modules/desktop/chat/discord.nix
index 75b26d45..4fa20ea7 100644
--- a/modules/desktop/chat/discord.nix
+++ b/modules/desktop/chat/discord.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.desktop.chat.discord;
 in {
   options.modules.desktop.chat.discord = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/desktop/game/lutris.nix b/modules/desktop/game/lutris.nix
index 00e835c8..8aa1e21b 100644
--- a/modules/desktop/game/lutris.nix
+++ b/modules/desktop/game/lutris.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.desktop.game.lutris;
 in {
   options.modules.desktop.game.lutris = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/desktop/game/steam.nix b/modules/desktop/game/steam.nix
index 92fb1868..8aa350fe 100644
--- a/modules/desktop/game/steam.nix
+++ b/modules/desktop/game/steam.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.desktop.game.steam;
 in {
   options.modules.desktop.game.steam = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/desktop/game/wine.nix b/modules/desktop/game/wine.nix
index 33ea7477..94cd555a 100644
--- a/modules/desktop/game/wine.nix
+++ b/modules/desktop/game/wine.nix
@@ -2,11 +2,8 @@
 with lib;
 let cfg = config.modules.desktop.game.wine;
 in {
-  options.modules.desktop.game.wine = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+  options.modules.desktop.game.wine= {
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/desktop/keepassxc.nix b/modules/desktop/keepassxc.nix
index 4ede9f85..3ec2ddec 100644
--- a/modules/desktop/keepassxc.nix
+++ b/modules/desktop/keepassxc.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.desktop.keepassxc;
 in {
   options.modules.desktop.keepassxc = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
   config = mkIf cfg.enable {
     users.users.sako.packages = with pkgs; [
diff --git a/modules/desktop/kitty.nix b/modules/desktop/kitty.nix
index e8bc9ac7..e161a91f 100644
--- a/modules/desktop/kitty.nix
+++ b/modules/desktop/kitty.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.desktop.kitty;
 in {
   options.modules.desktop.kitty = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/desktop/web/qutebrowser.nix b/modules/desktop/web/qutebrowser.nix
index 671adf50..443b1d63 100644
--- a/modules/desktop/web/qutebrowser.nix
+++ b/modules/desktop/web/qutebrowser.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.web.qutebrowser;
 in {
   options.modules.web.qutebrowser = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/dev/cpp.nix b/modules/dev/cpp.nix
index 6a0077c6..336d2db7 100644
--- a/modules/dev/cpp.nix
+++ b/modules/dev/cpp.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.dev.cpp;
 in {
   options.modules.dev.cpp = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/dev/editors/nvim.nix b/modules/dev/editors/nvim.nix
index 8b5440b5..c92f3d8d 100644
--- a/modules/dev/editors/nvim.nix
+++ b/modules/dev/editors/nvim.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.dev.editors.nvim;
 in {
   options.modules.dev.editors.nvim = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/dev/javascript.nix b/modules/dev/javascript.nix
index 1b09113b..376eaf39 100644
--- a/modules/dev/javascript.nix
+++ b/modules/dev/javascript.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.dev.javascript;
 in {
   options.modules.dev.javascript = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/dev/python.nix b/modules/dev/python.nix
index 23a2eb8e..9c4a8152 100644
--- a/modules/dev/python.nix
+++ b/modules/dev/python.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.dev.python;
 in {
   options.modules.dev.python= {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/dev/rust.nix b/modules/dev/rust.nix
index 69d85e90..4392eafc 100644
--- a/modules/dev/rust.nix
+++ b/modules/dev/rust.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.dev.rust;
 in {
   options.modules.dev.rust = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/devices/bluetooth.nix b/modules/devices/bluetooth.nix
index 970c18cf..10b72022 100644
--- a/modules/devices/bluetooth.nix
+++ b/modules/devices/bluetooth.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.devices.bluetooth;
 in {
   options.modules.devices.bluetooth = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/devices/nvidia/default.nix b/modules/devices/nvidia/default.nix
index 91945d09..83b90d8c 100644
--- a/modules/devices/nvidia/default.nix
+++ b/modules/devices/nvidia/default.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.devices.nvidia;
 in {
   options.modules.devices.nvidia = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/devices/pipewire.nix b/modules/devices/pipewire.nix
index b1689e39..a9abbd06 100644
--- a/modules/devices/pipewire.nix
+++ b/modules/devices/pipewire.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.devices.pipewire;
 in {
   options.modules.devices.pipewire= {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/media/mpd/default.nix b/modules/media/mpd/default.nix
index d68bcb48..5caa7259 100644
--- a/modules/media/mpd/default.nix
+++ b/modules/media/mpd/default.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.media.mpd;
 in {
   options.modules.media.mpd = {
-    enable = mkOption {
-     type = types.bool;
-     default = false;
-    };
+    enable = mkBoolOpt false;
   };
   config = mkIf cfg.enable {
   services.mpd = {
diff --git a/modules/media/ncmpcpp/default.nix b/modules/media/ncmpcpp/default.nix
index a499a60f..eacd5560 100644
--- a/modules/media/ncmpcpp/default.nix
+++ b/modules/media/ncmpcpp/default.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.media.ncmpcpp;
 in {
   options.modules.media.ncmpcpp = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/shell/newsboat.nix b/modules/shell/newsboat.nix
index 0d076686..327027e8 100644
--- a/modules/shell/newsboat.nix
+++ b/modules/shell/newsboat.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.shell.newsboat;
 in {
   options.modules.shell.newsboat= {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    }; 
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix
index 46a6d2b0..0dfaec9e 100644
--- a/modules/shell/zsh.nix
+++ b/modules/shell/zsh.nix
@@ -3,10 +3,7 @@ with lib;
 let cfg = config.modules.shell.zsh;
 in {
   options.modules.shell.zsh = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkBoolOpt false;
   };
 
   config = mkIf cfg.enable {