diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index 31ee485..76e90f6 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -34,7 +34,6 @@ in {
           if config.my.gui.isNvidia
           then ["nvidia"]
           else options.services.xserver.videoDrivers.default;
-        windowManager.i3.enable = true;
         layout = "fr";
         xkbVariant = "us";
         libinput = {
@@ -51,10 +50,8 @@ in {
     environment.systemPackages = builtins.attrValues {
       inherit
         (pkgs)
-        chrysalis
-        evince
+        discord
         feh
-        firefox
         ffmpeg
         gimp-with-plugins
         imagemagick
@@ -69,11 +66,7 @@ in {
         zathura
         ;
 
-      inherit (pkgs.gnome) nautilus;
-
       inherit (pkgs.libsForQt5) okular;
-
-      discord = pkgs.discord.override {nss = pkgs.nss_latest;};
     };
 
     networking.networkmanager = {
diff --git a/home/x/i3.nix b/home/x/i3.nix
index 665a237..0fefa09 100644
--- a/home/x/i3.nix
+++ b/home/x/i3.nix
@@ -6,11 +6,12 @@
 }: let
   inherit
     (lib)
+    mkEnableOption
     mkIf
     mkOptionDefault
     ;
 
-  isEnabled = config.my.home.x.enable;
+  isEnabled = config.my.home.x.i3.enable;
 
   myTerminal =
     # FIXME: fix when terminal is setup in home
@@ -26,6 +27,10 @@
 
   i3Theme = config.my.theme.i3Theme;
 in {
+  options.my.home.x.i3 = {
+    enable = mkEnableOption "i3wm configuration";
+  };
+
   config = mkIf isEnabled {
     my.home = {
       flameshot.enable = true;