diff --git a/modules/cli/starship.nix b/modules/cli/starship.nix
index 648042a99..09ae8af0b 100644
--- a/modules/cli/starship.nix
+++ b/modules/cli/starship.nix
@@ -6,7 +6,7 @@
     cfg = config.myOptions.programs.starship;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.programs.starship.enable = mkEnableOption "enable starship";
+    options.myOptions.programs.starship.enable = mkEnableOption "starship";
 
     config = mkIf cfg.enable {
         home-manager.users.${username} = {
diff --git a/modules/cli/zsh.nix b/modules/cli/zsh.nix
index 177f0cf01..c09127776 100644
--- a/modules/cli/zsh.nix
+++ b/modules/cli/zsh.nix
@@ -8,7 +8,7 @@
     username = config.myOptions.other.system.username;
 in {
     options.myOptions.programs.zsh = {
-        enable = mkEnableOption "enable zsh";
+        enable = mkEnableOption "zsh";
         extraAliases = mkOption {
             type = types.attrs;
             description = "extra shell aliases";
diff --git a/modules/gui/anyrun.nix b/modules/gui/anyrun.nix
index 60c215c01..779858a99 100644
--- a/modules/gui/anyrun.nix
+++ b/modules/gui/anyrun.nix
@@ -8,7 +8,7 @@
     cfg = config.myOptions.programs.anyrun;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.programs.anyrun.enable = mkEnableOption "enable anyrun";
+    options.myOptions.programs.anyrun.enable = mkEnableOption "anyrun";
 
     config = mkIf cfg.enable {
         nix.settings = {
diff --git a/modules/gui/armcord.nix b/modules/gui/armcord.nix
index 04d6e387e..bbc4c4a3f 100644
--- a/modules/gui/armcord.nix
+++ b/modules/gui/armcord.nix
@@ -10,7 +10,7 @@
     storage = "ArmCord/storage";
 in {
     options.myOptions.programs.armcord = {
-        enable = mkEnableOption "enable armcord";
+        enable = mkEnableOption "armcord";
     };
 
     config = mkIf cfg.enable {
diff --git a/modules/gui/cursor.nix b/modules/gui/cursor.nix
index e29f039f5..6b3a454ed 100644
--- a/modules/gui/cursor.nix
+++ b/modules/gui/cursor.nix
@@ -7,7 +7,7 @@
     username = config.myOptions.other.system.username;
 in {
     options.myOptions.themes.cursor = {
-        enable = mkEnableOption "enable cursor theming";
+        enable = mkEnableOption "cursor theming";
         package = mkOption {
             description = "cursor theme package";
             type = types.package;
diff --git a/modules/gui/firefox.nix b/modules/gui/firefox.nix
index 422034c0c..828fab2a7 100644
--- a/modules/gui/firefox.nix
+++ b/modules/gui/firefox.nix
@@ -55,7 +55,7 @@
     };
 in {
     options.myOptions.programs.firefox = {
-        enable = mkEnableOption "enable firefox";
+        enable = mkEnableOption "firefox";
         defaultSearchEngine = mkOption {
             description = "name of the default search engine";
             type = types.str;
diff --git a/modules/gui/foot.nix b/modules/gui/foot.nix
index b34c594c7..e2789bdc3 100644
--- a/modules/gui/foot.nix
+++ b/modules/gui/foot.nix
@@ -9,7 +9,7 @@
     username = config.myOptions.other.system.username;
 in {
     options.myOptions.programs.foot = {
-        enable = mkEnableOption "enable foot";
+        enable = mkEnableOption "foot";
         server = mkOption {
             description = "enable foot server mode";
             default = true;
diff --git a/modules/gui/gtk.nix b/modules/gui/gtk.nix
index e34541e2a..df5b0dbf9 100644
--- a/modules/gui/gtk.nix
+++ b/modules/gui/gtk.nix
@@ -8,7 +8,7 @@
     hmCfg = config.home-manager.users.${username};
 in {
     options.myOptions.themes.gtk = {
-        enable = mkEnableOption "enable gtk theming";
+        enable = mkEnableOption "gtk theming";
         name = mkOption {
             description = "gtk theme name";
             type = types.str;
diff --git a/modules/gui/gtklock.nix b/modules/gui/gtklock.nix
index b57c0a1e9..491006884 100644
--- a/modules/gui/gtklock.nix
+++ b/modules/gui/gtklock.nix
@@ -7,7 +7,7 @@
     cfg = config.myOptions.programs.gtklock;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.programs.gtklock.enable = mkEnableOption "enable gtklock";
+    options.myOptions.programs.gtklock.enable = mkEnableOption "gtklock";
     
     config = mkIf cfg.enable {
 
diff --git a/modules/gui/hypr/land.nix b/modules/gui/hypr/land.nix
index fc337126e..837429a2d 100644
--- a/modules/gui/hypr/land.nix
+++ b/modules/gui/hypr/land.nix
@@ -22,7 +22,7 @@
     inherit (inputs.hyprlock.packages.${pkgs.system}) hyprlock;
 in {
     options.myOptions.programs.hypr.land = {
-        enable = mkEnableOption "enable hiper ląd";
+        enable = mkEnableOption "hiper ląd";
         startupSound = mkOption {
             type = with types; nullOr path;
             description = "sound to play on hyprland startup";
diff --git a/modules/gui/hypr/lock.nix b/modules/gui/hypr/lock.nix
index 9e26ab893..14a23171a 100644
--- a/modules/gui/hypr/lock.nix
+++ b/modules/gui/hypr/lock.nix
@@ -11,7 +11,7 @@
     text_color = "rgba(eae0e4FF)";
 in {
     options.myOptions.programs.hypr.lock = {
-        enable = mkEnableOption "enable hiper zamek";
+        enable = mkEnableOption "hiper zamek";
         extraSettings = mkOption {
             type = types.attrs;
             description = "extra per host hyprlock settings";
diff --git a/modules/gui/mpv.nix b/modules/gui/mpv.nix
index 186de0812..7d16eddff 100644
--- a/modules/gui/mpv.nix
+++ b/modules/gui/mpv.nix
@@ -7,7 +7,7 @@
     cfg = config.myOptions.programs.mpv;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.programs.mpv.enable = mkEnableOption "enable mpv";
+    options.myOptions.programs.mpv.enable = mkEnableOption "mpv";
 
     config = mkIf cfg.enable {
         home-manager.users.${username} = {
diff --git a/modules/gui/osu.nix b/modules/gui/osu.nix
index a4615cc8f..c1a4f1d9b 100644
--- a/modules/gui/osu.nix
+++ b/modules/gui/osu.nix
@@ -9,8 +9,8 @@
     username = config.myOptions.other.system.username;
 in {
     options.myOptions.programs.osu = {
-        enable = mkEnableOption "enable osu!";
-        enableStable = mkEnableOption "enable osu!stable";
+        enable = mkEnableOption "osu!";
+        enableStable = mkEnableOption "osu!stable";
     };
 
     config = mkIf (cfg.enable || cfg.enableStable) {
diff --git a/modules/gui/qt.nix b/modules/gui/qt.nix
index bb5369fdc..a448f551a 100644
--- a/modules/gui/qt.nix
+++ b/modules/gui/qt.nix
@@ -8,7 +8,7 @@
     username = config.myOptions.other.system.username;
 in {
     options.myOptions.themes.qt = {
-        enable = mkEnableOption "enable qt theming";
+        enable = mkEnableOption "qt theming";
         name = mkOption {
             description = "qt theme name";
             type = types.str;
diff --git a/modules/gui/schizofox.nix b/modules/gui/schizofox.nix
index 4b4d9f7fd..284998d91 100644
--- a/modules/gui/schizofox.nix
+++ b/modules/gui/schizofox.nix
@@ -8,7 +8,7 @@
     username = config.myOptions.other.system.username;
 in {
     options.myOptions.programs.schizofox = {
-        enable = mkEnableOption "enable schizofox";
+        enable = mkEnableOption "schizofox";
     };
 
     config = mkIf cfg.enable {
diff --git a/modules/gui/swaylock.nix b/modules/gui/swaylock.nix
index 7d63cfa73..cb824b751 100644
--- a/modules/gui/swaylock.nix
+++ b/modules/gui/swaylock.nix
@@ -8,7 +8,7 @@
     cfg = config.myOptions.programs.swaylock;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.programs.swaylock.enable = mkEnableOption "enable swaylock";
+    options.myOptions.programs.swaylock.enable = mkEnableOption "swaylock";
 
     config = mkIf cfg.enable {
 
diff --git a/modules/gui/vesktop/default.nix b/modules/gui/vesktop/default.nix
index 26768deab..574d5b9f0 100644
--- a/modules/gui/vesktop/default.nix
+++ b/modules/gui/vesktop/default.nix
@@ -8,7 +8,7 @@
     username = config.myOptions.other.system.username;
 in {
     options.myOptions.programs.vesktop = {
-        enable = mkEnableOption "enable vesktop";
+        enable = mkEnableOption "vesktop";
     };
 
     config = mkIf cfg.enable {
diff --git a/modules/gui/zathura.nix b/modules/gui/zathura.nix
index b7580b0e3..74082fbc2 100644
--- a/modules/gui/zathura.nix
+++ b/modules/gui/zathura.nix
@@ -7,7 +7,7 @@
     cfg = config.myOptions.programs.zathura;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.programs.zathura.enable = mkEnableOption "enable zathura";
+    options.myOptions.programs.zathura.enable = mkEnableOption "zathura";
 
     config = mkIf cfg.enable {
         home-manager.users.${username} = {
diff --git a/modules/other/home-manager.nix b/modules/other/home-manager.nix
index f885c48ae..78f2cdbf5 100644
--- a/modules/other/home-manager.nix
+++ b/modules/other/home-manager.nix
@@ -9,8 +9,8 @@
     username = config.myOptions.other.system.username;
 in {
     options.myOptions.other.home-manager = {
-        enable = mkEnableOption "enable home-manager";
-        enableDirenv = mkEnableOption "enable direnv";
+        enable = mkEnableOption "home-manager";
+        enableDirenv = mkEnableOption "direnv";
     };
 
     config = mkIf cfg.enable {
diff --git a/modules/services/dunst.nix b/modules/services/dunst.nix
index 5d4ef2c42..fabdc1beb 100644
--- a/modules/services/dunst.nix
+++ b/modules/services/dunst.nix
@@ -8,7 +8,7 @@
     cfg = config.myOptions.services.dunst;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.services.dunst.enable = mkEnableOption "enable dunst";
+    options.myOptions.services.dunst.enable = mkEnableOption "dunst";
 
     config = mkIf cfg.enable {
         home-manager.users.${username} = {
diff --git a/modules/services/fcitx/default.nix b/modules/services/fcitx/default.nix
index 40e629734..0762316f3 100644
--- a/modules/services/fcitx/default.nix
+++ b/modules/services/fcitx/default.nix
@@ -8,7 +8,7 @@
     username = config.myOptions.other.system.username;
 in {
     # stolen from https://git.outfoxxed.me/outfoxxed/nixnew/src/branch/master/modules/user/modules/fcitx5
-    options.myOptions.services.fcitx5.enable = mkEnableOption "enable fcitx5";
+    options.myOptions.services.fcitx5.enable = mkEnableOption "fcitx5";
 
     config = mkIf cfg.enable {
         i18n.inputMethod = {
diff --git a/modules/services/greetd.nix b/modules/services/greetd.nix
index 34e5e3c49..eec8241e1 100644
--- a/modules/services/greetd.nix
+++ b/modules/services/greetd.nix
@@ -26,7 +26,7 @@
     '';
 in {
     options.myOptions.services.greetd = {
-        enable = mkEnableOption "enable greetd";
+        enable = mkEnableOption "greetd";
         greeter = mkOption {
             description = "greetd frontend to use";
             type = types.str;
diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix
index 568af9c3f..be06ce488 100644
--- a/modules/services/mpd.nix
+++ b/modules/services/mpd.nix
@@ -6,7 +6,7 @@
     cfg = config.myOptions.services.mpd;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.services.mpd.enable = mkEnableOption "enable mpd";
+    options.myOptions.services.mpd.enable = mkEnableOption "mpd";
 
     config = mkIf cfg.enable {
         home-manager.users.${username} = {
diff --git a/modules/services/pipewire.nix b/modules/services/pipewire.nix
index 794872c48..1a431304e 100644
--- a/modules/services/pipewire.nix
+++ b/modules/services/pipewire.nix
@@ -5,7 +5,7 @@
 }: with lib; let
     cfg = config.myOptions.services.pipewire;
 in {
-    options.myOptions.services.pipewire.enable = mkEnableOption "enable pipewire";
+    options.myOptions.services.pipewire.enable = mkEnableOption "pipewire";
 
     config = mkIf cfg.enable {
         hardware.pulseaudio.enable = false;
diff --git a/modules/services/ssh.nix b/modules/services/ssh.nix
index 4617d550f..110315ea6 100644
--- a/modules/services/ssh.nix
+++ b/modules/services/ssh.nix
@@ -11,7 +11,7 @@ in {
             description = "sshd options";
             type = with types; submodule {
                 options = {
-                    enable = mkEnableOption "enable sshd";
+                    enable = mkEnableOption "sshd";
                     passwordAuth = mkOption {
                         description = "allow password auth";
                         default = false;
@@ -29,7 +29,7 @@ in {
             description = "ssh agent options";
             type = with types; submodule {
                 options = {
-                    enable = mkEnableOption "enable ssh-agent";
+                    enable = mkEnableOption "ssh-agent";
                     hostAliases = mkOption {
                         description = "host aliases";
                         type = with types; attrsOf (submodule {
diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 7e031b62b..4da7483a9 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -8,7 +8,7 @@
     hmCfg = config.home-manager.users.${username};
 in {
     options.myOptions.services.syncthing = {
-        enable = mkEnableOption "enable syncthing";
+        enable = mkEnableOption "syncthing";
         extraSettings = mkOption {
             type = types.attrs;
             description = "extra per host syncthing settings";
diff --git a/modules/tui/btop.nix b/modules/tui/btop.nix
index efaa3cb28..56119031b 100644
--- a/modules/tui/btop.nix
+++ b/modules/tui/btop.nix
@@ -6,7 +6,7 @@
     cfg = config.myOptions.programs.btop;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.programs.btop.enable = mkEnableOption "enable btop";
+    options.myOptions.programs.btop.enable = mkEnableOption "btop";
 
     config = mkIf cfg.enable {
         home-manager.users.${username} = {
diff --git a/modules/tui/helix.nix b/modules/tui/helix.nix
index 6985554a7..a03eea7a8 100644
--- a/modules/tui/helix.nix
+++ b/modules/tui/helix.nix
@@ -8,7 +8,7 @@
     cfg = config.myOptions.programs.helix;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.programs.helix.enable = mkEnableOption "enable helix";
+    options.myOptions.programs.helix.enable = mkEnableOption "helix";
 
     config = mkIf cfg.enable {
         nix.settings = {
diff --git a/modules/tui/neovim.nix b/modules/tui/neovim.nix
index aceb9e8e4..5fe0f5e5f 100644
--- a/modules/tui/neovim.nix
+++ b/modules/tui/neovim.nix
@@ -8,7 +8,7 @@
     cfg = config.myOptions.programs.neovim;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.programs.neovim.enable = mkEnableOption "enable neovim";
+    options.myOptions.programs.neovim.enable = mkEnableOption "neovim";
 
     config = mkIf cfg.enable {
         nixpkgs.overlays = [ inputs.neovim-nightly-overlay.overlay ];
diff --git a/modules/tui/newsboat.nix b/modules/tui/newsboat.nix
index 6fbac15da..8ac4c2d85 100644
--- a/modules/tui/newsboat.nix
+++ b/modules/tui/newsboat.nix
@@ -6,7 +6,7 @@
     cfg = config.myOptions.programs.newsboat;
     username = config.myOptions.other.system.username;
 in {
-    options.myOptions.programs.newsboat.enable = mkEnableOption "enable newsboat";
+    options.myOptions.programs.newsboat.enable = mkEnableOption "newsboat";
 
     config = mkIf cfg.enable {
         home-manager.users.${username} = {