diff --git a/home-manager/imv.nix b/home-manager/imv.nix
new file mode 100644
index 0000000..0d69bfe
--- /dev/null
+++ b/home-manager/imv.nix
@@ -0,0 +1,5 @@
+_: {
+  programs.imv = {
+    enable = true;
+  };
+}
diff --git a/home-manager/mpv/default.nix b/home-manager/mpv/default.nix
new file mode 100644
index 0000000..700eb46
--- /dev/null
+++ b/home-manager/mpv/default.nix
@@ -0,0 +1,5 @@
+_: {
+  programs.mpv = {
+    enable = true;
+  };
+}
diff --git a/home-manager/zathura.nix b/home-manager/zathura.nix
new file mode 100644
index 0000000..cd1d000
--- /dev/null
+++ b/home-manager/zathura.nix
@@ -0,0 +1,13 @@
+_: {
+  programs.zathura = {
+    enable = true;
+    options = {
+      selection-clipboard = "clipboard";
+      font = "Fira Sans 12";
+      recolor = true;
+    };
+  };
+  xdg.mimeApps.defaultApplications = {
+      "application/pdf" = "org.pwmt.zathura.desktop";
+  };
+}
diff --git a/hosts/luci/hardware-configuration.nix b/hosts/luci/hardware-configuration.nix
index 16697bb..96ffe4b 100644
--- a/hosts/luci/hardware-configuration.nix
+++ b/hosts/luci/hardware-configuration.nix
@@ -51,16 +51,8 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    extraPackages = with pkgs; [
-      intel-media-driver
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
-  };
-
+  hardware.opengl.enable = true;
+  hardware.opengl.driSupport = true;
 
   virtualisation.virtualbox.host.enable = true;
   users.extraGroups.vboxusers.members = [ "ephase" ];
diff --git a/hosts/luci/home-config.nix b/hosts/luci/home-config.nix
index af30a63..246d67d 100644
--- a/hosts/luci/home-config.nix
+++ b/hosts/luci/home-config.nix
@@ -1,17 +1,8 @@
 { ... }: {
   config.modules = {
-    application = {
-      zathura.enable = true;
-    };
-    cli = {
-      neovim.enable = true;
-      vifm.enable = true;
-      zsh.enable = true;
-    };
-    video = {
-      kdenlive.enable = false;
-      mpv.enable = true;
-    };
+    cli.neovim.enable = true;
+    cli.vifm.enable = true;
+    video.kdenlive.enable = false;
     web.firefox.enable = true;
     web.qutebrowser.enable = true;
     web.webcord.enable = true;
diff --git a/modules/home-manager/application/imv/default.nix b/modules/home-manager/application/imv/default.nix
deleted file mode 100644
index 84ab5d1..0000000
--- a/modules/home-manager/application/imv/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, config, ... }:
-with lib;
-let
-  cfg = config.modules.application.zathura;
-in
-{
-  options.modules.application.imv = {
-    enable = mkEnableOption "enable IMV image viewer";
-  };
-  config = mkIf cfg.enable {
-    programs.imv = {
-      enable = true;
-    };
-    xdg.mimeApps.defaultApplications = {
-        "image/*" = "imv-dir.desktop";
-    };
-  };
-}
diff --git a/modules/home-manager/application/zathura/default.nix b/modules/home-manager/application/zathura/default.nix
deleted file mode 100644
index d710830..0000000
--- a/modules/home-manager/application/zathura/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, config, ... }:
-with lib;
-let
-  cfg = config.modules.application.zathura;
-in
-{
-  options.modules.application.zathura = {
-    enable = mkEnableOption "enable Zathura PDF viewer";
-  };
-  config = mkIf cfg.enable {
-    programs.zathura = {
-      enable = true;
-      options = {
-        selection-clipboard = "clipboard";
-        font = "Fira Sans 12";
-        recolor = true;
-      };
-    };
-    xdg.mimeApps.defaultApplications = {
-        "application/pdf" = "org.pwmt.zathura.desktop";
-    };
-  };
-}
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 5fe7f9b..0e02297 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -1,15 +1,12 @@
 { ... }:
 {
   imports = [
-    ./application/imv
-    ./application/zathura
     ./cli/neovim
     ./cli/vifm
     ./cli/zsh
     ./desktop/sway
     ./gaming/lutris
     ./video/kdenlive
-    ./video/mpv
     ./web/firefox
     ./web/qutebrowser/default.nix
     ./web/webcord
diff --git a/modules/home-manager/video/mpv/default.nix b/modules/home-manager/video/mpv/default.nix
deleted file mode 100644
index f208476..0000000
--- a/modules/home-manager/video/mpv/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, config, ... }:
-with lib;
-let
-  cfg = config.modules.video.mpv;
-in
-{
-  options.modules.video.mpv = {
-    enable = mkEnableOption "enable MPV video player";
-  };
-  config = mkIf cfg.enable {
-    programs.mpv = {
-      enable = true;
-      config = {
-        hwdec = "auto-safe";
-        vo = "gpu";
-        profile = "gpu-hq";
-        gpu-context = "wayland";
-      };
-    };
-    xdg.mimeApps.defaultApplications = {
-      "video/*" = "mpv.desktop";
-    };
-  };
-}
diff --git a/modules/home-manager/web/firefox/conf/preferences.nix b/modules/home-manager/web/firefox/conf/preferences.nix
index f7ad1a3..9158bf0 100644
--- a/modules/home-manager/web/firefox/conf/preferences.nix
+++ b/modules/home-manager/web/firefox/conf/preferences.nix
@@ -40,7 +40,4 @@
  "browser.startup.homepage_override.mstone" = "ignore";
 
  "browser.aboutHomeSnippets.updateUrl" = "";
-
-# Restore session when restart
- "browser.sessionstore.resume_session_once" = true;
 }
