diff --git a/common/firefox.nix b/common/firefox.nix
index e468ba3..dcf0a0f 100644
--- a/common/firefox.nix
+++ b/common/firefox.nix
@@ -69,10 +69,6 @@ in
       description = "set of plugins to install. Format: guid = short-id";
     };
 
-    disableUserPlugins = mkOption {
-      type = types.bool;
-      default = false;
-      description = "disables user controlled plugins";
-    };
+    disableUserPlugins = lib.mkEnableOption "disables user controlled plugins";
   };
 }
diff --git a/common/gaming.nix b/common/gaming.nix
index a0c80a6..7e7e925 100644
--- a/common/gaming.nix
+++ b/common/gaming.nix
@@ -48,9 +48,5 @@ in
     ];
   };
 
-  options.grimmShared.gaming = with lib; mkOption {
-    type = types.bool;
-    default = false;
-    description = "enables steam, heroic, prism and gamemoded";
-  };
+  options.grimmShared.gaming = lib.mkEnableOption"enables steam, heroic, prism and gamemoded";
 }
diff --git a/common/localisation.nix b/common/localisation.nix
index 9c9dc2e..8c6f9b1 100644
--- a/common/localisation.nix
+++ b/common/localisation.nix
@@ -29,9 +29,5 @@ in
     };
   };
 
-  options.grimmShared.locale = with lib; mkOption {
-    type = types.bool;
-    default = true;
-    description = "Sets german units but english language";
-  };
+  options.grimmShared.locale = lib.mkEnableOption "Sets german units but english language";
 }
diff --git a/common/network/default.nix b/common/network/default.nix
index 56843e9..0d348bc 100644
--- a/common/network/default.nix
+++ b/common/network/default.nix
@@ -16,9 +16,5 @@ in
 
   imports = [ ./bluetooth.nix ];
 
-  options.grimmShared.network = with lib; mkOption {
-    type = types.bool;
-    default = false;
-    description = "Enables network manager, wifi and bluetooth";
-  };
+  options.grimmShared.network = lib.mkEnableOption "Enables network manager, wifi and bluetooth";
 }
diff --git a/common/portals.nix b/common/portals.nix
index 8add361..9108aec 100644
--- a/common/portals.nix
+++ b/common/portals.nix
@@ -37,9 +37,5 @@ in
     fonts.fontDir.enable = true;
   };
 
-  options.grimmShared.portals = with lib; mkOption {
-    type = types.bool;
-    default = false;
-    description = "Enables portals for wlr, gtk and kde as well as fixes fonts";
-  };
+  options.grimmShared.portals = lib.mkEnableOption "Enables portals for wlr, gtk and kde as well as fixes fonts";
 }
diff --git a/common/printing.nix b/common/printing.nix
index 91087d4..da8edd5 100644
--- a/common/printing.nix
+++ b/common/printing.nix
@@ -21,9 +21,5 @@ in
     ]);
   };
 
-  options.grimmShared.printing = with lib; mkOption {
-    type = types.bool;
-    default = false;
-    description = "Enables print and scan related options";
-  };
+  options.grimmShared.printing = lib.mkEnableOption "Enables print and scan related options";
 }
diff --git a/common/tooling/default.nix b/common/tooling/default.nix
index 65cb9df..fa4b310 100644
--- a/common/tooling/default.nix
+++ b/common/tooling/default.nix
@@ -153,11 +153,7 @@ in
       };
     };
 
-    pass = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Enables password-store, gnupg and such secret handling";
-    };
+    pass = lib.mkEnableOption "Enables password-store, gnupg and such secret handling";
 
     git_user = mkOption {
       type = types.str;
diff --git a/modules/default.ly b/modules/default.ly
deleted file mode 100644
index ba1961b..0000000
--- a/modules/default.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "@version@"
-\include "english.ly"
-
-\score {
-  \new Staff {
-    \key c \major
-    \numericTimeSignature
-    \time 4/4
-    <cs' d'' b''>16 <cs' d'' b''>8.
-    %% Here: the tie on the D's looks funny
-    %% Too tall? Left-hand endpoint is not aligned with the B tie?
-    ~
-    <cs' d'' b''>8 [ <b d'' a''> ]
-  }
-}
-