diff --git a/.config/bash_aliases b/.config/bash_aliases
index e433ff8..0e35fef 100644
--- a/.config/bash_aliases
+++ b/.config/bash_aliases
@@ -1,3 +1,4 @@
 alias ls='ls -lahtr'
-alias vi='vim'
+alias vi='kak'
 alias df='/usr/bin/git --git-dir=$HOME/.dotfilesrepo/ --work-tree=$HOME'
+alias unpack='dtrx'
diff --git a/.config/kak/kakrc b/.config/kak/kakrc
new file mode 100644
index 0000000..310dad1
--- /dev/null
+++ b/.config/kak/kakrc
@@ -0,0 +1,11 @@
+colorscheme gruvbox-dark
+
+# Use 4 spaces for indentation.
+# indentwidth controls Kakoune's indentation commands; tabstop controls display width.
+set-option global tabstop 4
+set-option global indentwidth 4
+
+# Kakoune does not have a Vim-style 'expandtab' option. Make a literal Tab key
+# insert four spaces instead of a tab character while in insert mode.
+map global insert <tab> '<space><space><space><space>'
+
diff --git a/install_the_dotfiles.sh b/install_the_dotfiles.sh
index 5bbc1ab..ea5bf1f 100644
--- a/install_the_dotfiles.sh
+++ b/install_the_dotfiles.sh
@@ -1,14 +1,14 @@
 # TODO:
-# - [x] Mount /krk-pc on startup
 #     - [x] Add server SSH keys and PC ssh keys
 # - [ ] Mount /proton on startup
 # - [x] Hibernate if not using PC for 10 minutes
 #
-# - [ ] Mount /lenovo-laptop
-# - [ ] Mount server /server-vps
+# - [x] Mount /lenovo-laptop
+# - [x] Mount server /server-vps
 #
-# - [ ] Combine apps + bin + bookmarks
-#   - [ ] Use .desktop file name instead of "Name" parameter
+# - [x] Combine apps + bin + bookmarks
+#   - [x] Use .desktop file name instead of "Name" parameter
+# - [ ] Firefox bookmarks
 # - [x] everything relevant wmenu browser (programs and scripts without arguments, bookmarks, files)
 #   - [x] plocate + wmenu > xdg-open
 #   - [x] applications + bin folder
@@ -31,7 +31,7 @@
 # exit # exit user to reload config
  
 ## Basic utilities
-# sudo apt install -y clang cmake build-essential make tcc vim ripgrep curl git man-db plocate tmux zip unzip fzf
+# sudo apt install -y clang cmake build-essential make tcc vim ripgrep curl git man-db plocate tmux fzf dtrx
 # sudo updatedb
 
 ## Update grub to not wait on bootloader screen @todo: automate
diff --git a/setup.sh b/setup.sh
index 69778e6..7b40182 100644
--- a/setup.sh
+++ b/setup.sh
@@ -9,3 +9,12 @@ ln -sf $SRC/bin $HOME/bin
 
 mkdir -p $HOME/.local/share/fonts
 cp $SRC/.local/share/fonts/* $HOME/.local/share/fonts/.
+
+# Install kakoune
+wget https://github.com/mawww/kakoune/releases/download/v2026.05.21/kakoune-v2026.05.21-linux.tar.bz2
+unpack kakoune-v2026.05.21-linux.tar.bz2
+cd kakoune-v2026.05.21-linux
+sudo cp -r bin/* /usr/local/bin/
+sudo cp -r libexec/* /usr/local/libexec/
+sudo cp -r share/* /usr/local/share/
+cd ..