diff --git a/kitty/kitty.conf b/kitty/kitty.conf
new file mode 100644
index 0000000..c44215e
--- /dev/null
+++ b/kitty/kitty.conf
@@ -0,0 +1,52 @@
+font_family FiraCode NerdFont
+tab_bar_style powerline
+font_size 13.0
+tab_bar_min_tabs 1
+tab_powerline_style slanted
+map ctrl+g kitten hints --type=linenum --linenum-action=self nvr -s +{line} {path}
+tab_bar_edge top
+include ./theme.conf
+map f1 new_tab
+map ctrl+shift+w no_op
+map alt+>, no_op
+map alt+< no_op
+
+enabled_layouts splits
+
+map f3 new_tab_with_cwd
+
+# Create a new window splitting the space used by the existing one so that
+# the two windows are placed one above the other
+map f5 launch --location=hsplit --cwd=current
+
+# Create a new window splitting the space used by the existing one so that
+# the two windows are placed side by side
+map f6 launch --location=vsplit --cwd=current
+
+# Create a new window splitting the space used by the existing one so that
+# the two windows are placed side by side if the existing window is wide or
+# one above the other if the existing window is tall.
+map f4 launch --location=split --cwd=current
+
+# Rotate the current split, changing its split axis from vertical to
+# horizontal or vice versa
+map f7 layout_action rotate
+
+# Move the active window in the indicated direction
+map shift+up move_window up
+map shift+left move_window left
+map shift+right move_window right
+map shift+down move_window down
+
+# Move the active window to the indicated screen edge
+map ctrl+shift+up layout_action move_to_screen_edge top
+map ctrl+shift+left layout_action move_to_screen_edge left
+map ctrl+shift+right layout_action move_to_screen_edge right
+map ctrl+shift+down layout_action move_to_screen_edge bottom
+
+# Switch focus to the neighboring window in the indicated direction
+map ctrl+left neighboring_window left
+map ctrl+right neighboring_window right
+map ctrl+up neighboring_window up
+map ctrl+down neighboring_window down
+
diff --git a/kitty/theme.conf b/kitty/theme.conf
new file mode 100644
index 0000000..f645e84
--- /dev/null
+++ b/kitty/theme.conf
@@ -0,0 +1,51 @@
+# vim:ft=kitty
+
+## name:     Catppuccin Kitty Diff Mocha
+## author:   Catppuccin Org
+## license:  MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/themes/diff-mocha.conf
+## blurb:    Soothing pastel theme for the high-spirited!
+
+# text
+foreground           #CDD6F4
+# base
+background           #1E1E2E
+# subtext0
+title_fg             #A6ADC8
+
+# mantle
+title_bg             #181825
+margin_bg            #181825
+
+# subtext1
+margin_fg            #A6ADC8
+# mantle
+filler_bg            #181825
+
+# 30% red, 70% base
+removed_bg           #5E3F53
+# 50% red, 50% base
+highlight_removed_bg #89556B
+# 40% red, 60% base
+removed_margin_bg    #734A5F
+
+# 30% green, 70% base
+added_bg             #475951
+# 50% green, 50% base
+highlight_added_bg   #628168
+# 40% green, 60% base
+added_margin_bg      #546D5C
+
+# mantle
+hunk_margin_bg       #181825
+hunk_bg              #181825
+
+# 40% yellow, 60% base
+search_bg            #A1937B
+# text
+search_fg            #CDD6F4
+# 30% sky, 70% base
+select_bg            #45475A
+# text
+select_fg            #CDD6F4
+