diff --git a/users/modules/sh.nix b/users/modules/sh.nix
index 36f4db4..2d229b4 100644
--- a/users/modules/sh.nix
+++ b/users/modules/sh.nix
@@ -1,18 +1,58 @@
-{
-  programs.bash = {
-    enable = true;
-    shellAliases = {
-      rebuild = "sudo nixos-rebuild switch --flake";
-      gs = "git status";
-      ai = "aichat -r %shell% -e";
+{pkgs, ...}: {
+  programs = {
+    bash = {
+      enable = true;
+      shellAliases = {
+        rebuild = "sudo nixos-rebuild switch --flake";
+        gs = "git status";
+        ai = "aichat -r %shell% -e";
+      };
+    };
+
+    # direnv lets us declare a .envrc in each project directory
+    # and updates the shell with the packages specified.
+    direnv = {
+      enable = true;
+      enableBashIntegration = true;
+      nix-direnv.enable = true;
+    };
+
+    # starship is a customisable prompt for any shell
+    starship = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+
+    # Terminal Multiplexing
+    tmux = {
+      enable = true;
+      plugins = with pkgs.tmuxPlugins; [
+        catppuccin
+
+        # Keybind Hints
+        tmux-which-key
+
+        # Status Line Decoration
+        tmux-powerline
+
+        # Session Management between Reboots
+        {
+          plugin = resurrect;
+          extraConfig = ''
+            set -g @resurrect-strategy-nvim 'session'
+          '';
+        }
+        {
+          plugin = continuum;
+          extraConfig = ''
+            set -g @continuum-restore 'on'
+          '';
+        }
+      ];
+      extraConfig = ''
+        set -g default-terminal "tmux-256color"
+        set -ag terminal-overrides ",xterm-256color:RGB"
+      '';
     };
   };
-
-  # direnv lets us declare a .envrc in each project directory
-  # and updates the shell with the packages specified.
-  programs.direnv = {
-    enable = true;
-    enableBashIntegration = true;
-    nix-direnv.enable = true;
-  };
 }
diff --git a/users/modules/tmux.nix b/users/modules/tmux.nix
deleted file mode 100644
index 9bf1a57..0000000
--- a/users/modules/tmux.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{pkgs, ...}: {
-  programs.tmux = {
-    enable = true;
-    plugins = with pkgs.tmuxPlugins; [
-      catppuccin
-      tmux-which-key
-      tmux-powerline
-      {
-        plugin = resurrect;
-        extraConfig = ''
-          set -g @resurrect-strategy-nvim 'session'
-        '';
-      }
-      {
-        plugin = continuum;
-        extraConfig = ''
-          set -g @continuum-restore 'on'
-        '';
-      }
-    ];
-    extraConfig = ''
-      set -g default-terminal "tmux-256color"
-      set -ag terminal-overrides ",xterm-256color:RGB"
-    '';
-  };
-}
diff --git a/users/rafiq.nix b/users/rafiq.nix
index 139265b..c2e6e88 100644
--- a/users/rafiq.nix
+++ b/users/rafiq.nix
@@ -1,7 +1,6 @@
 _: {
   imports = [
     ./modules/git.nix # git specific configs
-    ./modules/tmux.nix # tmux specific configs (might move this)
     ./modules/sh.nix # bash and other shell specific configs
     ./modules/wm.nix # window manager configs
     ./modules/editor.nix # editor specific configs