diff --git a/modules/home-git.nix b/modules/home-git.nix
new file mode 100644
index 0000000..73030c7
--- /dev/null
+++ b/modules/home-git.nix
@@ -0,0 +1,15 @@
+{
+  home.sessionVariables.GIT_CONFIG_GLOBAL = "$HOME/.config/git/config";
+
+  programs.git = {
+    enable = true;
+    userName = "Mohammad Rafiq";
+    userEmail = "mohammadrafiq567@gmail.com";
+    extraConfig = {
+      init.defaultBranch = "prime";
+      push.autoSetupRemote = true;
+      pull.rebase = false;
+      core.editor = "nvim";
+    };
+  };
+}
diff --git a/modules/tmux.nix b/modules/home-tmux.nix
similarity index 95%
rename from modules/tmux.nix
rename to modules/home-tmux.nix
index 1efe2e4..e37c8ba 100644
--- a/modules/tmux.nix
+++ b/modules/home-tmux.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   programs.tmux = {
     enable = true;
diff --git a/users/rafiq/default.nix b/users/rafiq/default.nix
index 956de89..b29d359 100644
--- a/users/rafiq/default.nix
+++ b/users/rafiq/default.nix
@@ -2,7 +2,8 @@
 
 {
   imports = [
-    ../../modules/tmux.nix
+    ../../modules/home-git.nix
+    ../../modules/home-tmux.nix
   ];
 
   home = {
@@ -15,23 +16,15 @@
       pkgs.fastfetch
       pkgs.wl-clipboard
     ];
-    sessionVariables = {
-      GIT_CONFIG_GLOBAL = "$HOME/.config/git/config";
-    };
   };
   
   programs = {
-    git = {
+    bash = {
       enable = true;
-      userName = "Mohammad Rafiq";
-      userEmail = "mohammadrafiq567@gmail.com";
-      extraConfig = {
-        init.defaultBranch = "prime";
-        push.autoSetupRemote = true;
-        pull.rebase = false;
+      shellAliases = {
+        rebuild = "sudo nixos-rebuild switch --flake";
       };
     };
-
     tealdeer = {
       enable = true;
       enableAutoUpdates = true;