diff --git a/configuration.nix b/configuration.nix
index aa8a316..e66ffaa 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,6 +9,7 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ./desktop-environment.nix
+      ./terminal-environment.nix
     ];
 
   # Bootloader.
@@ -57,39 +58,17 @@
     shell = pkgs.zsh;
   };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
+        # List packages installed in system profile. To search, run:
+        # $ nix search wget
   environment.systemPackages = with pkgs; [
-  vim
-  wget
-  git
-  neovim
-  python313Packages.pynvim
-  networkmanager
-  epiphany
-  nodejs_24
-  cmake
-  hyfetch
-  elan
-  gnat15
-  ghdl-llvm
-  gtkwave
-  gnumake
-  alire
-  rustup
-  yosys
-  openroad
-  verilator
-  iverilog
-  cargo
-  docker
-  rustfmt
+        wget
+        networkmanager
+        epiphany
+        nodejs_24
+        cmake
+        docker
   ];
 
-  programs.zsh = {
-	enable = true;
-  };
-
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
diff --git a/terminal-environment.nix b/terminal-environment.nix
new file mode 100644
index 0000000..315d932
--- /dev/null
+++ b/terminal-environment.nix
@@ -0,0 +1,59 @@
+{ pkgs, ... }:
+{
+    environment.systemPackages = with pkgs; [
+        vim
+        neovim
+        python313Packages.pynvim
+        git
+        hyfetch
+    ];
+
+    programs.tmux = {
+        enable = true;
+        clock24 = true;
+        extraConfig = ''
+
+        '';
+    };
+
+    programs.zsh = {
+        enable = true;
+        enableCompletion = true;
+        autosuggestions.enable = true;
+        syntaxHighlighting.enable = true;
+
+        histSize = 4096;
+        histFile = "$HOME/.zsh_history";
+        setOptions = [
+            "HIST_IGNORE_ALL_DUPS"
+            "VI_MODE_RESET_PROMPT_ON_MODE_CHANGE=true"
+        ];
+
+        shellAliases = {
+            ll = "ls -lh";
+            nix-check = "nixos-rebuild build";
+            nix-update = "sudo nixos-rebuild switch";
+            sirc = "ssh -t nichkara.eu tmux new-session -A -s weechat weechat";
+        };
+
+        ohMyZsh = {
+            enable = true;
+            plugins = [
+              "git"
+              "z"
+              "dotenv"
+              "autoenv"
+              "battery"
+              "emoji"
+              "emoji-clock"
+              "fzf"
+              "kitty"
+              "sudo"
+              "themes"
+              "tmux"
+              "vi-mode"
+            ];
+            theme = "smt";
+        };
+    };
+}