From 8b85b30cd1c9bf820e3cff70c97d619ee5314dbe Mon Sep 17 00:00:00 2001 From: Sonny Date: Sun, 15 Jul 2018 14:57:31 +0200 Subject: [PATCH] Add yaml formatting --- tmux/.tmux.conf | 6 ------ vim/.vimrc | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 0150847..1b56817 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,12 +1,6 @@ # use vim copy/paste keybindings setw -g mode-keys vi -# Copy vim-style to clipboard -bind -t vi-copy y copy-pipe "xclip -sel clip -i" - -# Paste clipboard into window -bind C-v run "tmux set-buffer \"$(xclip -o -sel clipboard)\"; tmux paste-buffer" - # split panes using | and - bind | split-window -h bind - split-window -v diff --git a/vim/.vimrc b/vim/.vimrc index 3e5571f..cb85334 100755 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -19,7 +19,7 @@ set hidden " file specific formatting autocmd Filetype python,bash,sh,java,php setlocal tabstop=4 softtabstop=4 shiftwidth=4 expandtab autoindent fileformat=unix -autocmd Filetype css,html,htmldjango,javascript setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab autoindent +autocmd Filetype css,html,htmldjango,javascript,yaml setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab autoindent " search down into subfolders " provides tab-completion for all file-related tasks