diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix
index 25e0714..10f5546 100644
--- a/nixos/hosts/Tibo-NixFat/default.nix
+++ b/nixos/hosts/Tibo-NixFat/default.nix
@@ -13,6 +13,7 @@
 
     programs = {
       home-manager.enable = true;
+      zellij.enable = true;
     };
   };
 
diff --git a/nixos/modules-old/utils/default.nix b/nixos/modules-old/utils/default.nix
index e80aac8..c8c89e0 100644
--- a/nixos/modules-old/utils/default.nix
+++ b/nixos/modules-old/utils/default.nix
@@ -6,6 +6,5 @@
     ./tea
     ./vifm
     ./vim
-    ./zellij
   ];
 }
diff --git a/nixos/modules-old/utils/zellij/default.nix b/nixos/modules-old/utils/zellij/default.nix
deleted file mode 100644
index b84eb71..0000000
--- a/nixos/modules-old/utils/zellij/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  home-manager.users.tdpeuter.home = {
-    packages = with pkgs; [
-      zellij
-    ];
-
-    file.".config/zellij".source = ../../../../stow/zellij/.config/zellij;
-  };
-
-  fonts.fonts = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk
-  ];
-}
diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix
index 73b1132..17e5627 100644
--- a/nixos/modules/programs/default.nix
+++ b/nixos/modules/programs/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
     ./home-manager
+    ./zellij
   ];
 }
diff --git a/nixos/modules/programs/zellij/default.nix b/nixos/modules/programs/zellij/default.nix
new file mode 100644
index 0000000..db81b28
--- /dev/null
+++ b/nixos/modules/programs/zellij/default.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.sisyphus.programs.zellij;
+in {
+  options.sisyphus.programs.zellij.enable = lib.mkEnableOption "Zellij";
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      zellij
+    ];
+
+    fonts.fonts = with pkgs; [
+      noto-fonts
+      noto-fonts-cjk
+    ];
+  };
+}
diff --git a/nixos/modules/users/tdpeuter/default.nix b/nixos/modules/users/tdpeuter/default.nix
index e0cd766..e698d55 100644
--- a/nixos/modules/users/tdpeuter/default.nix
+++ b/nixos/modules/users/tdpeuter/default.nix
@@ -3,7 +3,7 @@
 let
   cfg = config.sisyphus.users.tdpeuter;
 
-  installedPkgs = config.home-manager.users.tdpeuter.home.packages;
+  installedPkgs = config.environment.systemPackages ++ config.home-manager.users.tdpeuter.home.packages;
 in {
   options.sisyphus.users.tdpeuter.enable = lib.mkEnableOption "user Tibo De Peuter";