diff --git a/config/starship.toml b/config/starship.toml
index 59f4ecf..4580085 100644
--- a/config/starship.toml
+++ b/config/starship.toml
@@ -6,3 +6,6 @@ symbol=" "
 
 [golang]
 symbol=" "
+
+[gcloud]
+symbol="󱇶  "
diff --git a/git/config b/git/config
index f563825..eff0f88 100644
--- a/git/config
+++ b/git/config
@@ -2,7 +2,7 @@
     defaultBranch = main
 
 [user]
-    email = hadeedji@gmail.com
+    email = me@hadeedahmad.com
     name  = Hadeed Ahmad
 
 [push]
diff --git a/kitty/keys.conf b/kitty/keys.conf
index 3d2fe0e..9fd6380 100644
--- a/kitty/keys.conf
+++ b/kitty/keys.conf
@@ -9,6 +9,7 @@ map kitty_mod+n scroll_line_down
 map kitty_mod+u scroll_page_up
 map kitty_mod+d scroll_page_down
 map kitty_mod+g show_last_command_output
+map kitty_mod+g launch --stdin-source=@last_cmd_output --stdin-add-formatting --type=overlay less +G -r
 
 map kitty_mod+equal change_font_size all +1.0
 map kitty_mod+minus change_font_size all -1.0
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 7eec583..829fe4e 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -4,7 +4,7 @@ font_size   12.0
 enable_audio_bell no
 disable_ligatures cursor
 
-scrollback_lines 4096
+scrollback_lines 65536
 
 enabled_layouts tall
 tab_bar_style hidden
@@ -13,3 +13,8 @@ hide_window_decorations yes
 include keys.conf
 include symbol_map.conf
 include themes/gruvbox.conf
+
+allow_remote_control socket-only
+listen_on unix:/tmp/kitty
+action_alias kitty_scrollback_nvim kitten /home/hadeed/.local/share/nvim/lazy/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py
+map kitty_mod+g kitty_scrollback_nvim --config ksb_builtin_last_cmd_output
diff --git a/kitty/ssh.conf b/kitty/ssh.conf
index 48d358b..4fc496f 100644
--- a/kitty/ssh.conf
+++ b/kitty/ssh.conf
@@ -1,5 +1,6 @@
 env ZDOTDIR=$HOME/.config/zsh
 env REMOTE_HOST=1
+
 copy --dest .config/zsh --exclude 'dot-' $DOTS/zsh
 copy --dest .config/zsh/.zshenv $DOTS/zsh/dot-zshenv
 copy --dest .config/zsh/.zshrc $DOTS/zsh/dot-zshrc
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 92ab499..f53f149 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -54,5 +54,15 @@ return {
   "tpope/vim-unimpaired",
 
   "fladson/vim-kitty",
-  "cljoly/minimal-format.nvim"
+  "cljoly/minimal-format.nvim",
+
+  {
+    'mikesmithgh/kitty-scrollback.nvim',
+    lazy = true,
+    cmd = { 'KittyScrollbackGenerateKittens', 'KittyScrollbackCheckHealth' },
+    event = { 'User KittyScrollbackLaunch' },
+    config = function()
+      require('kitty-scrollback').setup()
+    end,
+  }
 }
diff --git a/zsh/zsh-aliases b/zsh/zsh-aliases
index 0185d06..9452013 100644
--- a/zsh/zsh-aliases
+++ b/zsh/zsh-aliases
@@ -11,9 +11,6 @@ alias la='l -a'
 alias lla='ll -a'
 alias lta='lt -a --ignore-glob=".git"'
 
-alias cc='noglob cc'
-alias wcl='wc -l'
-
 alias s='kitty +kitten ssh'
 
 # vim: filetype=zsh
diff --git a/zsh/zsh-functions b/zsh/zsh-functions
index 48ec76a..71bab79 100644
--- a/zsh/zsh-functions
+++ b/zsh/zsh-functions
@@ -1,5 +1,5 @@
 function cc() python -c "from math import *; print($*)"
-function mkcd() mkdir -p -- $1 && cd -- $1
+alias cc='noglob cc'
 
 function save-ssh-key() {
     mkdir -p "$HOME/.ssh"
@@ -12,10 +12,6 @@ function save-ssh-key() {
     fi
 }
 
-function eik() {
-    kitten edit-in-kitty "$1"
-}
-
 function find-directory() {
     FOLDER=$(fd -t d --hidden | fzf --height="~50%" --reverse)
     if [ -n "$FOLDER" ]; then 
diff --git a/zsh/zsh-options b/zsh/zsh-options
index 1dfcf5f..8f15707 100644
--- a/zsh/zsh-options
+++ b/zsh/zsh-options
@@ -10,6 +10,7 @@ setopt HIST_VERIFY
 setopt INC_APPEND_HISTORY
 setopt RM_STAR_SILENT
 setopt NO_BEEP
+setopt MULTIOS
 
 bindkey -e