diff --git a/users/core.nix b/users/core.nix
deleted file mode 100644
index 88c2205..0000000
--- a/users/core.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-  home-manager.users.rafiyq = {
-    # Emacs
-   # programs.emacs = {
-   #   enable = true;
-   #   #package = pkgs.emacsGit;
-   # };
-
-    # Git
-    programs.git = {
-      enable = true;
-      userEmail = "rafiyqw@tutanota.com";
-      userName = "Rafiyq Widianto";
-    };
-
-    # Tmux
-    programs.tmux = {
-      enable = true;
-      historyLimit = 500;
-      keyMode = "emacs";
-      terminal = "screen-256color";
-      extraConfig = ''
-        set -g mouse on
-        set -g status-bg colour234
-        set -g status-fg colour205
-        set -g status-left ' #[fg=colour250]#S '
- 
-        setw -g windows-status-current-format ' #I#[fg=colour250]:[fg=colour255]#W#[fg=colour50]#F '
-        setw -g windows-status-format ' #I#[fg=colour236:#[fg=colour250]#W#[fg=colour244]#F '
-
-        set -g status-right '#[fg=colour233,bg=clour241,bold] %a %d %b #[fg=colour233,bg=colour245,bold] %I:%M:%P '
-
-        set -g pane-active-border-style fg=colour205
-      '';
-    };
-
-    # Vim
-    programs.vim = {
-      enable = true;
-      settings = {
-        expandtab = true;
-        number = true;
-        shiftwidth = 2;
-        tabstop = 2;
-      };
-      extraConfig = ''
-        syntax on
-        set hlsearch
-      '';
-    };
-
-    # Z shell
-    programs.zsh = {
-      enable = true;
-	    autocd = true;
-      defaultKeymap= "emacs";
-      dotDir = ".config/zsh";
-	    enableAutosuggestions = true;
-	    enableCompletion = true;
-	    history = {
-	      size = 500;
-	      save = 1000;
-	      path = ".config/zsh/zsh_history";
-	    };
-	    localVariables = {
-	      PROMPT = "%B%F{171}%n%F{135}@%F{99}%M%b %F{81}%~ %f%# ";
-	      # RPROMPT = \$vcs_info_msg_0_ ;
-	    };
-	    shellAliases = {
-	      ls = "ls --color=auto";
-	      ll = "ls -AlFH";
-	      grep = "grep --color=auto";
-	      fgrep = "fgrep --color=auto";
-	      egrep = "egrep --color=auto";
-	    };
-    };
-
-    home.homeDirectory = "/home/rafiyq";
-    home.packages = with pkgs; [
-      #cli
-      wget curl htop
-      unrar unzip zip
-     # sshfs cifs-utils ms-sys ntfs3g
-      gptfdisk parted
-      aria2 youtube-dl
-
-      #other
-      vanilla-dmz
-      #yaru-theme
-    ];
-
-    systemd.user.startServices = true;
-  };
-}
diff --git a/users/programs/core.nix b/users/programs/core.nix
new file mode 100644
index 0000000..bbe0828
--- /dev/null
+++ b/users/programs/core.nix
@@ -0,0 +1,75 @@
+{ config, lib, pkgs, ... }: {
+
+  home-manager.users.rafiyq.programs = {
+    #emacs = {
+    #  enable = true;
+    #  package = pkgs.emacsGit;
+    #};
+
+    git = {
+      enable = true;
+      userEmail = "rafiyqw@tutanota.com";
+      userName = "Rafiyq Widianto";
+    };
+
+    tmux = {
+      enable = true;
+      historyLimit = 500;
+      keyMode = "emacs";
+      terminal = "screen-256color";
+      extraConfig = ''
+        set -g mouse on
+        set -g status-bg colour234
+        set -g status-fg colour205
+        set -g status-left ' #[fg=colour250]#S '
+ 
+        setw -g windows-status-current-format ' #I#[fg=colour250]:[fg=colour255]#W#[fg=colour50]#F '
+        setw -g windows-status-format ' #I#[fg=colour236:#[fg=colour250]#W#[fg=colour244]#F '
+
+        set -g status-right '#[fg=colour233,bg=clour241,bold] %a %d %b #[fg=colour233,bg=colour245,bold] %I:%M:%P '
+
+        set -g pane-active-border-style fg=colour205
+      '';
+    };
+
+    vim = {
+      enable = true;
+      settings = {
+        expandtab = true;
+        number = true;
+        shiftwidth = 2;
+        tabstop = 2;
+      };
+      extraConfig = ''
+        syntax on
+        set hlsearch
+      '';
+    };
+
+    zsh = {
+      enable = true;
+      autocd = true;
+      defaultKeymap= "emacs";
+      dotDir = ".config/zsh";
+      enableAutosuggestions = true;
+      enableCompletion = true;
+      history = {
+        size = 500;
+        save = 1000;
+        path = ".config/zsh/zsh_history";
+      };
+      localVariables = {
+        PROMPT = "%B%F{171}%n%F{135}@%F{99}%M%b %F{81}%~ %f%# ";
+        #RPROMPT = \$vcs_info_msg_0_ ;
+      };
+      shellAliases = {
+        ls = "ls --color=auto";
+        ll = "ls -AlFH";
+        grep = "grep --color=auto";
+        fgrep = "fgrep --color=auto";
+        egrep = "egrep --color=auto";
+      };
+    };
+
+  };
+}
diff --git a/users/programs/home.nix b/users/programs/home.nix
new file mode 100644
index 0000000..0ec8a17
--- /dev/null
+++ b/users/programs/home.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.users.rafiyq.home = {
+    homeDirectory = "/home/rafiyq";
+    packages = with pkgs; [
+      #cli
+      wget curl
+      htop
+      p7zip
+      #sshfs cifs-utils ms-sys ntfs3g
+      gptfdisk parted
+      aria2 youtube-dl
+
+      #other
+      vanilla-dmz
+      #yaru-theme
+    ];
+  };
+}