diff --git a/modules/home-manager/web/firefox/conf/suggest.nix b/modules/home-manager/web/firefox/conf/suggest.nix
index bd5adbb..34c01fc 100644
--- a/modules/home-manager/web/firefox/conf/suggest.nix
+++ b/modules/home-manager/web/firefox/conf/suggest.nix
@@ -15,11 +15,10 @@
   "browser.urlbar.suggest.trending" = false;
   "browser.urlbar.suggest.weather" = false;
   "browser.urlbar.suggest.searches" = false;
-  "browser.urlbar.suggest.topsites" = false;
 
-# Enable Search Keyword
+# Disable Search Keyword
 # When you mistype some url, Firefox starts a search even from urlbar. This
 # feature is useful for quick searching, but may harm your privacy, when it's
 # unintended.
- "keyword.enabled" = true;
+ "keyword.enabled" = false;
 }
diff --git a/modules/home-manager/web/firefox/conf/theme.nix b/modules/home-manager/web/firefox/conf/theme.nix
index 94e8e94..1e77222 100644
--- a/modules/home-manager/web/firefox/conf/theme.nix
+++ b/modules/home-manager/web/firefox/conf/theme.nix
@@ -30,7 +30,5 @@
 
 # disable funsking malwares
  "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.havePinned" = "";
- "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "";
- "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts" = false;
  "browser.newtabpage.pinned" = "";
 }
diff --git a/modules/home-manager/web/firefox/default.nix b/modules/home-manager/web/firefox/default.nix
index f9295ce..018c873 100644
--- a/modules/home-manager/web/firefox/default.nix
+++ b/modules/home-manager/web/firefox/default.nix
@@ -61,8 +61,6 @@ in
             "Bing".metaData.hidden = true;
             "Google".metaData.hidden = true;
             "Amazon.fr".metaData.hidden = true;
-            "Facebook".metaData.hidden = true;
-            "youtube".metaData.hidden = true;
           };
         };
         settings = merge [
diff --git a/nixos/default.nix b/nixos/default.nix
index 3bc4b56..261945c 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -67,6 +67,9 @@
       ] ++ (if hostConfig.desktop then 
         [
           ../home-manager/foot.nix
+          ../home-manager/zathura.nix
+          ../home-manager/imv.nix
+          ../home-manager/mpv
         ]
         else []
       )  ++ lib.optional (