diff --git a/.zshrc b/.zshrc
deleted file mode 100644
index 572f539..0000000
--- a/.zshrc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Lines configured by zsh-newuser-install
-HISTFILE=~/.histfile
-HISTSIZE=1000
-SAVEHIST=1000
-setopt beep
-setopt autocd
-bindkey -e
-# End of lines configured by zsh-newuser-install
-# The following lines were added by compinstall
-zstyle :compinstall filename '/home/benjamin/.zshrc'
-
-autoload -Uz compinit
-compinit
-# End of lines added by compinstall
-
-alias rebuild="sudo nixos-rebuild switch"
-alias dotfiles="cd ~/dotfiles/"
-alias nv="nvim"
-
-neofetch --ascii /home/benjamin/dotfiles/aperture.txt
diff --git a/home-manager/terminal.nix b/home-manager/terminal.nix
new file mode 100644
index 0000000..112db00
--- /dev/null
+++ b/home-manager/terminal.nix
@@ -0,0 +1,57 @@
+{ pkgs, ... }:
+{
+
+  programs.kitty = {
+    enable = true;
+    shellIntegration.enableZshIntegration = true;
+    font = {
+      name = "JetBrainsMono NF";
+      size = 11;
+    };
+    settings = {
+      enable_audio_bell = "no";
+      window_margin_width = 10;
+      background_opacity = "0.5";
+      confirm_os_window_close = 0;
+    };
+  };
+
+  programs.zsh = {
+    enable = true;
+    autocd = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    initExtra = "neofetch --ascii ~/dotfiles/aperture.txt";
+
+    shellAliases = {
+      rebuild = "sudo nixos-rebuild switch";
+      dotfiles = "cd ~/dotfiles/";
+      nv = "nvim";
+    };
+
+    oh-my-zsh = {
+      enable = true;
+      plugins = [
+        "git"
+        "gh"
+        "bun"
+      ];
+      theme = "robbyrussell";
+    };
+
+    history = {
+      path = "~/.histfile";
+      size = 10000;
+    };
+  };
+  programs.starship = {
+    enable = true;
+    settings = {
+      add_newline = false;
+    };
+  };
+
+  fonts.fontconfig.enable = true;
+  home.packages = [ (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ];
+}
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
deleted file mode 100644
index c4d7db9..0000000
--- a/kitty/kitty.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-font_family JetBrainsMono NF
-
-font_size 11
-
-enable_audio_bell no
-
-window_margin_width 10
-
-background_opacity 0.5
-
-confirm_os_window_close 0
-
diff --git a/nixos/nixos.nix b/nixos/nixos.nix
index 2d96b7b..b4398ca 100644
--- a/nixos/nixos.nix
+++ b/nixos/nixos.nix
@@ -16,8 +16,11 @@ in
     ./nvidia.nix
     ./audio.nix
     ./services.nix
+    ./hyprland.nix
   ];
 
+  environment.shells = with pkgs; [ zsh ];
+  programs.zsh.enable = true;
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.${username} = {
     shell = pkgs.zsh;
@@ -63,7 +66,10 @@ in
     users.${username} = {
       home.username = username;
       home.homeDirectory = "/home/${username}";
-      imports = [ ./home.nix ];
+      imports = [
+        ../home-manager/terminal.nix
+        ./home.nix
+      ];
     };
   };
 
@@ -91,7 +97,6 @@ in
     swaynotificationcenter
     swww
     pywal
-    kitty
     rofi
     emote
     # Screenshots
@@ -100,10 +105,6 @@ in
     swappy
   ];
 
-  programs.zsh.enable = true;
-  programs.starship.enable = true;
-  fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ];
-
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play