add dotfiles
add dotfiles
resolve conflicts
add X configs
update gitignore