diff --git a/dotfiles b/dotfiles
index 5f9d3a2..5960626 100755
--- a/dotfiles
+++ b/dotfiles
@@ -3,6 +3,8 @@
 export ROOT=~/dotfiles
 export DOTFILES=$ROOT
 
+export SCRIPTS=$DOTFILES/install_scripts
+
 case $1 in
     edit)
         $EDITOR $ROOT/config/$2
@@ -15,8 +17,6 @@ case $1 in
     install)
         sudo pacman -Sy python --noconfirm
 
-        SCRIPTS=$DOTFILES/install_scripts
-
         $SCRIPTS/pre-install
 
         $SCRIPTS/install-packages
@@ -27,7 +27,18 @@ case $1 in
         # fi
 
         $SCRIPTS/post-install
+    ;;
+
+    install-server)
+        sudo apt install python3 nvim neofetch docker -y
+
+        $ROOT/install -c "$DOTFILES/install-server.yaml"
+
+        $SCRIPTS/install-z.sh
+
+        $SCRIPTS/chuser.sh
 
+        $SCRIPTS/install-vim.sh
     ;;
 
     *)
diff --git a/install-server.yaml b/install-server.yaml
new file mode 100644
index 0000000..f8558de
--- /dev/null
+++ b/install-server.yaml
@@ -0,0 +1,17 @@
+- defaults:
+    link:
+      create: true
+      relink: true
+      force: true
+
+- clean: ["~"]
+
+- link:
+    ~/.aliases: config/.aliases.sh
+    ~/.config/nvim/init.vim: config/init.vim
+
+- shell:
+    - [git submodule update --init --recursive, Installing submodules]
+
+- create:
+    - ~/.config
diff --git a/install_scripts/install-applications b/install_scripts/install-applications
index 284fcce..7f81f95 100755
--- a/install_scripts/install-applications
+++ b/install_scripts/install-applications
@@ -11,10 +11,4 @@ sudo systemctl enable --now syncthing@$USER
 # Docker
 sudo usermod -aG docker $USER
 
-# Neovim
-sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
-       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-
-nvim +'PlugInstall --sync' +qa
-
-cd ~/.local/share/nvim/plugged/YouCompleteMe && python3 install.py --all 
+$SCRIPTS/install-vim.sh
diff --git a/packages.conf.yaml b/packages.conf.yaml
index dc6b55e..b298a54 100644
--- a/packages.conf.yaml
+++ b/packages.conf.yaml
@@ -33,8 +33,6 @@
     - networkmanager
 
     # Fonts
-    - ttf-roboto
-    - ttf-roboto-mono
     - ttf-fira-code
     - ttf-material-design-icons
     - noto-fonts-emoji
diff --git a/scripts/install-vim.sh b/scripts/install-vim.sh
new file mode 100644
index 0000000..31b7527
--- /dev/null
+++ b/scripts/install-vim.sh
@@ -0,0 +1,7 @@
+# Neovim
+sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
+       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+
+nvim +'PlugInstall --sync' +qa
+
+cd ~/.local/share/nvim/plugged/YouCompleteMe && python3 install.py --all 
\ No newline at end of file