diff --git a/.gitmodules b/.gitmodules
index 85c3d73..46bc35a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,9 +16,6 @@
 [submodule "vim/ale"]
 	path = vim/bundle/ale
 	url = https://github.com/dense-analysis/ale.git
-[submodule "vim/bundle/YouCompleteMe"]
-	path = vim/bundle/YouCompleteMe
-	url = https://github.com/ycm-core/YouCompleteMe.git
 [submodule "vim/bundle/vim-javascript"]
 	path = vim/bundle/vim-javascript
 	url = https://github.com/pangloss/vim-javascript.git
@@ -40,3 +37,15 @@
 [submodule "vim/bundle/nerdtree-git-plugin"]
 	path = vim/bundle/nerdtree-git-plugin
 	url = https://github.com/Xuyuanp/nerdtree-git-plugin.git
+[submodule "ohmyzsh"]
+	path = ohmyzsh
+	url = https://github.com/ohmyzsh/ohmyzsh
+[submodule "vim/bundle/coc.nvim"]
+	path = vim/bundle/coc.nvim
+	url = https://github.com/neoclide/coc.nvim
+[submodule "vim/bundle/vim-tsx"]
+	path = vim/bundle/vim-tsx
+	url = https://github.com/ianks/vim-tsx
+[submodule "vim/bundle/typescript-vim"]
+	path = vim/bundle/typescript-vim
+	url = https://github.com/leafgarland/typescript-vim
diff --git a/ohmyzsh b/ohmyzsh
new file mode 160000
index 0000000..079e7bb
--- /dev/null
+++ b/ohmyzsh
@@ -0,0 +1 @@
+Subproject commit 079e7bb5e0a79171f3356d55d3f6302a82645a39
diff --git a/per-host/pop-os/.tmux.conf b/per-host/pop-os/.tmux.conf
index 36fcf47..fc4df0c 100644
--- a/per-host/pop-os/.tmux.conf
+++ b/per-host/pop-os/.tmux.conf
@@ -1 +1,2 @@
 source ~/.tmux.conf-common
+set-option -g default-shell /usr/bin/zsh
diff --git a/ssh/config b/ssh/config
index 07ff3a5..45fb77c 100644
--- a/ssh/config
+++ b/ssh/config
@@ -1 +1,5 @@
 AddKeysToAgent yes
+
+Host gubal gubal.reya.zone *.gubal.reya.zone *.gubal
+  Hostname gubal.reya.zone
+  Port 38922
diff --git a/ssh/known_hosts b/ssh/known_hosts
index fcb650e..28a0d02 100644
--- a/ssh/known_hosts
+++ b/ssh/known_hosts
@@ -16,3 +16,6 @@
 |1|UXmFKb5wjjZ5iGtGSZ099yBaenk=|RuIc0EUTGmK8ltyUBcrsaF162lY= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH3lyVUFQqPKY+N8qHGBjYXN3VHH8uJ7V0o+ShHD+F4U
 |1|i0CsoRueseNf8B7cCxiUvZ7k29A=|aEeBDvhhA35twmGkVURGeuXrH54= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH3lyVUFQqPKY+N8qHGBjYXN3VHH8uJ7V0o+ShHD+F4U
 |1|d8OLLorLCCXMtVajXfgYPXskzkU=|xf54TNfvTAIMITBni5j+TlT4PpE= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJlMarFOQGASd9uyjtce5qavwQbllPQCPg3Uk5V6g+SRsLtvT9xhb5McFT+QhTgKeRr+vl7mBuR9rva9yEn2Y7U=
