diff --git a/dot_vim/vimrc.d/.keep b/dot_config/polybar/.keep
similarity index 100%
rename from dot_vim/vimrc.d/.keep
rename to dot_config/polybar/.keep
diff --git a/dot_dotfiles/.keep b/dot_dotfiles/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/dot_dotfiles/colors/.keep b/dot_dotfiles/colors/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/dot_dotfiles/colors/gruvbox/color.table b/dot_dotfiles/colors/gruvbox/color.table
new file mode 100644
index 0000000..fd6c784
--- /dev/null
+++ b/dot_dotfiles/colors/gruvbox/color.table
@@ -0,0 +1,44 @@
+ GRUVCOLR         HEX       RELATV ALIAS   TERMCOLOR      RGB           ITERM RGB     OSX HEX
+ --------------   -------   ------------   ------------   -----------   -----------   -------
+ dark0_hard       #1d2021   [   ]  [   ]   234 [h0][  ]    29- 32- 33    22- 24- 25   #161819
+ dark0            #282828   [bg0]  [fg0]   235 [ 0][  ]    40- 40- 40    30- 30- 30   #1e1e1e
+ dark0_soft       #32302f   [   ]  [   ]   236 [s0][  ]    50- 48- 47    38- 36- 35   #262423
+ dark1            #3c3836   [bg1]  [fg1]   237 [  ][15]    60- 56- 54    46- 42- 41   #2e2a29
+ dark2            #504945   [bg2]  [fg2]   239 [  ][  ]    80- 73- 69    63- 57- 53   #3f3935
+ dark3            #665c54   [bg3]  [fg3]   241 [  ][  ]   102- 92- 84    83- 74- 66   #534a42
+ dark4            #7c6f64   [bg4]  [fg4]   243 [  ][ 7]   124-111-100   104- 92- 81   #685c51
+
+ gray_245         #928374   [gray] [   ]   245 [ 8][  ]   146-131-116   127-112- 97   #7f7061
+ gray_244         #928374   [   ] [gray]   244 [  ][ 8]   146-131-116   127-112- 97   #7f7061
+
+ light0_hard      #f9f5d7   [   ]  [   ]   230 [  ][h0]   249-245-215   248-244-205   #f8f4cd
+ light0           #fbf1c7   [fg0]  [bg0]   229 [  ][ 0]   251-241-199   250-238-187   #faeebb
+ light0_soft      #f2e5bc   [   ]  [   ]   228 [  ][s0]   242-229-188   239-223-174   #efdfae
+ light1           #ebdbb2   [fg1]  [bg1]   223 [15][  ]   235-219-178   230-212-163   #e6d4a3
+ light2           #d5c4a1   [fg2]  [bg2]   250 [  ][  ]   213-196-161   203-184-144   #cbb890
+ light3           #bdae93   [fg3]  [bg3]   248 [  ][  ]   189-174-147   175-159-129   #af9f81
+ light4           #a89984   [fg4]  [bg4]   246 [ 7][  ]   168-153-132   151-135-113   #978771
+
+ bright_red       #fb4934   [red]   [  ]   167 [ 9][  ]   251- 73- 52   247- 48- 40   #f73028
+ bright_green     #b8bb26   [green] [  ]   142 [10][  ]   184-187- 38   170-176- 30   #aab01e
+ bright_yellow    #fabd2f   [yellow][  ]   214 [11][  ]   250-189- 47   247-177- 37   #f7b125
+ bright_blue      #83a598   [blue]  [  ]   109 [12][  ]   131-165-152   113-149-134   #719586
+ bright_purple    #d3869b   [purple][  ]   175 [13][  ]   211-134-155   199-112-137   #c77089
+ bright_aqua      #8ec07c   [aqua]  [  ]   108 [14][  ]   142-192-124   125-182-105   #7db669
+ bright_orange    #fe8019   [orange][  ]   208 [  ][  ]   254-128- 25   251-106- 22   #fb6a16
+
+ neutral_red      #cc241d   [   ]  [   ]   124 [ 1][ 1]   204- 36- 29   190- 15- 23   #be0f17
+ neutral_green    #98971a   [   ]  [   ]   106 [ 2][ 2]   152-151- 26   134-135- 21   #868715
+ neutral_yellow   #d79921   [   ]  [   ]   172 [ 3][ 3]   215-153- 33   204-136- 26   #cc881a
+ neutral_blue     #458588   [   ]  [   ]    66 [ 4][ 4]    69-133-136    55-115-117   #377375
+ neutral_purple   #b16286   [   ]  [   ]   132 [ 5][ 5]   177- 98-134   160- 75-115   #a04b73
+ neutral_aqua     #689d6a   [   ]  [   ]    72 [ 6][ 6]   104-157-106    87-142- 87   #578e57
+ neutral_orange   #d65d0e   [   ]  [   ]   166 [  ][  ]   214- 93- 14   202- 72- 14   #ca480e
+
+ faded_red        #9d0006   [   ]   [red]   88 [  ][ 9]   157-  0-  6   137-  0-  9   #890009
+ faded_green      #79740e   [   ] [green]  100 [  ][10]   121-116- 14   102- 98- 13   #66620d
+ faded_yellow     #b57614   [   ][yellow]  136 [  ][11]   181-118- 20   165- 99- 17   #a56311
+ faded_blue       #076678   [   ]  [blue]   24 [  ][12]     7-102-120    14- 83-101   #0e5365
+ faded_purple     #8f3f71   [   ][purple]   96 [  ][13]   143- 63-113   123- 43- 94   #7b2b5e
+ faded_aqua       #427b58   [   ]  [aqua]   66 [  ][14]    66-123- 88    53-106- 70   #356a46
+ faded_orange     #af3a03   [   ][orange]  130 [  ][  ]   175- 58-  3   157- 40-  7   #9d2807
diff --git a/dot_dotfiles/colors/gruvbox/dot_dircolors b/dot_dotfiles/colors/gruvbox/dot_dircolors
new file mode 100644
index 0000000..a1389e0
--- /dev/null
+++ b/dot_dotfiles/colors/gruvbox/dot_dircolors
@@ -0,0 +1,297 @@
+# Term Section
+TERM Eterm
+TERM alacritty
+TERM ansi
+TERM color-xterm
+TERM con132x25
+TERM con132x30
+TERM con132x43
+TERM con132x60
+TERM con80x25
+TERM con80x28
+TERM con80x30
+TERM con80x43
+TERM con80x50
+TERM con80x60
+TERM cons25
+TERM console
+TERM cygwin
+TERM dtterm
+TERM dvtm
+TERM dvtm-256color
+TERM eterm-color
+TERM fbterm
+TERM gnome
+TERM gnome-256color
+TERM jfbterm
+TERM konsole
+TERM konsole-256color
+TERM kterm
+TERM linux
+TERM linux-c
+TERM mach-color
+TERM mlterm
+TERM putty
+TERM putty-256color
+TERM rxvt
+TERM rxvt-256color
+TERM rxvt-cygwin
+TERM rxvt-cygwin-native
+TERM rxvt-unicode
+TERM rxvt-unicode256
+TERM rxvt-unicode-256color
+TERM screen
+TERM screen-16color
+TERM screen-16color-bce
+TERM screen-16color-s
+TERM screen-16color-bce-s
+TERM screen-256color
+TERM screen-256color-bce
+TERM screen-256color-s
+TERM screen-256color-bce-s
+TERM screen-256color-italic
+TERM screen-bce
+TERM screen-w
+TERM screen.linux
+TERM screen.xterm-256color
+TERM st
+TERM st-meta
+TERM st-256color
+TERM st-meta-256color
+TERM tmux
+TERM tmux-256color
+TERM vt100
+TERM xterm
+TERM xterm-16color
+TERM xterm-256color
+TERM xterm-256color-italic
+TERM xterm-88color
+TERM xterm-color
+TERM xterm-debian
+TERM xterm-termite
+
+## Documentation
+#
+# standard colors
+#
+# Below are the color init strings for the basic file types. A color init
+# string consists of one or more of the following numeric codes:
+# Attribute codes:
+# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
+# Text color codes:
+# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
+# Background color codes:
+# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
+#
+#
+# 256 color support
+# see here: http://www.mail-archive.com/bug-coreutils@gnu.org/msg11030.html)
+#
+# Text 256 color coding:
+# 38;5;COLOR_NUMBER
+# Background 256 color coding:
+# 48;5;COLOR_NUMBER
+
+## Special files
+
+NORMAL 00;38;5;230 # no color code at all
+#FILE 00 # regular file: use no color at all
+RESET 0 # reset to "normal" color
+DIR 00;38;5;109 # directory 01;34
+LINK 00;38;5;142 # symbolic link. (If you set this to 'target' instead of a
+ # numerical value, the color is as for the file pointed to.)
+MULTIHARDLINK 00 # regular file with more than one link
+FIFO 48;5;229;38;5;239;01 # pipe
+SOCK 48;5;229;38;5;239;01 # socket
+DOOR 48;5;229;38;5;239;01 # door
+BLK 48;5;229;38;5;243;01 # block device driver
+CHR 48;5;229;38;5;243;01 # character device driver
+ORPHAN 48;5;235;38;5;160 # symlink to nonexistent file, or non-stat'able file
+SETUID 48;5;124;38;5;230 # file that is setuid (u+s)
+SETGID 48;5;172;38;5;230 # file that is setgid (g+s)
+#CAPABILITY 30;41 # file with capability
+CAPABILITY 48;5;124;38;5;234 # file with capability
+STICKY_OTHER_WRITABLE   48;5;109;38;5;229 # dir that is sticky and other-writable (+t,o+w)
+OTHER_WRITABLE          48;5;66;38;5;229 # dir that is other-writable (o+w) and not sticky
+STICKY                  48;5;24;38;5;229 # dir with the sticky bit set (+t) and not other-writable
+# This is for files with execute permission:
+EXEC 00;38;5;208
+
+## Archives or compressed (violet + bold for compression)
+.tar    00;38;5;175
+.tgz    00;38;5;171
+.arj    00;38;5;171
+.taz    00;38;5;171
+.lzh    00;38;5;171
+.lzma   00;38;5;171
+.tlz    00;38;5;171
+.txz    00;38;5;171
+.zip    00;38;5;171
+.z      00;38;5;171
+.Z      00;38;5;171
+.dz     00;38;5;171
+.gz     00;38;5;171
+.lz     00;38;5;171
+.xz     00;38;5;171
+.bz2    00;38;5;171
+.bz     00;38;5;171
+.tbz    00;38;5;171
+.tbz2   00;38;5;171
+.tz     00;38;5;171
+.deb    00;38;5;171
+.rpm    00;38;5;171
+.jar    00;38;5;171
+.rar    00;38;5;171
+.ace    00;38;5;171
+.zoo    00;38;5;171
+.cpio   00;38;5;171
+.7z     00;38;5;171
+.rz     00;38;5;171
+.apk    00;38;5;171
+.gem    00;38;5;171
+
+# Image formats (yellow)
+.jpg    00;38;5;108
+.JPG    00;38;5;108 #stupid but needed
+.jpeg   00;38;5;108
+.gif    00;38;5;108
+.bmp    00;38;5;108
+.pbm    00;38;5;108
+.pgm    00;38;5;108
+.ppm    00;38;5;108
+.tga    00;38;5;108
+.xbm    00;38;5;108
+.xpm    00;38;5;108
+.tif    00;38;5;108
+.tiff   00;38;5;108
+.png    00;38;5;108
+.PNG    00;38;5;108
+.svg    00;38;5;108
+.svgz   00;38;5;108
+.mng    00;38;5;108
+.pcx    00;38;5;108
+.dl     00;38;5;108
+.xcf    00;38;5;108
+.xwd    00;38;5;108
+.yuv    00;38;5;108
+.cgm    00;38;5;108
+.emf    00;38;5;108
+.eps    00;38;5;108
+.CR2    00;38;5;108
+.ico    00;38;5;108
+.nef    00;38;5;108 # Nikon RAW format
+.NEF    00;38;5;108
+
+# Files of special interest (base1)
+.tex             00;38;5;214
+.rdf             00;38;5;214
+.owl             00;38;5;214
+.n3              00;38;5;214
+.ttl             00;38;5;214
+.nt              00;38;5;214
+.torrent         00;38;5;214
+.xml             00;38;5;214
+*Makefile        00;38;5;214
+*Rakefile        00;38;5;214
+*Dockerfile      00;38;5;214
+*build.xml       00;38;5;214
+*rc              00;38;5;214
+*1               00;38;5;214
+.nfo             00;38;5;214
+*README          00;38;5;214
+*README.txt      00;38;5;214
+*readme.txt      00;38;5;214
+.md              00;38;5;214
+*README.markdown 00;38;5;214
+.ini             00;38;5;214
+.yml             00;38;5;214
+.cfg             00;38;5;214
+.conf            00;38;5;214
+.h               00;38;5;214
+.hpp             00;38;5;214
+.c               00;38;5;214
+.cpp             00;38;5;214
+.cxx             00;38;5;214
+.cc              00;38;5;214
+.objc            00;38;5;214
+.sqlite          00;38;5;214
+.go              00;38;5;214
+.sql             00;38;5;214
+.csv             00;38;5;214
+
+# "unimportant" files as logs and backups (base01)
+.log        00;38;5;245
+.bak        00;38;5;245
+.aux        00;38;5;245
+.lof        00;38;5;245
+.lol        00;38;5;245
+.lot        00;38;5;245
+.out        00;38;5;245
+.toc        00;38;5;245
+.bbl        00;38;5;245
+.blg        00;38;5;245
+*~          00;38;5;245
+*#          00;38;5;245
+.part       00;38;5;245
+.incomplete 00;38;5;245
+.swp        00;38;5;245
+.tmp        00;38;5;245
+.temp       00;38;5;245
+.o          00;38;5;245
+.pyc        00;38;5;245
+.class      00;38;5;245
+.cache      00;38;5;245
+
+# Audio formats (orange)
+.aac    00;38;5;142
+.au     00;38;5;142
+.flac   00;38;5;142
+.mid    00;38;5;142
+.midi   00;38;5;142
+.mka    00;38;5;142
+.mp3    00;38;5;142
+.mpc    00;38;5;142
+.ogg    00;38;5;142
+.opus   00;38;5;142
+.ra     00;38;5;142
+.wav    00;38;5;142
+.m4a    00;38;5;142
+# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
+.axa    00;38;5;142
+.oga    00;38;5;142
+.spx    00;38;5;142
+.xspf   00;38;5;142
+
+# Video formats (as audio + bold)
+.mov    00;38;5;142
+.MOV    00;38;5;142
+.mpg    00;38;5;142
+.mpeg   00;38;5;142
+.m2v    00;38;5;142
+.mkv    00;38;5;142
+.ogm    00;38;5;142
+.mp4    00;38;5;142
+.m4v    00;38;5;142
+.mp4v   00;38;5;142
+.vob    00;38;5;142
+.qt     00;38;5;142
+.nuv    00;38;5;142
+.wmv    00;38;5;142
+.asf    00;38;5;142
+.rm     00;38;5;142
+.rmvb   00;38;5;142
+.flc    00;38;5;142
+.avi    00;38;5;142
+.fli    00;38;5;142
+.flv    00;38;5;142
+.gl     00;38;5;142
+.m2ts   00;38;5;142
+.divx   00;38;5;142
+.webm   00;38;5;142
+# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
+.axv    00;38;5;142
+.anx    00;38;5;142
+.ogv    00;38;5;142
+.ogx    00;38;5;142
+
+
diff --git a/dot_dotfiles/colors/gruvbox/termcolor.zsh b/dot_dotfiles/colors/gruvbox/termcolor.zsh
new file mode 100644
index 0000000..f81382c
--- /dev/null
+++ b/dot_dotfiles/colors/gruvbox/termcolor.zsh
@@ -0,0 +1,42 @@
+gruvbox_dark0_hard=234
+gruvbox_dark0=235
+gruvbox_dark0_soft=236
+gruvbox_dark1=237
+gruvbox_dark2=239
+gruvbox_dark3=241
+gruvbox_dark4=243
+
+gruvbox_gray_245=245
+gruvbox_gray_244=244
+
+gruvbox_light0_hard=230
+gruvbox_light0=229
+gruvbox_light0_soft=228
+gruvbox_light1=223
+gruvbox_light2=250
+gruvbox_light3=248
+gruvbox_light4=246
+
+gruvbox_bright_red=167
+gruvbox_bright_green=142
+gruvbox_bright_yellow=214
+gruvbox_bright_blue=109
+gruvbox_bright_purple=175
+gruvbox_bright_aqua=108
+gruvbox_bright_orange=208
+
+gruvbox_neutral_red=124
+gruvbox_neutral_green=106
+gruvbox_neutral_yellow=172
+gruvbox_neutral_blue=66
+gruvbox_neutral_purple=132
+gruvbox_neutral_aqua=72
+gruvbox_neutral_orange=166
+
+gruvbox_faded_red=88
+gruvbox_faded_green=100
+gruvbox_faded_yellow=136
+gruvbox_faded_blue=24
+gruvbox_faded_purple=96
+gruvbox_faded_aqua=66
+gruvbox_faded_orange=130
diff --git a/dot_vim/symlink_vimrc.d b/dot_vim/symlink_vimrc.d
new file mode 100644
index 0000000..9f59c5d
--- /dev/null
+++ b/dot_vim/symlink_vimrc.d
@@ -0,0 +1 @@
+/home/jnieland/.dotfiles/vim/vimrc.d
\ No newline at end of file
diff --git a/dot_vim/vimrc.d/10-settings.vim b/dot_vim/vimrc.d/10-settings.vim
deleted file mode 100644
index f6698ad..0000000
--- a/dot_vim/vimrc.d/10-settings.vim
+++ /dev/null
@@ -1,28 +0,0 @@
-set nocompatible " be iMproved, required
-filetype off     " required
-
-" some generic options... :help them if you want
-" also check https://github.com/tpope/vim-sensible/blob/master/plugin/sensible.vim
-set laststatus=2
-set ruler
-set wildmenu
-set encoding=UTF-8 " necessary for vim-devicons
-set showmatch " set parens to match each other
-set incsearch " search as characters are entered
-set hlsearch " highlight matches
-
-" some auto indentation 
-syntax enable
-set smartindent
-set tabstop=8
-set shiftwidth=4
-set expandtab
-set smarttab
-set softtabstop=0
-
-" numbering options
-set number
-set relativenumber
-
-" show syntax highlighting (this might be superfluous with the above...)
-" syntax on
diff --git a/dot_vim/vimrc.d/20-plugins.vim b/dot_vim/vimrc.d/20-plugins.vim
deleted file mode 100644
index f5c4c06..0000000
--- a/dot_vim/vimrc.d/20-plugins.vim
+++ /dev/null
@@ -1,65 +0,0 @@
-filetype plugin indent on    " required
-" To ignore plugin indent changes, instead use:
-"filetype plugin on
-"
-" Brief help
-" :PluginList       - lists configured plugins
-" :PluginInstall    - installs plugins; append `!` to update or just :PluginUpdate
-" :PluginSearch foo - searches for foo; append `!` to refresh local cache
-" :PluginClean      - confirms removal of unused plugins; append `!` to auto-approve removal
-"
-" see :h vundle for more details or wiki for FAQ
-" Put your non-Plugin stuff after this line
-" vim-plug - download if not there yet
-"
-if empty(glob('~/.vim/autoload/plug.vim'))
-  silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
-    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-endif
-
-" manage vim-plug
-call plug#begin('~/.vim/plugged')
-"Plug 'junegunn/seoul256.vim'
-"Plug 'junegunn/goyo.vim'
-"Plug 'junegunn/limelight.vim'
-" if you don't have nodejs and yarn
-" use pre build
-Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }}
-" have nodejs and yarn
-" Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install'  }
-" Shorthand notation; fetches https://github.com/junegunn/vim-easy-align
-Plug 'junegunn/vim-easy-align'
-" Pimp VIM with the gruvbox theme.
-Plug 'morhetz/gruvbox'
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
-" Syntax checking for various formats
-Plug 'scrooloose/syntastic'
-" This adds kotlin syntax
-Plug 'udalov/kotlin-vim'
-" adds the 'c' command to do things with brackets,quotes, ... try `cs"'` on
-" "blabla"
-Plug 'tpope/vim-surround'
-" adds fuzzy file finder to vim (do <c-p>)
-Plug 'kien/ctrlp.vim'
-" always load this last. supposed to make vim work with nerdfonts
-Plug 'ryanoasis/vim-devicons'
-" enable typescript 
-Plug 'leafgarland/typescript-vim'
-" add auto completion for various languages
-" Plug 'Valloric/YouCompleteMe'
-" enable copy to clipboard ('cpiw', 'cP', ...)
-Plug 'christoomey/vim-system-copy'
-" the left-most tree structure
-Plug 'scrooloose/nerdtree'
-" fuzzy file finder
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
-Plug 'junegunn/fzf.vim'
-" ripgrep integration
-Plug 'jremmen/vim-ripgrep'
-" intellisense like plugin!
-" Plug 'neoclide/coc.nvim', {'branch': 'release'}
-
-call plug#end()
-
diff --git a/dot_vim/vimrc.d/30-style.vim b/dot_vim/vimrc.d/30-style.vim
deleted file mode 100644
index 7858012..0000000
--- a/dot_vim/vimrc.d/30-style.vim
+++ /dev/null
@@ -1,38 +0,0 @@
-set guifont=FuraCode\ Nerd\ Font\ 11
-
-" set up the color scheme
-colorscheme gruvbox
-:let g:airline_theme='gruvbox'
-:set background=dark
-" make background in vim transparent
-highlight Normal ctermfg=none ctermbg=none
-let g:gruvbox_contrast_dark = 'hard'
-let g:gruvbox_termcolors = 256
-
-" AIRLINE settings
-" symbols section for unicode/airline symbols
-" air-line (status line below, using fancy symbols)
-let g:airline_powerline_fonts = 1
-if !exists('g:airline_symbols')
-    let g:airline_symbols = {}
-endif
-" unicode symbols
-let g:airline_left_sep = '»'
-let g:airline_left_sep = '▶'
-let g:airline_right_sep = '«'
-let g:airline_right_sep = '◀'
-let g:airline_symbols.linenr = '␊'
-let g:airline_symbols.linenr = '␤'
-let g:airline_symbols.linenr = '¶'
-let g:airline_symbols.branch = '⎇'
-let g:airline_symbols.paste = 'ρ'
-let g:airline_symbols.paste = 'Þ'
-let g:airline_symbols.paste = '∥'
-let g:airline_symbols.whitespace = 'Ξ'
-let g:airline_left_sep = ''
-let g:airline_left_alt_sep = ''
-let g:airline_right_sep = ''
-let g:airline_right_alt_sep = ''
-let g:airline_symbols.branch = ''
-let g:airline_symbols.readonly = ''
-let g:airline_symbols.linenr = ''
diff --git a/dot_vimrc b/dot_vimrc
deleted file mode 100644
index 3d6d937..0000000
--- a/dot_vimrc
+++ /dev/null
@@ -1,33 +0,0 @@
-" load all files in the vimrc.d directory
-set runtimepath+=~/.vim
-execute 'runtime!' 'vimrc.d/*'
-
-let g:system_copy#copy_command='xclip -sel clipboard'
-let g:system_copy#paste_command='xclip -sel clipboard -o'
-
-" This should set markdown syntax for all .md files
-au BufNewFile,BufFilePre,BufRead *.md set filetype=markdown
-highlight Comment cterm=italic
-
-" EASYALIGN settings - plugin by junegunn (vipga= aligns text around = chars)
-" Start interactive EasyAlign in visual mode (e.g. vipga)
-xmap ga <Plug>(EasyAlign)
-" Start interactive EasyAlign for a motion/text object (e.g. gaip)
-nmap ga <Plug>(EasyAlign)
-
-" NERDTREE settings - he way to open the nerdtree
-map <C-n> :NERDTreeToggle<CR>
-
-" SYNTASTIC settings
-set statusline+=%#warningmsg#
-set statusline+=%{SyntasticStatuslineFlag()}
-set statusline+=%*
-let g:syntastic_always_populate_loc_list = 1
-let g:syntastic_auto_loc_list = 1
-let g:syntastic_check_on_open = 1
-let g:syntastic_check_on_wq = 0
-
-" MARKDOWN PREVIEW settings
-" specify browser to open preview page
-" default: ''
-let g:mkdp_browser = 'qutebrowser'
diff --git a/dot_xinitrc b/dot_xinitrc
new file mode 100644
index 0000000..2d0fd5a
--- /dev/null
+++ b/dot_xinitrc
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# make sure that dunst can do its thing without a window manager
+systemctl --user import-environment DISPLAY
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# make sure we get the hwmon variable right for CPU temperatures
+export CPU_TEMP_PATH=$(ls /sys/devices/platform/coretemp*/hwmon/hwmon*/temp*_input | grep -m 1 '')
+
+# start the ssh agent, we're lazy, don't want to type passwords all day
+eval $(ssh-agent)
+
+# start i3
+exec i3
+
+# after i3 is started, set up greenclip
+systemctl --user start greenclip
diff --git a/symlink_dot_vimrc b/symlink_dot_vimrc
new file mode 100644
index 0000000..39ae1d8
--- /dev/null
+++ b/symlink_dot_vimrc
@@ -0,0 +1 @@
+/home/jnieland/.dotfiles/vim/.vimrc
\ No newline at end of file