diff --git a/modules/home/system/default.nix b/modules/home/default.nix
similarity index 100%
rename from modules/home/system/default.nix
rename to modules/home/default.nix
diff --git a/modules/nixos/cli/default.nix b/modules/nixos/cli/default.nix
deleted file mode 100644
index cb84398..0000000
--- a/modules/nixos/cli/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [ ];
-
-  options.cli = { };
-
-  config = lib.mkMerge [
-    {
-      programs.zsh.enable = true;
-      users.defaultUserShell = pkgs.zsh;
-      environment.pathsToLink = [ "/share/zsh" ]; # enables completion
-    }
-    {
-      environment.systemPackages = with pkgs; [
-        p7zip
-      ];
-    }
-  ];
-}
diff --git a/systems/x86_64-linux/common.nix b/systems/x86_64-linux/common.nix
index eb507c3..6c86ad7 100644
--- a/systems/x86_64-linux/common.nix
+++ b/systems/x86_64-linux/common.nix
@@ -1,3 +1,7 @@
+{ pkgs, ... }:
+let
+  inherit (pkgs) zsh;
+in
 {
   system.mainUser = {
     name = "rafiq";
@@ -5,5 +9,12 @@
     email = "rafiq@rrv.sh";
   };
   server.mountHelios = true;
+
+  users.defaultUserShell = zsh;
+  programs = {
+    zsh.enable = true;
+    zsh.enableCompletion = true;
+  };
+
   nixpkgs.hostPlatform = "x86_64-linux";
 }