+|1|id58ibGL+x8WWYCVPrD7HcI4P4I=|2UazmDoZT/o8+1htHQ1Vs3++nys= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMdn5sEnX3ZHIcvOqzcJ94+v58mzmvsoOLgNUXKSEze8POd0r/lSKt4602EKF8qWEDPI11sogDh7gQmKsKn1wkE=
+|1|RQk16np814U9RzeVQPsWfvebVc0=|OHHFlNSdfuVxSt5hXbQsy2chLfQ= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMdn5sEnX3ZHIcvOqzcJ94+v58mzmvsoOLgNUXKSEze8POd0r/lSKt4602EKF8qWEDPI11sogDh7gQmKsKn1wkE=
+|1|5gSThmEbwk9RPoxTKSLrMrYZ8N8=|BsdsaUKfdtWFF7+46C1VIVgciFE= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMdn5sEnX3ZHIcvOqzcJ94+v58mzmvsoOLgNUXKSEze8POd0r/lSKt4602EKF8qWEDPI11sogDh7gQmKsKn1wkE=
diff --git a/vim/bundle/YouCompleteMe b/vim/bundle/YouCompleteMe
deleted file mode 160000
index 170bae7..0000000
--- a/vim/bundle/YouCompleteMe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 170bae7975de1ca3e291b535a5230dcdb46ae274
diff --git a/vim/bundle/coc.nvim b/vim/bundle/coc.nvim
new file mode 160000
index 0000000..164bd6b
--- /dev/null
+++ b/vim/bundle/coc.nvim
@@ -0,0 +1 @@
+Subproject commit 164bd6b6113eecc52ae193966783a453bcc04158
diff --git a/vim/bundle/typescript-vim b/vim/bundle/typescript-vim
new file mode 160000
index 0000000..17d85d8
--- /dev/null
+++ b/vim/bundle/typescript-vim
@@ -0,0 +1 @@
+Subproject commit 17d85d8051ba21283e62a9101734981e10b732fd
diff --git a/vim/bundle/vim-tsx b/vim/bundle/vim-tsx
new file mode 160000
index 0000000..77c89c4
--- /dev/null
+++ b/vim/bundle/vim-tsx
@@ -0,0 +1 @@
+Subproject commit 77c89c42e189fefd3c9a632b37b7e3b3b9edf918
diff --git a/vimrc b/vimrc
index 191f8f2..7a9dc4e 100644
--- a/vimrc
+++ b/vimrc
@@ -12,6 +12,8 @@ execute pathogen#infect()
 " Set up vim-gfm-syntax
 let g:gfm_syntax_emoji_conceal = 0
 
+let g:coc_global_extensions = ['coc-tslint-plugin', 'coc-tsserver', 'coc-emmet', 'coc-css', 'coc-html', 'coc-json', 'coc-yank', 'coc-prettier']
+
 " Enable file type based indent configuration and syntax highlighting.
 " Note that when code is pasted via the terminal, vim by default does not detect
 " that the code is pasted (as opposed to when using vim's paste mappings), which
@@ -47,16 +49,7 @@ set foldmethod=syntax
 let javaScript_Fold=1
 set foldcolumn=1
 set foldlevelstart=99
-let g:javascript_conceal_function             = "ƒ"
-let g:javascript_conceal_null                 = "ø"
-let g:javascript_conceal_this                 = "@"
-"let g:javascript_conceal_return               = "⇚"
-let g:javascript_conceal_undefined            = "¿"
-"let g:javascript_conceal_NaN                  = "ℕ"
-let g:javascript_conceal_prototype            = "¶"
-let g:javascript_conceal_static               = "•"
-let g:javascript_conceal_super                = "Ω"
-let g:javascript_conceal_arrow_function       = "⇒"
-let g:javascript_conceal_noarg_arrow_function = "🞅"
-let g:javascript_conceal_underscore_arrow_function = "🞅"
-set conceallevel=1
+set conceallevel=0
+
+au BufNewFile,BufRead *.ts setlocal filetype=typescript
+au BufNewFile,BufRead *.tsx setlocal filetype=typescript.tsx
diff --git a/zshrc b/zshrc
new file mode 100644
index 0000000..f0a97a4
--- /dev/null
+++ b/zshrc
@@ -0,0 +1,101 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH="/home/reya/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="robbyrussell"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment the following line to disable bi-weekly auto-update checks.
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment the following line to automatically update without prompting.
+# DISABLE_UPDATE_PROMPT="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git)
+
+source $ZSH/oh-my-zsh.sh
+
+source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"