diff --git a/home/jonas@comfy-station.nix b/home/jonas@comfy-station.nix
index 31ba221..60dadf0 100644
--- a/home/jonas@comfy-station.nix
+++ b/home/jonas@comfy-station.nix
@@ -3,9 +3,6 @@
     ../modules/home/borg.nix
     ../modules/home/firefox.nix
     ../modules/home/kdeconnect.nix
-    ../modules/home/kitty
-    ../modules/home/nextcloud
-    ../modules/home/ranger
     ../modules/home/ssh.nix
     ../modules/home/swaync
     ../modules/home/themes/gtk
@@ -28,6 +25,9 @@
 
   # hive modules
   hive.hyprland.enable = true;
+  hive.kitty.enable = true;
+  hive.nextcloud.enable = true;
+  hive.ranger.enable = true;
   hive.nix-scripts.enable = true;
   hive.doom.enable = true;
   hive.doom.enableCopilot = true;
diff --git a/home/jonas@harbor.nix b/home/jonas@harbor.nix
index 17b5695..cdcf748 100644
--- a/home/jonas@harbor.nix
+++ b/home/jonas@harbor.nix
@@ -1,6 +1,5 @@
 {...}: {
   imports = [
-    ../modules/home/ranger
     ../modules/home/zsh
   ];
 
@@ -12,6 +11,7 @@
   # hive modules
   hive.hyprland.enable = true;
   hive.nix-scripts.enable = true;
+  hive.ranger.enable = true;
   hive.doom.enable = true;
   hive.doom.withNixPkgs = true;
   hive.doom.withShellPkgs = true;
diff --git a/home/jonas@monolith.nix b/home/jonas@monolith.nix
index 59d02aa..3affd0b 100644
--- a/home/jonas@monolith.nix
+++ b/home/jonas@monolith.nix
@@ -4,8 +4,6 @@
     ../modules/home/firefox.nix
     ../modules/home/kdeconnect.nix
     ../modules/home/kitty
-    ../modules/home/nextcloud
-    ../modules/home/ranger
     ../modules/home/ssh.nix
     ../modules/home/yubikey.nix
     ../modules/home/zsh
@@ -21,6 +19,10 @@
   };
 
   # hive moduless
+  hive.hyprland.enable = true;
+  hive.kitty.enable = true;
+  hive.nextcloud.enable = true;
+  hive.ranger.enable = true;
   hive.doom.enable = true;
   hive.doom.enableCopilot = true;
   hive.doom.withNixPkgs = true;
diff --git a/home/jroeger.nix b/home/jroeger.nix
index 96eafe6..724f834 100644
--- a/home/jroeger.nix
+++ b/home/jroeger.nix
@@ -1,7 +1,5 @@
 {...}: {
   imports = [
-    ../modules/home/kitty
-    ../modules/home/ranger
     ../modules/home/yubikey.nix
     ../modules/home/zsh
   ];
@@ -14,6 +12,9 @@
   yubikey.pinentry = "gnome3";
 
   # hive modules
+  hive.kitty.enable = true;
+  hive.ranger.enable = true;
+  hive.nix-scripts.enable = true;
   hive.doom.enable = true;
   hive.doom.enableCopilot = true;
   hive.doom.withNixPkgs = true;
diff --git a/modules/default.nix b/modules/default.nix
index 7563f9f..0bc3df2 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -30,5 +30,8 @@
       # pure home-manager modules
       ./home/doom
       ./home/hyprland
+      ./home/kitty
+      ./home/nextcloud
+      ./home/ranger
     ];
 }
