fix: placed impala and bluetui in its correct submodule

impala was mistakenly put in audio and bluetui in system, now we have
them separated in a separate networking module.
impala was also mistakenly used as the audio handler which is just
wrong.

9 files changed, 51 insertions, 48 deletions

diff --git a/modules/default.nix b/modules/default.nix
index 3a601ee..01eca6d 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -9,6 +9,7 @@
     ./fonts
     ./gaming
     ./media
+    ./networking
     ./office
     ./scripts
     ./security
diff --git a/modules/media/default.nix b/modules/media/default.nix
index a26aa08..5157734 100644
--- a/modules/media/default.nix
+++ b/modules/media/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ./feh
     ./ffmpeg
-    ./impala
     ./maim
     ./pamixer
     ./playerctl
diff --git a/modules/media/impala/default.nix b/modules/media/impala/default.nix
deleted file mode 100644
index 1a14412..0000000
--- a/modules/media/impala/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-# Impala - Apache Impala: SQL query engine for Apache Hadoop
-{
-  options.media.impala = {
-    enable = lib.mkEnableOption "Enables impala.";
-    package = lib.mkPackageOption pkgs "impala" { };
-  };
-
-  config = lib.mkIf config.media.impala.enable {
-    home.packages = [ config.media.impala.package ];
-
-    xdg.mimeApps.defaultApplications = {
-      "x-scheme-handler/impala" = "impala.desktop";
-      "audio/mpeg" = "impala.desktop";
-      "audio/ogg" = "impala.desktop";
-      "audio/flac" = "impala.desktop";
-      "audio/x-flac" = "impala.desktop";
-    };
-  };
-}
diff --git a/modules/networking/bluetui/default.nix b/modules/networking/bluetui/default.nix
new file mode 100644
index 0000000..2eb5358
--- /dev/null
+++ b/modules/networking/bluetui/default.nix
@@ -0,0 +1,17 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options.networking.bluetui = {
+    enable = lib.mkEnableOption "Enables bluetui.";
+    package = lib.mkPackageOption pkgs "bluetui" { };
+  };
+
+  config = lib.mkIf config.networking.bluetui.enable {
+    home.packages = [ config.networking.bluetui.package ];
+  };
+}
diff --git a/modules/networking/default.nix b/modules/networking/default.nix
new file mode 100644
index 0000000..f4ef9de
--- /dev/null
+++ b/modules/networking/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./bluetui
+    ./impala
+  ];
+}
diff --git a/modules/networking/impala/default.nix b/modules/networking/impala/default.nix
new file mode 100644
index 0000000..d30ab2f
--- /dev/null
+++ b/modules/networking/impala/default.nix
@@ -0,0 +1,21 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options.networking.impala = {
+    enable = lib.mkEnableOption "Enables impala.";
+    package = lib.mkPackageOption pkgs "impala" { };
+  };
+
+  config = lib.mkIf config.networking.impala.enable {
+    home.packages = [ config.networking.impala.package ];
+
+    xdg.mimeApps.defaultApplications = {
+      "x-scheme-handler/impala" = "impala.desktop";
+    };
+  };
+}
diff --git a/modules/system/bluetui/default.nix b/modules/system/bluetui/default.nix
deleted file mode 100644
index 498659c..0000000
--- a/modules/system/bluetui/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-# Bluetui - Terminal UI for Bluetooth management
-{
-  options.system.bluetui = {
-    enable = lib.mkEnableOption "Enables bluetui.";
-    package = lib.mkPackageOption pkgs "bluetui" { };
-  };
-
-  config = lib.mkIf config.system.bluetui.enable {
-    home.packages = [ config.system.bluetui.package ];
-  };
-}
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 88e5087..3746d2c 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ./bluetui
     ./bottom
     ./brightnessctl
     ./htop
diff --git a/users/arpit.nix b/users/arpit.nix
index 1b868b4..d0414fc 100644
--- a/users/arpit.nix
+++ b/users/arpit.nix
@@ -42,13 +42,16 @@
   # Media
   media.feh.enable = true;
   media.ffmpeg.enable = true;
-  media.impala.enable = true;
   media.maim.enable = true;
   media.pamixer.enable = true;
   media.playerctl.enable = true;
   media.slop.enable = true;
   media.vlc.enable = true;
 
+  # Networking
+  networking.impala.enable = true;
+  networking.bluetui.enable = true;
+
   # Office
   office.zathura.enable = true;
 
@@ -60,7 +63,6 @@
   security.ssh.enable = true;
 
   # System
-  system.bluetui.enable = true;
   system.bottom.enable = true;
   system.brightnessctl.enable = true;
   system.htop.enable = true;