diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix
index 97c9b0a5..4464340d 100644
--- a/homeManagerModules/options.nix
+++ b/homeManagerModules/options.nix
@@ -15,12 +15,7 @@ in {
 
       chromium = {
         enable = lib.mkEnableOption "Chromium-based browser with default extensions.";
-
-        package = lib.mkOption {
-          description = "Package for Chromium.";
-          default = pkgs.brave;
-          type = lib.types.package;
-        };
+        package = lib.mkPackageOption pkgs "brave" {};
       };
 
       emacs.enable = lib.mkEnableOption "Emacs text editor.";
@@ -47,7 +42,6 @@ in {
         type = lib.types.bool;
       };
 
-      neovim.enable = lib.mkEnableOption "Neovim text editor.";
       swaylock.enable = lib.mkEnableOption "Swaylock screen locker.";
       thunar.enable = lib.mkOption {
         description = "Thunar file manager.";
@@ -63,60 +57,15 @@ in {
 
     defaultApps = {
       enable = lib.mkEnableOption "Declaratively set default apps and file associations.";
-
-      audioPlayer = lib.mkOption {
-        description = "Default audio player package.";
-        default = cfg.defaultApps.videoPlayer;
-        type = lib.types.package;
-      };
-
-      editor = lib.mkOption {
-        description = "Default editor package.";
-        default = config.programs.vscode.package;
-        type = lib.types.package;
-      };
-
-      fileManager = lib.mkOption {
-        description = "Default file manager package.";
-        default = pkgs.cinnamon.nemo;
-        type = lib.types.package;
-      };
-
-      imageViewer = lib.mkOption {
-        description = "Default image viewer package.";
-        default = pkgs.gnome.eog;
-        type = lib.types.package;
-      };
-
-      pdfViewer = lib.mkOption {
-        description = "Default PDF viewer package.";
-        default = pkgs.evince;
-        type = lib.types.package;
-      };
-
-      terminal = lib.mkOption {
-        description = "Default terminal package.";
-        default = config.programs.alacritty.package;
-        type = lib.types.package;
-      };
-
-      terminalEditor = lib.mkOption {
-        description = "Default terminal editor package.";
-        default = config.programs.neovim.package;
-        type = lib.types.package;
-      };
-
-      videoPlayer = lib.mkOption {
-        description = "Default video player package.";
-        default = pkgs.celluloid;
-        type = lib.types.package;
-      };
-
-      webBrowser = lib.mkOption {
-        description = "Default web browser package.";
-        default = config.programs.firefox.package;
-        type = lib.types.package;
-      };
+      audioPlayer = lib.mkPackageOption pkgs "audio player" {default = ["celluloid"];};
+      editor = lib.mkPackageOption pkgs "text editor" {default = ["vscodium"];};
+      fileManager = lib.mkPackageOption pkgs "file manager" {default = ["cinnamon" "nemo"];};
+      imageViewer = lib.mkPackageOption pkgs "image viewer" {default = ["gnome" "eog"];};
+      pdfViewer = lib.mkPackageOption pkgs "pdf viewer" {default = ["evince"];};
+      terminal = lib.mkPackageOption pkgs "terminal emulator" {default = ["alacritty"];};
+      terminalEditor = lib.mkPackageOption pkgs "terminal text editor" {default = ["vim"];};
+      videoPlayer = lib.mkPackageOption pkgs "video player" {default = ["celluloid"];};
+      webBrowser = lib.mkPackageOption pkgs "web browser" {default = ["firefox"];};
     };
 
     desktop = {
diff --git a/homes/aly/default.nix b/homes/aly/default.nix
index 8ac6a0da..cac0e22f 100644
--- a/homes/aly/default.nix
+++ b/homes/aly/default.nix
@@ -74,7 +74,6 @@ self: {
       fastfetch.enable = true;
       firefox.enable = true;
       keepassxc.enable = true;
-      neovim.enable = true;
       tmux.enable = true;
       vsCodium.enable = true;
     };
diff --git a/nixosModules/options.nix b/nixosModules/options.nix
index 18b72551..974532b3 100644
--- a/nixosModules/options.nix
+++ b/nixosModules/options.nix
@@ -38,8 +38,6 @@
       sway.enable = lib.mkEnableOption "Sway wayland session.";
     };
 
-    services = {
-      flatpak.enable = lib.mkEnableOption "Flatpak support with GUI.";
-    };
+    services.flatpak.enable = lib.mkEnableOption "Flatpak support with GUI.";
   };
 }