diff --git a/flake.nix b/flake.nix
index 0dcb0b5..adf66cc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -118,7 +118,7 @@
     };
 
     packages = forAllSystems (pkgs: {
-      devkit = import ./packages/devkit {inherit pkgs;};
+      devkit = import ./packages/devkit {inherit pkgs inputs;};
     });
   };
 }
diff --git a/modules/home-manager/devkit.nix b/modules/home-manager/devkit.nix
index e1eba63..7cef5be 100644
--- a/modules/home-manager/devkit.nix
+++ b/modules/home-manager/devkit.nix
@@ -100,7 +100,6 @@ in {
     programs.ghostty = lib.mkIf cfg.ghostty.enable {
       enable = true;
       package = devkitPkgs.ghostty;
-      # package = pkgs.ghostty;
     };
 
     ## Git
@@ -135,53 +134,19 @@ in {
       # package = pkgs.yazi;
     };
 
-    ## Zellij (Terminal multiplexer)
-    #
+    # Zellij (Terminal multiplexer)
+
     # CURRENTLY BORKED https://github.com/zellij-org/zellij/issues/3970
-    #
-    # programs.zellij = lib.mkIf cfg.zellij.enable {
-    #   enable = true;
-    #   package = devkitPkgs.zellij;
-    #   # package = pkgs.zellij;
-    # };
+
+    programs.zellij = lib.mkIf cfg.zellij.enable {
+      enable = true;
+      package = devkitPkgs.zellij;
+    };
 
     ## Tmux (Backup terminal multiplexer)
     programs.tmux = lib.mkIf cfg.tmux.enable {
       enable = true;
       package = devkitPkgs.tmux;
-      # baseIndex = 1;
-      # keyMode = "vi";
-      # mouse = true;
-      # prefix = "Ctrl-G";
-      # shell = lib.getExe config.programs.zsh.package;
-      # terminal = "screen-256color";
-      # plugins = with pkgs; [
-      #   {
-      #     plugin = tmuxPlugins.catppuccin.overrideAttrs (_: {
-      #       src = fetchFromGitHub {
-      #         owner = "guz013";
-      #         repo = "frappuccino-tmux";
-      #         rev = "4255b0a769cc6f35e12595fe5a33273a247630aa";
-      #         sha256 = "0k8yprhx5cd8v1ddpcr0dkssspc17lq2a51qniwafkkzxi3kz3i5";
-      #       };
-      #     });
-      #   }
-      #   {plugin = tmuxPlugins.better-mouse-mode;}
-      #   {
-      #     plugin = tmuxPlugins.mkTmuxPlugin {
-      #       pluginName = "tmux.nvim";
-      #       version = "unstable-2024-04-05";
-      #       src = fetchFromGitHub {
-      #         owner = "aserowy";
-      #         repo = "tmux.nvim";
-      #         rev = "63e9c5e054099dd30af306bd8ceaa2f1086e1b07";
-      #         sha256 = "0ynzljwq6hv7415p7pr0aqx8kycp84p3p3dy4jcx61dxfgdpgc4c";
-      #       };
-      #     };
-      #   }
-      #   {plugin = tmuxPlugins.resurrect;}
-      #   {plugin = tmuxPlugins.continuum;}
-      # ];
     };
 
     ## ZSH (Default shell)
diff --git a/packages/devkit/default.nix b/packages/devkit/default.nix
index ec33f03..929ab52 100644
--- a/packages/devkit/default.nix
+++ b/packages/devkit/default.nix
@@ -1,4 +1,9 @@
-{pkgs}: rec {
+{
+  pkgs,
+  inputs,
+}: let
+  unstable = import inputs.nixpkgs-unstable {inherit (pkgs) system;};
+in rec {
   ghostty = pkgs.callPackage ./ghostty {};
   git = pkgs.callPackage ./git {};
   lazygit = pkgs.callPackage ./lazygit {};
@@ -6,6 +11,9 @@
   tmux = pkgs.callPackage ./tmux {shell = zsh;};
   yazi = pkgs.callPackage ./yazi {};
   # CURRENTLY BORKED https://github.com/zellij-org/zellij/issues/3970
-  # zellij = pkgs.callPackage ./zellij {shell = zsh;};
+  zellij = pkgs.callPackage ./zellij {
+    shell = zsh;
+    zellij = unstable.zellij;
+  };
   zsh = pkgs.callPackage ./zsh {};
 }
diff --git a/packages/devkit/tmux/config.conf b/packages/devkit/tmux/config.conf
index 31428f0..7217149 100644
--- a/packages/devkit/tmux/config.conf
+++ b/packages/devkit/tmux/config.conf
@@ -32,10 +32,11 @@ bind 'j' select-pane -D # move down after prefix
 bind 'k' select-pane -U # move up after prefix
 bind 'l' select-pane -R # move right after prefix
 
-bind -n 'C-h' select-pane -L # move left
-bind -n 'C-j' select-pane -D # move down
-bind -n 'C-k' select-pane -U # move up
-bind -n 'C-l' select-pane -R # move right
+# Conflicts with neovim
+# bind -n 'C-h' select-pane -L # move left
+# bind -n 'C-j' select-pane -D # move down
+# bind -n 'C-k' select-pane -U # move up
+# bind -n 'C-l' select-pane -R # move right
 
 # bind -r 'S-h' resize-pane -L 5
 # bind -r 'S-j' resize-pane -D 5