diff --git a/configuration.nix b/configuration.nix
index 8557eaf..ce540da 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -16,6 +16,7 @@
       ./system/set-boot.nix
       ./system/set-controller.nix
       ./system/set-desktop.nix
+      ./system/set-dev.nix
       ./system/set-hardware-configuration.nix
       ./system/set-hardware.nix
       ./system/set-locale.nix
diff --git a/home.nix b/home.nix
index afdd36c..3eb269d 100644
--- a/home.nix
+++ b/home.nix
@@ -5,7 +5,6 @@
    ./user/usr-config.nix
    ./user/usr-customization.nix
    ./user/usr-plasma.nix
-   ./user/usr-shell.nix
   ];
   home.stateVersion = "24.05";
   programs.home-manager.enable = true;
diff --git a/packages/pkg-dev.nix b/packages/pkg-dev.nix
index 094b079..99b1649 100644
--- a/packages/pkg-dev.nix
+++ b/packages/pkg-dev.nix
@@ -1,5 +1,7 @@
 { pkgs, pkgs-stable, ... }:
 {
+  programs.zsh.enable = true;
+
   environment.systemPackages =
    (with pkgs; [
     git
diff --git a/system/set-dev.nix b/system/set-dev.nix
index 95bdb4a..103b482 100644
--- a/system/set-dev.nix
+++ b/system/set-dev.nix
@@ -1,4 +1,5 @@
 { pkgs, ... }
 :{
   users.defaultUserShell = pkgs.zsh;
+  programs.zsh.enableCompletion = true;
 }
diff --git a/user/usr-shell.nix b/user/usr-shell.nix
deleted file mode 100644
index 3bfd4f3..0000000
--- a/user/usr-shell.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ home-manager, ... }
-:{
-  programs.zsh.enable = true;
-}