Merge branch 'master' into no-arrows

.atom/.gitignore

@@ -0,0 +1,7 @@
+# Ignore all files
+*
+
+# Except these
+!config.cson
+!packages.list
+!init.coffee

.atom/config.cson

@@ -0,0 +1,41 @@
+"*":
+  "ansible-vault":
+    path: "/usr/bin/ansible-vault"
+  "atom-material-ui":
+    colors:
+      genAccent: true
+    tabs:
+      compactTabs: true
+      stretchedTabs: true
+    ui:
+      panelContrast: true
+      panelShadows: true
+  core:
+    disabledPackages: [
+      "atom-bootstrap4"
+      "activate-power-mode"
+    ]
+    telemetryConsent: "no"
+    themes: [
+      "atom-material-ui"
+      "atom-material-syntax-dark"
+    ]
+  editor:
+    fontSize: 15
+    softTabs: false
+    tabLength: 4
+    tabType: "hard"
+  minimap:
+    plugins:
+      "find-and-replace": true
+      "find-and-replaceDecorationsZIndex": 0
+      "highlight-selected": true
+      "highlight-selectedDecorationsZIndex": 0
+      pigments: true
+      pigmentsDecorationsZIndex: 0
+  welcome:
+    showOnStartup: false
+".blade.html.php.text":
+  editor:
+    commentEnd: " --}}"
+    commentStart: "{{-- "

.atom/init.coffee

@@ -0,0 +1,11 @@
+# Your init script
+#
+# Atom will evaluate this file each time a new window is opened. It is run
+# after packages are loaded/activated and after the previous editor state
+# has been restored.
+#
+# An example hack to log to the console when each text editor is saved.
+#
+# atom.workspace.observeTextEditors (editor) ->
+#   editor.onDidSave ->
+#     console.log "Saved! #{editor.getPath()}"

.atom/packages.list

@@ -0,0 +1,51 @@
+ansible-vault@0.7.8
+atom-autocomplete-php@0.25.6
+atom-beautify@0.33.4
+atom-bootstrap4@1.4.0
+atom-clock@0.1.16
+atom-csscomb@3.0.0
+atom-ide-ui@0.13.0
+atom-jinja2@0.6.0
+atom-material-syntax-dark@1.0.0
+atom-material-ui@2.1.3
+color-picker@2.3.0
+docblockr@0.13.7
+emmet@2.4.3
+file-icons@2.1.28
+highlight-selected@0.14.0
+ide-cpp@0.0.3
+ide-css@0.3.2
+ide-json@0.2.1
+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.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.24.0
+language-x86-64-assembly@2.2.11
+laravel@0.7.1
+minimap@4.29.9
+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
+tabs-to-spaces@1.0.5
+teletype@0.13.3
+vue-autocomplete@0.1.1
+zentabs@0.8.9
+

.inputrc

@@ -0,0 +1,46 @@
+## SMARTER TAB-COMPLETION (Readline bindings) ##
+# taken from https://github.com/paulirish/dotfiles THANK YOU!
+
+# Perform file completion in a case insensitive fashion
+set completion-ignore-case on
+
+# Treat hyphens and underscores as equivalent
+set completion-map-case on
+
+# Display matches for ambiguous patterns at first tab press
+set show-all-if-ambiguous on
+
+# Immediately add a trailing slash when autocompleting symlinks to directories
+set mark-symlinked-directories on
+
+# Use the text that has already been typed as the prefix for searching through
+# commands (basically more intelligent Up/Down behavior)
+"\e[A": history-search-backward
+"\e[B": history-search-forward
+
+# Do not autocomplete hidden files unless the pattern explicitly begins with a dot
+set match-hidden-files off
+
+# Show all autocomplete results at once
+set page-completions off
+
+# If there are more than 200 possible completions for a word, ask to show them all
+set completion-query-items 200
+
+# Show extra file information when completing, like `ls -F` does
+set visible-stats on
+
+# Be more intelligent when autocompleting by also looking at the text after
+# the cursor. For example, when the current line is "cd ~/src/mozil", and
+# the cursor is on the "z", pressing Tab will not autocomplete it to "cd
+# ~/src/mozillail", but to "cd ~/src/mozilla". (This is supported by the
+# Readline used by Bash 4.)
+set skip-completed-text on
+
+# Allow UTF-8 input and output, instead of showing stuff like $'\0123\0456'
+set input-meta on
+set output-meta on
+set convert-meta off
+
+# Use Alt/Meta + Delete to delete the preceding word
+"\e[3;3~": kill-word

