aboutsummaryrefslogtreecommitdiffstats
path: root/vim
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2016-01-14 16:46:21 +0000
committerJohannes Löthberg <johannes@kyriasis.com>2016-01-14 16:46:21 +0000
commit7666a9cc93c079cd3a61ea8a7d4cf3103a74c56e (patch)
treee1e1b32e1666bead6a6ac7327bd2e253e989e80e /vim
parentcee153e1d03f215139ba6d74a8cd8fe039213992 (diff)
parent81873932548d4dda5345c19c3a635d53e25da061 (diff)
downloaddotfiles-7666a9cc93c079cd3a61ea8a7d4cf3103a74c56e.tar.xz
Merge remote-tracking branch 'k-kyrias/master' into theos
Diffstat (limited to 'vim')
-rw-r--r--vim/after/ftplugin/python.vim4
-rw-r--r--vim/vimrc3
2 files changed, 4 insertions, 3 deletions
diff --git a/vim/after/ftplugin/python.vim b/vim/after/ftplugin/python.vim
new file mode 100644
index 0000000..2a3d549
--- /dev/null
+++ b/vim/after/ftplugin/python.vim
@@ -0,0 +1,4 @@
+setlocal shiftwidth=4
+setlocal tabstop=4
+setlocal softtabstop=4
+setlocal expandtab
diff --git a/vim/vimrc b/vim/vimrc
index 38296d4..ec1a39f 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -78,9 +78,6 @@ set noexpandtab
" Automatically hide buffers instead of requiring bangcommands
set hidden
-" Yank to clipboard/selection by default
-set clipboard=unnamed,unnamedplus
-
" Easier window moving
map <C-h> <C-w>h
map <C-j> <C-w>j