Merge branch 'master' of github.com:rad4day/dotfiles

.gitignore

@@ -19,3 +19,119 @@ vim/.swp/*
 
 .sqlite
 # End of https://www.gitignore.io/api/vim
+
+# Created by https://www.gitignore.io/api/vim,python
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+.pytest_cache/
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule.*
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+### Vim ###
+# swap
+.sw[a-p]
+.*.sw[a-p]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+
+
+# End of https://www.gitignore.io/api/vim,python

.gitmodules

@@ -91,3 +91,48 @@
 [submodule "vim/plugins/vim-latex-live-preview"]
 	path = vim/plugins/vim-latex-live-preview
 	url = https://github.com/xuhdev/vim-latex-live-preview
+[submodule "zsh/modules/history-substring-search/external"]
+	path = zsh/modules/history-substring-search/external
+	url = https://github.com/zsh-users/zsh-history-substring-search.git
+[submodule "zsh/modules/completion/external"]
+	path = zsh/modules/completion/external
+	url = https://github.com/zsh-users/zsh-completions.git
+[submodule "zsh/modules/syntax-highlighting/external"]
+	path = zsh/modules/syntax-highlighting/external
+	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
+[submodule "zsh/modules/prompt/external-themes/pure"]
+	path = zsh/modules/prompt/external-themes/pure
+	url = https://github.com/sindresorhus/pure.git
+[submodule "zsh/modules/prompt/external-themes/liquidprompt"]
+	path = zsh/modules/prompt/external-themes/liquidprompt
+	url = https://github.com/nojhan/liquidprompt.git
+[submodule "zsh/modules/prompt/external-themes/lean"]
+	path = zsh/modules/prompt/external-themes/lean
+	url = https://github.com/miekg/lean
+[submodule "zsh/modules/autosuggestions/external"]
+	path = zsh/modules/autosuggestions/external
+	url = https://github.com/zsh-users/zsh-autosuggestions.git
+[submodule "tmux/plugins/tmux-battery"]
+	path = tmux/plugins/tmux-battery
+	url = https://github.com/tmux-plugins/tmux-battery.git
+[submodule "tmux/plugins/tmux-copycat"]
+	path = tmux/plugins/tmux-copycat
+	url = https://github.com/tmux-plugins/tmux-copycat.git
+[submodule "tmux/plugins/tmux-online-status"]
+	path = tmux/plugins/tmux-online-status
+	url = https://github.com/tmux-plugins/tmux-online-status.git
+[submodule "tmux/plugins/tmux-open"]
+	path = tmux/plugins/tmux-open
+	url = https://github.com/tmux-plugins/tmux-open.git
+[submodule "tmux/plugins/tmux-plugin-sysstat"]
+	path = tmux/plugins/tmux-plugin-sysstat
+	url = https://github.com/samoshkin/tmux-plugin-sysstat.git
+[submodule "tmux/plugins/tmux-prefix-highlight"]
+	path = tmux/plugins/tmux-prefix-highlight
+	url = https://github.com/tmux-plugins/tmux-prefix-highlight.git
+[submodule "tmux/plugins/tmux-sidebar"]
+	path = tmux/plugins/tmux-sidebar
+	url = https://github.com/tmux-plugins/tmux-sidebar.git
+[submodule "tmux/plugins/tpm"]
+	path = tmux/plugins/tpm
+	url = https://github.com/tmux-plugins/tpm.git

Makefile

@@ -4,11 +4,14 @@ tmux:
 
 vim:
 	ln -s ~/.dotfiles/vim ~/.vim
-	ln -s ~/.dotfiles/vim/.vimc ~/.vimrc
+	ln -s ~/.dotfiles/vim/.vimrc ~/.vimrc
 	sudo pip3 uninstall greenlet
 	sudo pip3 install neovim
-	sudo pip2 uninstall greenlet
+	#sudo pip2 uninstall greenlet
 	sudo pacman -S python-greenlet
+	mkdir ~/.dotfiles/vim/.swp
+	mkdir ~/.dotfiles/vim/.undo
+	mkdir ~/.dotfiles/vim/.backup
 
 git:
 	ln -s ~/.dotfiles/.gitconfig ~/.gitconfig
@@ -19,7 +22,7 @@ zsh:
 	rm ~/.zimrc
 	ln -s ~/.dotfiles/zsh/.zimrc ~/.zimrc
 
-i3:
+i3: dep
 	ln -s ~/.dotfiles/i3 ~/.config/i3
 
 .PHONY: clean zsh git vim tmux i3
@@ -27,4 +30,11 @@ clean:
 	rm -rf ~/.vim ~/.vimrc ~/.tmux ~/.tmux.conf ~/.gitconfig ~/.config/i3
 	rm -rf ~/.zshrc ~/.zimrc ~/.zim ~/.zlogin
 
+dep:
+	git clone https://aur.archlinux.org/powerline-fonts-git.git /tmp/powerline-font
+	cd /tmp/powerline-font && makepkg -Acs && sudo pacman -U *.pkg.*
+	git clone https://aur.archlinux.org/bumblebee-status-git.git /tmp/bumblebee
+	cd /tmp/bumblebee && makepkg -Acs && sudo pacman -U *.pkg.*
+	sudo pacman -S awesome-terminal-fonts
+
 all: clean tmux vim git zsh i3

tmux/plugins/tmux-copycat

@@ -1 +1 @@
-Subproject commit 6f9b9cd2d93872cef60e3ea7f7ae89598569ed25
+Subproject commit bcb40aca696a8f80d67e1c97455afe3e2eb76dee

tmux/plugins/tmux-prefix-highlight

@@ -1 +1 @@
-Subproject commit 34f7125ae46e5123bedad03e08027332d1186186
+Subproject commit 70d880b492b2f61e5304d3cce9bd1432c89cc8f9