diff --git a/modules/home/kitty/config.nix b/modules/home/kitty/config.nix
deleted file mode 100644
index ebb2c14..0000000
--- a/modules/home/kitty/config.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{pkgs, ...}: {
-  programs.kitty = {
-    shellIntegration.enableZshIntegration = true;
-    font = {
-      package = pkgs.fira-code-nerdfont;
-      name = "Fira Code Nerd Font";
-      size = 12;
-    };
-    themeFile = "Molokai";
-    settings = {
-      background_opacity = "0.6";
-      enable_audio_bell = false;
-      confirm_os_window_close = 0;
-    };
-  };
-}
diff --git a/modules/home/kitty/default.nix b/modules/home/kitty/default.nix
index 8d8724b..793bfd6 100644
--- a/modules/home/kitty/default.nix
+++ b/modules/home/kitty/default.nix
@@ -1,6 +1,29 @@
-{...}: {
-  imports = [
-    ./config.nix
-    ./kitty.nix
-  ];
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.hive.kitty;
+in {
+  options.hive.kitty = {
+    enable = lib.mkEnableOption "Enable kitty terminal";
+  };
+  config = lib.mkIf cfg.enable {
+    programs.kitty = {
+      enable = true;
+      shellIntegration.enableZshIntegration = true;
+      font = {
+        package = pkgs.fira-code-nerdfont;
+        name = "Fira Code Nerd Font";
+        size = 12;
+      };
+      themeFile = "Molokai";
+      settings = {
+        background_opacity = "0.6";
+        enable_audio_bell = false;
+        confirm_os_window_close = 0;
+      };
+    };
+  };
 }
diff --git a/modules/home/kitty/kitty.nix b/modules/home/kitty/kitty.nix
deleted file mode 100644
index bac7930..0000000
--- a/modules/home/kitty/kitty.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  programs.kitty.enable = true;
-}
diff --git a/modules/home/mqtt-explorer/default.nix b/modules/home/mqtt-explorer/default.nix
deleted file mode 100644
index e152f3c..0000000
--- a/modules/home/mqtt-explorer/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [
-    (pkgs.callPackage ./mqtt-explorer.nix {})
-  ];
-}
diff --git a/modules/home/mqtt-explorer/mqtt-explorer.nix b/modules/home/mqtt-explorer/mqtt-explorer.nix
deleted file mode 100644
index 9f11deb..0000000
--- a/modules/home/mqtt-explorer/mqtt-explorer.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  appimageTools,
-  electron_27,
-  makeWrapper,
-}:
-stdenv.mkDerivation rec {
-  pname = "MQTT-Explorer";
-  version = "0.4.0-beta1";
-  src = appimageTools.extract {
-    name = pname;
-    src = fetchurl {
-      url = "https://github.com/thomasnordquist/${pname}/releases/download/0.0.0-${version}/${pname}-${version}.AppImage";
-      sha256 = "0x9ava13hn1nkk2kllh5ldi4b3hgmgwahk08sq48yljilgda4ppn";
-    };
-  };
-  buildInputs = [makeWrapper];
-  installPhase = ''
-    install -m 444 -D resources/app.asar $out/libexec/app.asar
-    install -m 444 -D mqtt-explorer.png $out/share/icons/mqtt-explorer.png
-    install -m 444 -D mqtt-explorer.desktop $out/share/applications/mqtt-explorer.desktop
-    makeWrapper ${electron_27}/bin/electron $out/bin/mqtt-explorer --add-flags $out/libexec/app.asar
-  '';
-  meta = with lib; {
-    description = "A comprehensive and easy-to-use MQTT Client";
-    homepage = "https://mqtt-explorer.com/";
-    license =
-      # TODO: make licenses.cc-by-nd-40
-      {
-        free = false;
-        fullName = "Creative Commons Attribution-No Derivative Works v4.00";
-        shortName = "cc-by-nd-40";
-        spdxId = "CC-BY-ND-4.0";
-        url = "https://spdx.org/licenses/CC-BY-ND-4.0.html";
-      };
-    maintainers = [maintainers.yorickvp];
-    inherit (electron_27.meta) platforms;
-  };
-}
diff --git a/modules/home/nextcloud/config.nix b/modules/home/nextcloud/config.nix
deleted file mode 100644
index 411b663..0000000
--- a/modules/home/nextcloud/config.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  services.nextcloud-client = {
-    enable = true;
-    startInBackground = true;
-  };
-}
diff --git a/modules/home/nextcloud/default.nix b/modules/home/nextcloud/default.nix
index 6a4cc23..54feac4 100644
--- a/modules/home/nextcloud/default.nix
+++ b/modules/home/nextcloud/default.nix
@@ -1,3 +1,17 @@
-{...}: {
-  imports = [./config.nix];
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.hive.nextcloud;
+in {
+  options.hive.nextcloud = {
+    enable = lib.mkEnableOption "Enable Nextcloud client";
+  };
+  config = lib.mkIf cfg.enable {
+    services.nextcloud-client = {
+      enable = true;
+      startInBackground = true;
+    };
+  };
 }
diff --git a/modules/home/ranger/config.nix b/modules/home/ranger/config.nix
deleted file mode 100644
index 25ce2e0..0000000
--- a/modules/home/ranger/config.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  programs.ranger = {
-    settings = {
-      preview_images = true;
-      preview_images_method =
-        if config.programs.kitty.enable
-        then "kitty"
-        else "ueberzug";
-    };
-    extraConfig = lib.strings.concatStringsSep "\n" [
-      "default_linemode devicons"
-    ];
-    mappings = {
-      f = "console fzf_filter%space";
-    };
-    plugins =
-      [
-        {
-          name = "ranger_fzf_filter";
-          src = builtins.fetchGit {
-            url = "https://github.com/MuXiu1997/ranger-fzf-filter";
-            rev = "bf16de2e4ace415b685ff7c58306d0c5146f9f43";
-          };
-        }
-        {
-          name = "ranger_archives";
-          src = builtins.fetchGit {
-            url = "https://github.com/maximtrp/ranger-archives";
-            rev = "b4e136b24fdca7670e0c6105fb496e5df356ef25";
-          };
-        }
-        {
-          name = "ranger_devicons";
-          src = builtins.fetchGit {
-            url = "https://github.com/alexanderjeurissen/ranger_devicons";
-            rev = "f227f212e14996fbb366f945ec3ecaf5dc5f44b0";
-          };
-        }
-      ]
-      ++ (
-        if config.services.kdeconnect.enable
-        then
-          lib.lists.singleton
-          {
-            name = "ranger_kdeconnect.py";
-            src =
-              builtins.fetchGit {
-                url = "https://github.com/bwconrad/ranger-kdeconnect";
-                rev = "710c600bb894fed3e293f6518930c16a494dd154";
-              }
-              + "/kdeconnect_send.py";
-          }
-        else []
-      );
-  };
-}
diff --git a/modules/home/ranger/default.nix b/modules/home/ranger/default.nix
index 9f24027..994aa63 100644
--- a/modules/home/ranger/default.nix
+++ b/modules/home/ranger/default.nix
@@ -1,6 +1,68 @@
-{...}: {
-  imports = [
-    ./config.nix
-    ./ranger.nix
-  ];
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.hive.ranger;
+in {
+  options.hive.ranger = {
+    enable = lib.mkEnableOption "Enable ranger";
+  };
+  config = lib.mkIf cfg.enable {
+    programs.ranger = {
+      enable = true;
+      settings = {
+        preview_images = true;
+        preview_images_method =
+          if config.programs.kitty.enable
+          then "kitty"
+          else "ueberzug";
+      };
+      extraConfig = lib.strings.concatStringsSep "\n" [
+        "default_linemode devicons"
+      ];
+      mappings = {
+        f = "console fzf_filter%space";
+      };
+      plugins =
+        [
+          {
+            name = "ranger_fzf_filter";
+            src = builtins.fetchGit {
+              url = "https://github.com/MuXiu1997/ranger-fzf-filter";
+              rev = "bf16de2e4ace415b685ff7c58306d0c5146f9f43";
+            };
+          }
+          {
+            name = "ranger_archives";
+            src = builtins.fetchGit {
+              url = "https://github.com/maximtrp/ranger-archives";
+              rev = "b4e136b24fdca7670e0c6105fb496e5df356ef25";
+            };
+          }
+          {
+            name = "ranger_devicons";
+            src = builtins.fetchGit {
+              url = "https://github.com/alexanderjeurissen/ranger_devicons";
+              rev = "f227f212e14996fbb366f945ec3ecaf5dc5f44b0";
+            };
+          }
+        ]
+        ++ (
+          if config.services.kdeconnect.enable
+          then
+            lib.lists.singleton
+            {
+              name = "ranger_kdeconnect.py";
+              src =
+                builtins.fetchGit {
+                  url = "https://github.com/bwconrad/ranger-kdeconnect";
+                  rev = "710c600bb894fed3e293f6518930c16a494dd154";
+                }
+                + "/kdeconnect_send.py";
+            }
+          else []
+        );
+    };
+  };
 }
diff --git a/modules/home/ranger/ranger.nix b/modules/home/ranger/ranger.nix
deleted file mode 100644
index 95d7334..0000000
--- a/modules/home/ranger/ranger.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  programs.ranger.enable = true;
-}