From 046fd44f1686cfcc97085c56e4ac10534de3f1d3 Mon Sep 17 00:00:00 2001
From: Marcel Schneider <marcel@webschneider.org>
Date: Wed, 25 Jul 2018 11:07:57 +0200
Subject: [PATCH] Update dotfiles

---
 init-bash.sh           | 6 ------
 init.vim               | 7 +++++++
 tmux/tmux.conf.symlink | 8 +-------
 3 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 init-bash.sh

diff --git a/init-bash.sh b/init-bash.sh
deleted file mode 100644
index ddac712..0000000
--- a/init-bash.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-mkdir ~/bin
-git clone https://github.com/mrzool/bash-sensible ~/bin/bash-sensible
-echo "source ~/bin/bash-sensible/sensible.bash" >> ~/.bashrc
-source ~/.bashrc
diff --git a/init.vim b/init.vim
index b25739d..906cad7 100644
--- a/init.vim
+++ b/init.vim
@@ -94,6 +94,7 @@ Plug 'rhysd/vim-clang-format', { 'for' : ['c', 'cpp', 'java'] }
 "Plug 'shawncplus/phpcomplete.vim', { 'for': 'php', 'do': 'curl -Ss http://vim-php.com/phpctags/install/phpctags.phar > ~/bin/phpctags && chmod +x ~/bin/phpctags' }
 Plug 'lvht/phpcd.vim', { 'for': 'php', 'do': 'composer install' }
 Plug 'captbaritone/better-indent-support-for-php-with-html', { 'for': 'php' }
+Plug 'lumiliet/vim-twig', { 'for': [ 'php', 'html' ] } " Twig templates
 
 " Python
 Plug 'davidhalter/jedi-vim', { 'for': 'python', 'do': 'pip install jedi' }
@@ -102,6 +103,9 @@ Plug 'zchee/deoplete-jedi', { 'for': 'python' }
 " Java
 Plug 'artur-shaik/vim-javacomplete2', { 'for': 'java' }
 
+" MIPS
+Plug 'vim-scripts/mips.vim'
+
 " All of your Plugins must be added before the following line
 call plug#end()            " required
 filetype plugin indent on    " required
@@ -160,6 +164,9 @@ if has("autocmd")
     au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
                 \| exe "normal! g'\"" | endif
 endif
+
+" Setting for correct mips syntax highlighting
+au BufReadPost *.mips set syntax=mips
 " }}}
 
 " MAPPINGS{{{
diff --git a/tmux/tmux.conf.symlink b/tmux/tmux.conf.symlink
index 367539c..f6e6660 100644
--- a/tmux/tmux.conf.symlink
+++ b/tmux/tmux.conf.symlink
@@ -1,7 +1,7 @@
 set -g default-command "zsh"
 
 # tmux display things in 256 colors
-#set -g default-terminal "tmux-256color-italic"
+set -g default-terminal "screen-256color"
 
 #  enable terminal compability
 #set-option -ga terminal-overrides ",tmux-256color-italic:Tc"
@@ -81,13 +81,9 @@ setw -g mouse on
 # set-option -g -q mouse on
 
 bind-key -T root PPage if-shell -F "#{alternate_on}" "send-keys PPage" "copy-mode -e; send-keys PPage"
-bind-key -t vi-copy PPage page-up
-bind-key -t vi-copy NPage page-down
 
 bind -T root WheelUpPane if-shell -F -t = "#{alternate_on}" "select-pane -t =; send-keys -M" "select-pane -t =; copy-mode -e; send-keys -M"
 bind -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "select-pane -t =; send-keys -M" "select-pane -t =; send-keys -M"
-bind-key -t vi-copy WheelUpPane halfpage-up
-bind-key -t vi-copy WheelDownPane halfpage-down
 
 # maximizing and restoring windows
 unbind Up
@@ -102,8 +98,6 @@ unbind [
 bind Escape copy-mode
 unbind p
 bind p paste-buffer
-bind -t vi-copy 'v' begin-selection
-bind -t vi-copy 'y' copy-selection
 
 # Buffers to/from Mac clipboard, yay tmux book from pragprog
 #bind C-c run "tmux save-buffer - | reattach-to-user-namespace pbcopy"