Add codi.vim, correct Makefile formatting

Signed-off-by: Tomas Slusny <[email protected]>

.editorconfig

@@ -7,3 +7,7 @@ indent_size = 2
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+indent_size = 8

.gitmodules

@@ -119,3 +119,6 @@
 [submodule "vim/.vim/bundle/completor.vim"]
 	path = vim/.vim/bundle/completor.vim
 	url = https://github.com/maralla/completor.vim
+[submodule "vim/.vim/bundle/codi.vim"]
+	path = vim/.vim/bundle/codi.vim
+	url = https://github.com/metakirby5/codi.vim

Makefile

@@ -4,6 +4,7 @@ clean:
 	find ~ -xtype l -delete
 
 install:
+	touch /tmp/cmd && chmod u+x /tmp/cmd
 	~/.fzf/install --all --no-update-rc
 
 link:

README.md

@@ -67,6 +67,7 @@ git clone git://github.com/Tarrasch/zsh-autoenv ~/.zsh/bundle/local/zsh-autoenv
  * [alias-tips](https://github.com/djui/alias-tips): A plugin to help remembering those aliases you defined once
  * [base-16-shell](https://github.com/chriskempson/base16-shell): A shell script to change your shell's default ANSI colors but most importantly, colors 17 to 21 of your shell's 256 colorspace (if supported by your terminal)
  * [cdls](https://github.com/deathbeam/dotfiles/tree/master/zsh/.zsh/bundle/cdls.plugin.zsh): Runs `ls -A` on directory change
+ * [codi](https://github.com/deathbeam/dotfiles/tree/master/zsh/.zsh/bundle/codi.plugin.zsh): A nice way to use Codi is through a shell wrapper
  * [fzf](https://github.com/junegunn/fzf): A command-line fuzzy finder written in Go
  * [globalias](https://github.com/deathbeam/dotfiles/tree/master/zsh/.zsh/bundle/globalias.plugin.zsh): Expands all glob
    expressions, subcommands and aliases (including global)
@@ -77,6 +78,7 @@ git clone git://github.com/Tarrasch/zsh-autoenv ~/.zsh/bundle/local/zsh-autoenv
 
 ### Vim
  * [base16-vim](https://github.com/chriskempson/base16-vim): Base16 for Vim
+ * [codi.vim](https://github.com/metakirby5/codi.vim): :notebook_with_decorative_cover: The interactive scratchpad for hackers.
  * [comittia.vim](https://github.com/rhysd/committia.vim): A Vim plugin for more pleasant editing on commit messages
  * [completor.vim](https://github.com/maralla/completor.vim): Async completion framework made ease
  * [editorconfig-vim](https://github.com/editorconfig/editorconfig-vim): EditorConfig plugin for Vim

editorconfig/.editorconfig

@@ -7,3 +7,7 @@ indent_size = 2
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+indent_size = 8

vim/.vim/ftplugin/make.vim

@@ -0,0 +1,3 @@
+setlocal noexpandtab
+setlocal shiftwidth=8
+setlocal softtabstop=0

x11/.xinitrc

@@ -1,8 +1,4 @@
 #!/bin/zsh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
 
 # Load all other xinitrc files
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
@@ -12,37 +8,53 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
   unset f
 fi
 
+# Load profile
+source ~/.profile
+
 # Start guest additions if available
 if command -v VBoxClient-all >/dev/null 2>&1; then
   VBoxClient-all
 fi
 
-# Load profile
-source ~/.profile
-
 # Change mouse cursor from X11 X to normal one
 xsetroot -cursor_name left_ptr
 
 # Load custom keyboard mappings
 xmodmap ~/.xmodmap
 
+# Set nice wallpaper
+if command -v feh >/dev/null 2>&1; then
+  feh --bg-scale ~/.wallpaper
+fi
+
+# Start autocutsel
+if command -v autocutsel >/dev/null 2>&1; then
+  autocutsel -fork &
+  autocutsel -selection PRIMARY -fork &
+fi
+
+# Start clipboard manager daemon
+if [ -f ~/.config/dmenu/clipmenu/clipmenud ]; then
+  ~/.config/dmenu/clipmenu/clipmenud &
+fi
+
 # Start music manager daemon
-mopidy &
+if command -v mopidy >/dev/null 2>&1; then
+  mopidy &
+fi
 
 # Start dropbox
-dropbox start &
-
-# Set nice wallpaper
-feh --bg-scale ~/.wallpaper
+if command -v dropbox >/dev/null 2>&1; then
+  dropbox start &
+fi
 
-# Start clipboard manager daemon
-~/.config/dmenu/clipmenu/clipmenud &
+# Now, open terminal window
+if command -v set >/dev/null 2>&1; then
+  st &
+fi
 
 # Start key manager daemon
 sxhkd &
 
-# Now, open terminal window
-st &
-
 # And finally, start our WM
 exec bspwm

zsh/.zsh/bundle/codi.plugin.zsh

@@ -0,0 +1,13 @@
+# Codi
+# Usage: codi [filetype] [filename]
+codi() {
+  local syntax="${1:-python}"
+  shift
+  vim -c \
+    "let g:startify_disable_at_vimenter = 1 |\
+    set bt=nofile ls=0 noru nonu nornu |\
+    hi ColorColumn ctermbg=NONE |\
+    hi VertSplit ctermbg=NONE |\
+    hi NonText ctermfg=0 |\
+    Codi $syntax" "$@"
+}