diff --git a/.atom/packages.list b/.atom/packages.list index b139d77..dc76038 100644 --- a/.atom/packages.list +++ b/.atom/packages.list @@ -1,4 +1,4 @@ -ansible-vault@0.7.3 +ansible-vault@0.7.8 atom-autocomplete-php@0.25.6 atom-beautify@0.33.4 atom-bootstrap4@1.4.0 @@ -11,25 +11,27 @@ atom-material-ui@2.1.3 color-picker@2.3.0 docblockr@0.13.7 emmet@2.4.3 -file-icons@2.1.26 +file-icons@2.1.28 highlight-selected@0.14.0 -ide-css@0.3.0 +ide-cpp@0.0.3 +ide-css@0.3.2 ide-json@0.2.1 -ide-php@0.7.17 -ide-python@1.0.0 +ide-php@0.7.18 +ide-python@1.2.0 ide-vue@0.1.9 +ide-yaml@0.4.4 language-Bluespec-System-Verilog@2.1.3 language-ansible@0.2.2 language-blade@0.41.4 language-docker@1.1.8 -language-gdb@0.3.6 +language-gdb@0.7.0 language-gmod-lua@0.4.0 language-htaccess@0.2.0 language-lua@0.9.11 language-mips@0.3.0 language-nginx@0.8.0 language-verilog@0.4.0 -language-vue@0.23.1 +language-vue@0.24.0 language-x86-64-assembly@2.2.11 laravel@0.7.1 minimap@4.29.9 @@ -37,6 +39,8 @@ minimap-find-and-replace@4.5.2 minimap-highlight-selected@4.6.1 minimap-pigments@0.2.2 open-recent@5.0.0 +pandoc@0.2.2 +pdf-view@0.71.0 php-hyperclick@1.2.1 pigments@0.40.2 project-manager@3.3.6 diff --git a/.zshrc b/.zshrc index f4771e7..0365529 100644 --- a/.zshrc +++ b/.zshrc @@ -6,7 +6,7 @@ export ZSH="$HOME/.oh-my-zsh" # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes -ZSH_THEME="robbyrussell" +ZSH_THEME="agnoster" # Set list of themes to load # Setting this variable when ZSH_THEME=random @@ -103,9 +103,6 @@ export EDITOR='vim' # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" -# Set vim as default editor -export EDITOR='vim' - # Custom aliases alias ll='ls -l' alias vi='vim' @@ -114,16 +111,15 @@ alias la='ls -la' if [ -f ~/.dotfiles/.localcommands ]; then source ~/.dotfiles/.localcommands fi + +# Antigen +#if [ -f ~/.dotfiles/antigen.zsh ]; then +# source ~/.dotfiles/antigen.zsh +#fi + # Tmuxinator autocomplete if [ -f ~/.bin/tmuxinator.zsh ]; then source ~/.bin/tmuxinator.zsh fi - -export PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin" - -# Tmuxinator autocomplete -if [ -f ~/.bin/tmuxinator.zsh ]; then - source ~/.bin/tmuxinator.zsh -fi export PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin" diff --git a/README.md b/README.md index 59dd65f..2a388d1 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,6 @@ The install script will try to find that file and automatically install all pack You can export the package list with: ``` -apm list --installed --bare > ~/.dotfiles/atom/packages.list +apm list --installed --bare > ~/.dotfiles/.atom/packages.list ``` diff --git a/setup.sh b/setup.sh index 30918e2..f9e5e52 100755 --- a/setup.sh +++ b/setup.sh @@ -12,11 +12,13 @@ backupFilesIfExists() mv $1 $1.pre-dotfiles; fi } + # remove all current dotfiles echo '[INFO] Removing current dotfiles...' backupFilesIfExists ~/.zshrc backupFilesIfExists ~/.vimrc backupFilesIfExists ~/.vim +backupFilesIfExists ~/.inputrc backupFilesIfExists ~/.tmux.conf backupFilesIfExists ~/.atom @@ -24,7 +26,8 @@ backupFilesIfExists ~/.atom echo '[INFO] Creating symlinks to new config files in .dotfiles...' ln -s ~/.dotfiles/.vimrc ~/.vimrc ln -s ~/.dotfiles/.zshrc ~/.zshrc -ln -s ~/.dotfiles/.vim ~/.vim +ln -s ~/.dotfiles/.vim ~/.vim +ln -s ~/.dotfiles/.inputrc ~/.inputrc ln -s ~/.dotfiles/tmux.conf ~/.tmux.conf ln -s ~/.dotfiles/.atom ~/.atom @@ -69,5 +72,5 @@ else echo '[INFO] Skipping atom configuration because it seems like you did not install atom yet!' fi -# next steps: -# - backup config files first before removing them +echo 'Finished setup...' +echo 'You should restart your terminal to see the changes.'