diff --git a/home-manager/modules/shell/zsh/default.nix b/home-manager/modules/shell/zsh/default.nix
index a4bbc42..6bbf80e 100644
--- a/home-manager/modules/shell/zsh/default.nix
+++ b/home-manager/modules/shell/zsh/default.nix
@@ -22,53 +22,16 @@ in {
     programs.zsh = {
       enable = true;
 
-      initExtra = ''
-        function go_dir_up() {
-          cd .. || return 1
-        }
-
-        function zle_go_dir_up() {
-          zle .kill-buffer
-          go_dir_up
-          zle .accept-line
-        }
-
-        fzf-z() {
-            dir=$(z | fzf --tiebreak=index --tac | sed -E 's/^[0-9]+[[:space:]]+//')
-            cd $dir
-        }
-
-        mkcd ()
-        {
-            mkdir -p -- "$1" && cd -P -- "$1"
-        }
-
-        zle -N zle_go_dir_up
-        # Alt+Up
-        bindkey "^[[1;3A" zle_go_dir_up
-
-        # Alt+Down
-        bindkey "^[[1;3B" kill-buffer
-
-        # Up/Down
-        bindkey "^[[A" history-substring-search-up
-        bindkey "^[[B" history-substring-search-down
-
-        # Ctrl+Left/Right
-        bindkey "^[[1;5C" forward-word
-        bindkey "^[[1;5D" backward-word
-
-        # Alt+Left/Right
-        bindkey "^[[1;3C" forward-word
-        bindkey "^[[1;3D" backward-word
-      '';
+      initExtra = builtins.readFile ./key-bindings.zsh
+        + builtins.readFile ./functions.zsh
+        + builtins.readFile ./last-working-dir.zsh
+        + builtins.readFile ./dir-navigation.zsh;
 
       zplug = {
         enable = true;
         plugins = [
           # list of plugins: https://github.com/unixorn/awesome-zsh-plugins
           { name = "agkozak/zsh-z"; }
-          { name = "mdumitru/last-working-dir"; }
           {
             name = "zsh-users/zsh-completions";
           }
diff --git a/home-manager/modules/shell/zsh/dir-navigation.zsh b/home-manager/modules/shell/zsh/dir-navigation.zsh
new file mode 100644
index 0000000..7212a78
--- /dev/null
+++ b/home-manager/modules/shell/zsh/dir-navigation.zsh
@@ -0,0 +1,17 @@
+#!/usr/bin/env zsh
+# Use Alt+Up to go one directory upwards
+
+function go_dir_up() {
+    cd .. || return 1
+}
+
+function zle_go_dir_up() {
+    zle .kill-buffer
+    go_dir_up
+    zle .accept-line
+}
+
+zle -N zle_go_dir_up
+
+# Alt+Up
+bindkey "^[[1;3A" zle_go_dir_up
diff --git a/home-manager/modules/shell/zsh/functions.zsh b/home-manager/modules/shell/zsh/functions.zsh
new file mode 100644
index 0000000..7785a81
--- /dev/null
+++ b/home-manager/modules/shell/zsh/functions.zsh
@@ -0,0 +1,12 @@
+#!/usr/bin/env zsh
+# My custom zsh functions
+
+fzf-z() {
+    dir=$(z | fzf --tiebreak=index --tac | sed -E 's/^[0-9]+[[:space:]]+//')
+    cd $dir
+}
+
+mkcd ()
+{
+    mkdir -p -- "$1" && cd -P -- "$1"
+}
diff --git a/home-manager/modules/shell/zsh/key-bindings.zsh b/home-manager/modules/shell/zsh/key-bindings.zsh
new file mode 100644
index 0000000..6730795
--- /dev/null
+++ b/home-manager/modules/shell/zsh/key-bindings.zsh
@@ -0,0 +1,131 @@
+#!/usr/bin/env zsh
+# Based on the oh-my-zsh default keybinding config: https://github.com/ohmyzsh/ohmyzsh/blob/master/lib/key-bindings.zsh
+
+# Make sure that the terminal is in application mode when zle is active, since
+# only then values from $terminfo are valid
+if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
+  function zle-line-init() {
+    echoti smkx
+  }
+  function zle-line-finish() {
+    echoti rmkx
+  }
+  zle -N zle-line-init
+  zle -N zle-line-finish
+fi
+
+# Use emacs key bindings
+bindkey -e
+
+# [PageUp] - Up a line of history
+if [[ -n "${terminfo[kpp]}" ]]; then
+  bindkey -M emacs "${terminfo[kpp]}" up-line-or-history
+  bindkey -M viins "${terminfo[kpp]}" up-line-or-history
+  bindkey -M vicmd "${terminfo[kpp]}" up-line-or-history
+fi
+# [PageDown] - Down a line of history
+if [[ -n "${terminfo[knp]}" ]]; then
+  bindkey -M emacs "${terminfo[knp]}" down-line-or-history
+  bindkey -M viins "${terminfo[knp]}" down-line-or-history
+  bindkey -M vicmd "${terminfo[knp]}" down-line-or-history
+fi
+
+# Start typing + [Up-Arrow] - fuzzy find history forward
+if [[ -n "${terminfo[kcuu1]}" ]]; then
+  bindkey -M emacs "${terminfo[kcuu1]}" history-substring-search-up
+  bindkey -M viins "${terminfo[kcuu1]}" history-substring-search-up
+  bindkey -M vicmd "${terminfo[kcuu1]}" history-substring-search-up
+fi
+# Start typing + [Down-Arrow] - fuzzy find history backward
+if [[ -n "${terminfo[kcud1]}" ]]; then
+  bindkey -M emacs "${terminfo[kcud1]}" history-substring-search-down
+  bindkey -M viins "${terminfo[kcud1]}" history-substring-search-down
+  bindkey -M vicmd "${terminfo[kcud1]}" history-substring-search-down
+fi
+
+# [Home] - Go to beginning of line
+if [[ -n "${terminfo[khome]}" ]]; then
+  bindkey -M emacs "${terminfo[khome]}" beginning-of-line
+  bindkey -M viins "${terminfo[khome]}" beginning-of-line
+  bindkey -M vicmd "${terminfo[khome]}" beginning-of-line
+fi
+# [End] - Go to end of line
+if [[ -n "${terminfo[kend]}" ]]; then
+  bindkey -M emacs "${terminfo[kend]}"  end-of-line
+  bindkey -M viins "${terminfo[kend]}"  end-of-line
+  bindkey -M vicmd "${terminfo[kend]}"  end-of-line
+fi
+
+# [Shift-Tab] - move through the completion menu backwards
+if [[ -n "${terminfo[kcbt]}" ]]; then
+  bindkey -M emacs "${terminfo[kcbt]}" reverse-menu-complete
+  bindkey -M viins "${terminfo[kcbt]}" reverse-menu-complete
+  bindkey -M vicmd "${terminfo[kcbt]}" reverse-menu-complete
+fi
+
+# [Backspace] - delete backward
+bindkey -M emacs '^?' backward-delete-char
+bindkey -M viins '^?' backward-delete-char
+bindkey -M vicmd '^?' backward-delete-char
+# [Delete] - delete forward
+if [[ -n "${terminfo[kdch1]}" ]]; then
+  bindkey -M emacs "${terminfo[kdch1]}" delete-char
+  bindkey -M viins "${terminfo[kdch1]}" delete-char
+  bindkey -M vicmd "${terminfo[kdch1]}" delete-char
+else
+  bindkey -M emacs "^[[3~" delete-char
+  bindkey -M viins "^[[3~" delete-char
+  bindkey -M vicmd "^[[3~" delete-char
+
+  bindkey -M emacs "^[3;5~" delete-char
+  bindkey -M viins "^[3;5~" delete-char
+  bindkey -M vicmd "^[3;5~" delete-char
+fi
+
+# [Ctrl-Delete] - delete whole forward-word
+bindkey -M emacs '^[[3;5~' kill-word
+bindkey -M viins '^[[3;5~' kill-word
+bindkey -M vicmd '^[[3;5~' kill-word
+
+# [Ctrl-RightArrow] - move forward one word
+bindkey -M emacs '^[[1;5C' forward-word
+bindkey -M viins '^[[1;5C' forward-word
+bindkey -M vicmd '^[[1;5C' forward-word
+# [Ctrl-LeftArrow] - move backward one word
+bindkey -M emacs '^[[1;5D' backward-word
+bindkey -M viins '^[[1;5D' backward-word
+bindkey -M vicmd '^[[1;5D' backward-word
+
+
+bindkey '\ew' kill-region                             # [Esc-w] - Kill from the cursor to the mark
+bindkey -s '\el' 'ls\n'                               # [Esc-l] - run command: ls
+bindkey '^r' history-incremental-search-backward      # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
+bindkey ' ' magic-space                               # [Space] - don't do history expansion
+
+
+# Edit the current command line in $EDITOR
+autoload -U edit-command-line
+zle -N edit-command-line
+bindkey '\C-x\C-e' edit-command-line
+
+# file rename magick
+bindkey "^[m" copy-prev-shell-word
+
+# consider emacs keybindings:
+
+#bindkey -e  ## emacs key bindings
+#
+#bindkey '^[[A' up-line-or-search
+#bindkey '^[[B' down-line-or-search
+#bindkey '^[^[[C' emacs-forward-word
+#bindkey '^[^[[D' emacs-backward-word
+#
+#bindkey -s '^X^Z' '%-^M'
+#bindkey '^[e' expand-cmd-path
+#bindkey '^[^I' reverse-menu-complete
+#bindkey '^X^N' accept-and-infer-next-history
+#bindkey '^W' kill-region
+#bindkey '^I' complete-word
+## Fix weird sequence that rxvt produces
+#bindkey -s '^[[Z' '\t'
+#
diff --git a/home-manager/modules/shell/zsh/last-working-dir.zsh b/home-manager/modules/shell/zsh/last-working-dir.zsh
new file mode 100644
index 0000000..b0f0743
--- /dev/null
+++ b/home-manager/modules/shell/zsh/last-working-dir.zsh
@@ -0,0 +1,20 @@
+#!/usr/bin/zsh
+# My version of the last-working-dir plugin (https://github.com/ohmyzsh/ohmyzsh/blob/master/plugins/last-working-dir/last-working-dir.plugin.zsh)
+
+# Updates the last directory once directory is changed
+autoload -U add-zsh-hook
+add-zsh-hook chpwd chpwd_last_working_dir
+chpwd_last_working_dir() {
+  # Don't run in subshells
+  [[ "$ZSH_SUBSHELL" -eq 0 ]] || return 0
+  pwd > ~/.last-working-dir
+}
+
+# Changes directory to the last working directory
+lwd() {
+    if [[ -r ~/.last-working-dir ]]; then
+        lwd=$(cat ~/.last-working-dir)
+        cd $lwd
+        echo $lwd
+    fi
+}