.zshrc

@@ -7,7 +7,12 @@ ZSH_THEME="robbyrussell"
 plugins=(
 	git
 	pip
+	docker
+	command-not-found
 	screen
+	dirhistory
+	gradle
+	per-directory-history
 	fzf
 )
 
@@ -30,9 +35,7 @@ alias vi='vim'
 alias la='ls -la'
 alias :q='exit'
 
-# localcommands
+if [ -f ~/.dotfiles/.localcommands ]; then
-if [ -f ~/.dotfiles/.localcommands ]
-then
 	source ~/.dotfiles/.localcommands
 fi
 

README.md

@@ -1 +1,34 @@
-# My Dotfiles
+# My Dotfiles with an installer
+
+These are just my own config files for various applications like atom, vim and zsh...
+It also contains an installation script "setup.sh" to easily apply all of the settings and install some needed tools like
+Vundle.
+
+## Usage
+Make sure you have these packages installed:
+- atom
+- vim
+- zsh
+- oh-my-zsh
+- tmux
+- tmuxinator
+- the_silver_surfer
+- powerline-fonts
+- fzf
+
+If you want to install and apply all of the settings you just need to run:
+```
+cd ~
+git clone https://github.com/saibotk/.dotfiles
+.dotfiles/setup.sh
+```
+
+## Atom packages
+If you plan on using you own atom package list, you can modify the "atom/packages.list".
+The install script will try to find that file and automatically install all packages.
+
+You can export the package list with:
+```
+apm list --installed --bare > ~/.dotfiles/.atom/packages.list
+```
+

setup.sh

@@ -1,16 +1,35 @@
-#!/usr/bin/sh
+#!/bin/bash
+
+commandExists()
+{
+	command -v "$1" >/dev/null 2>&1
+}
+
+backupFilesIfExists()
+{
+	if [ -f $1 ] || [ -h $1 ] || [ -d $1 ]; then
+		printf "Found $1. Backing up to $1.pre-dotfiles\n";
+		mv $1 $1.pre-dotfiles;
+	fi
+}
 
 # remove all current dotfiles
-rm -f ~/.zshrc
+echo '[INFO] Removing current dotfiles...'
-rm -f ~/.vimrc
+backupFilesIfExists ~/.zshrc
-rm -rf ~/.vim
+backupFilesIfExists ~/.vimrc
-rm -f ~/.tmux.conf
+backupFilesIfExists ~/.vim
+backupFilesIfExists ~/.inputrc
+backupFilesIfExists ~/.tmux.conf
+backupFilesIfExists ~/.atom
 
 # create symbolic links to dotfiles
+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/.inputrc ~/.inputrc
 ln -s ~/.dotfiles/tmux.conf ~/.tmux.conf
+ln -s ~/.dotfiles/.atom ~/.atom
 
 
 # install vundle
@@ -21,10 +40,37 @@ else
 	echo '[INFO] Vundle is already installed.'
 fi
 
-# Install vundle Plugins
 if commandExists vim; then
 	echo '[INFO] Installing vim plugins via Vundle...'
 	vim +PluginInstall +qall
 else
 	echo '[INFO] Vim is not installed, could not install the plugins.'
 fi
+
+# if atom is installed install packages
+if commandExists atom; then
+	if commandExists apm; then
+		if [ -f ~/.dotfiles/.atom/packages.list ]; then
+			read -p "Do you want to install your atom packages? (y/n) " answer
+			case ${answer:0:1} in
+			    y|Y )
+					echo '[INFO] Installing atom packages, this can take a while...'
+					apm install --packages-file ~/.dotfiles/.atom/packages.list
+			    ;;
+				* )
+			        echo '[INFO] Skipping atom package installation'
+				;;
+			esac
+
+		else
+			echo '[INFO] Cannot find packages.list skipping atom package installation.'
+		fi
+	else
+		echo '[INFO] Atom is installed but the apm command is not available. Cannot import atom packages!'
+	fi
+else
+	echo '[INFO] Skipping atom configuration because it seems like you did not install atom yet!'
+fi
+
+echo 'Finished setup...'
+echo 'You should restart your terminal to see the changes.'