diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
new file mode 100644
index 0000000..cddf22c
--- /dev/null
+++ b/.config/nvim/init.vim
@@ -0,0 +1,103 @@
+call plug#begin('~/.config/nvim/plugged')
+Plug 'tpope/vim-surround'
+Plug 'HerringtonDarkholme/yats', {'for' : 'typescript'}
+Plug 'Shougo/vimproc.vim', {'do' : 'make'}
+Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+Plug 'mhartington/deoplete-typescript', {'for' : 'typescript'}
+Plug 'Quramy/tsuquyomi', {'for' : 'typescript'}
+Plug 'pangloss/vim-javascript', {'for' : 'javascript'}
+Plug 'Quramy/vim-js-pretty-template', {'for' : 'javascript'}
+Plug 'jason0x43/vim-js-indent', {'for' : 'javascript'}
+Plug 'sgur/vim-lazygutter'
+Plug 'tyrannicaltoucan/vim-quantum'
+Plug 'othree/yajs.vim'
+Plug 'ntpeters/vim-better-whitespace'
+Plug 'jiangmiao/auto-pairs'
+Plug 'scrooloose/nerdcommenter'
+Plug 'neovimhaskell/haskell-vim', {'for' : 'haskell'}
+Plug 'scrooloose/nerdtree', {'on' : 'NERDTreeToggle'}
+Plug 'mileszs/ack.vim'
+Plug 'ctrlpvim/ctrlp.vim'
+Plug 'easymotion/vim-easymotion'
+Plug 'neomake/neomake'
+Plug 'chrisbra/Colorizer'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+Plug 'tpope/vim-fugitive'
+Plug 'Yggdroot/indentLine'
+call plug#end()
+
+set relativenumber
+set number
+set hidden
+set nocompatible
+set lazyredraw
+set path+=**
+set wildmenu
+filetype plugin on
+let g:deoplete#enable_at_startup = 1
+if !exists('g:deoplete#omni#input_patterns')
+  let g:deoplete#omni#input_patterns = {}
+endif
+autocmd InsertLeave,CompleteDone * if pumvisible() == 0 | pclose | endif
+inoremap <expr><tab> pumvisible() ? "\<c-n>" : "\<tab>"
+
+autocmd FileType typescript nmap <buffer> <Leader>i : <C-u>echo tsuquyomi#hint()<CR>
+
+let g:quantum_black = 1
+let g:quantum_italics = 1
+colorscheme quantum
+if has("termguicolors")
+  set termguicolors
+endif
+
+set clipboard+=unnamedplus
+
+"Tabs
+set expandtab
+set tabstop=2
+set shiftwidth=2
+
+autocmd! BufWritePost * Neomake
+function! neomake#makers#ft#typescript#EnabledMakers()
+  return ['tslint']
+endfunction
+
+let g:ackprg = 'ag --nogroup --nocolor --column'
+
+let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
+let g:ctrlp_map = '<Leader>p'
+
+set autoindent
+set copyindent
+set smarttab
+
+set smartcase
+
+"Leader keys
+let mapleader="\<Space>"
+noremap <Leader>w :w<CR>
+noremap <Leader>W :w !sudo tee % > /dev/null
+noremap <Leader>q :q<CR>
+noremap <Leader>r :%s/
+noremap <Leader>t :terminal <CR>
+noremap <Leader>f :Ack
+nmap <silent> <leader>ev :e $MYVIMRC<CR>
+nmap <silent> <leader>sv :so $MYVIMRC<CR>
+nnoremap <leader>bd :bd<CR>
+nnoremap <leader>bn :bnext!<CR>
+nnoremap <leader>bp :bprevious!<CR>
+vnoremap < <gv
+vnoremap > >gv
+nnoremap <leader>v :vsplit<CR>
+" " Remap split movement
+nmap <leader>j <c-w>j
+nmap <leader>k <c-w>k
+nmap <leader>h <c-w>h
+nmap <leader>l <c-w>l
+
+"Airline
+let g:airline_theme = "quantum"
+let g:airline#extensions#tabline#enabled = 1
+let g:airline_powerline_fonts = 1
+
diff --git a/.nixpkgs/config.nix b/.nixpkgsOLD/config.nix
similarity index 100%
rename from .nixpkgs/config.nix
rename to .nixpkgsOLD/config.nix
diff --git a/.nixpkgs/node-packages/default.nix b/.nixpkgsOLD/node-packages/default.nix
similarity index 100%
rename from .nixpkgs/node-packages/default.nix
rename to .nixpkgsOLD/node-packages/default.nix
diff --git a/.nixpkgs/node-packages/package.json b/.nixpkgsOLD/node-packages/package.json
similarity index 100%
rename from .nixpkgs/node-packages/package.json
rename to .nixpkgsOLD/node-packages/package.json
diff --git a/.spacemacs b/.spacemacsOLD
similarity index 100%
rename from .spacemacs
rename to .spacemacsOLD
diff --git a/.zshrc b/.zshrc
index 53168ef..d9d3e5c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -49,7 +49,7 @@ HYPHEN_INSENSITIVE="true"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git  ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git docker npm sudo systemd wd cp zsh-autosuggestions sublime zsh-syntax-highlighting zsh-history-substring-search)
+plugins=(git sudo wd cp zsh-autosuggestions sublime zsh-syntax-highlighting zsh-history-substring-search)
 
 # User configuration
 
@@ -65,7 +65,7 @@ source $ZSH/oh-my-zsh.sh
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'
 # else
-  export EDITOR='vim'
+  export EDITOR='nvim'
 # fi
 
 # Compilation flags
@@ -82,15 +82,11 @@ source $ZSH/oh-my-zsh.sh
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
-alias cl="clear && screenfetch"
-alias git="hub"
-alias excerism="/home/gigavinyl/app/excerism"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
-alias cl="clear && screenfetch"
-alias git="hub"
+alias cl="clear && /home/gigavinyl/apps/screenFetch/screenfetch-dev"
+eval "$(hub alias -s)"
 
-screenfetch
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
 
-export PATH=$PATH:/home/gigavinyl/apps
-export PATH=$PATH:/home/gigavinyl/apps/.npm-packages/bin
-export PATH=$PATH:/home/gigavinyl/apps/firefox
+/home/gigavinyl/apps/screenFetch/screenfetch-dev
diff --git a/nixos/configuration.nix b/nixosOLD/configuration.nix
similarity index 100%
rename from nixos/configuration.nix
rename to nixosOLD/configuration.nix
diff --git a/nixos/hardware-configuration.nix b/nixosOLD/hardware-configuration.nix
similarity index 100%
rename from nixos/hardware-configuration.nix
rename to nixosOLD/hardware-configuration.nix