aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2019-02-17 17:33:51 +0100
committerDavid Runge <dave@sleepmap.de>2019-02-17 17:33:51 +0100
commit26c2a58eec97c7d80e3220399b82e98fe2d90a03 (patch)
tree65f7f3acdbc984b67716c6df97775acead67469c
parent009247a0432864855c439b1247bac87af3e29158 (diff)
parent55cfa538fccf2c99900e29763b6695ac700c974c (diff)
downloaddotfiles-26c2a58eec97c7d80e3220399b82e98fe2d90a03.tar.gz
dotfiles-26c2a58eec97c7d80e3220399b82e98fe2d90a03.tar.bz2
dotfiles-26c2a58eec97c7d80e3220399b82e98fe2d90a03.tar.xz
dotfiles-26c2a58eec97c7d80e3220399b82e98fe2d90a03.zip
Merge branch 'master' of sleepmap.de:config/dotfiles
* 'master' of sleepmap.de:config/dotfiles: .gitignore: Adding .local/{bin,lib,share/virtualenvs}, .puppetlabs, .pyenv, .qutebrowser, .ssh/socket*, .vagrant*, .virtualenvs. .gitignore: Adding ~/.vim/untracked-settings.vim. .vimrc: Adding ~/.vim/untracked-settings.vim as a place to drop sensitive data needed for some plugins. .vim/addons.vim: Adding vim-jenkins.
-rw-r--r--.gitignore10
-rw-r--r--.vim/addons.vim1
-rw-r--r--.vimrc5
3 files changed, 16 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8eb3308..e782ae9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -244,6 +244,8 @@ packages/
.lives
.lives-dir/
.log
+.local/bin
+.local/lib
.local/share/.converted-launchers
.local/share/Psychonauts/
.local/share/Steam/
@@ -271,6 +273,7 @@ packages/
.local/share/systemd/
.local/share/Trash/
.local/share/telepathy/
+.local/share/virtualenvs
.local/share/vlc/
.local/share/webkit/
.local/share/desktop-directoriey.log/
@@ -317,11 +320,14 @@ packages/
.pryrc
.pulse
.pulse-cookie
+.puppetlabs
.purple/
+.pyenv
.python-eggs/
.q3a
.qucs
.qt
+.qutebrowser
.rdebugrc
.recently-used
.revenge_of_the_titans/
@@ -341,6 +347,7 @@ packages/
.ssh/authorized_keys
.ssh/id_*
.ssh/known_hosts
+.ssh/socket*
.steam/
.steampath
.steampid
@@ -360,16 +367,19 @@ packages/
.tuxguitar-1.2/
.unescaped_colors.rb
.unknown-horizons/
+.vagrant*
.vdirsyncer/status
.vim/backups/
.vim/sessions/
.vim/vim-addons/
.vim/.*
.vim/yankring*
+.vim/untracked-settings.vim
.vimperator/
.vimpressrc
.viminfo
.viminfo.tmp
+.virtualenvs
.vm/
.vmoviedb/
.weather/
diff --git a/.vim/addons.vim b/.vim/addons.vim
index c8302be..a7550e4 100644
--- a/.vim/addons.vim
+++ b/.vim/addons.vim
@@ -20,6 +20,7 @@ VAMActivate github:Matt-Stevens/vim-systemd-syntax
VAMActivate github:sjas/octave.vim
VAMActivate github:wannesm/wmgraphviz.vim.git
VAMActivate github:supercollider/scvim.git
+VAMActivate github:burnettk/vim-jenkins
" project
VAMActivate github:scrooloose/nerdtree.git
VAMActivate github:scrooloose/nerdcommenter.git
diff --git a/.vimrc b/.vimrc
index a085d14..8b20fbc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -126,6 +126,11 @@ so ~/.vim/addons-settings.vim " addon settings
so ~/.vim/custom-settings.vim " custom settings
so ~/.vim/custom-functions.vim " custom functions
+" custom, untracked settings
+if filereadable(expand("~/.vim/untracked-settings.vim"))
+ so ~/.vim/untracked-settings.vim
+endif
+
" colors
colorscheme pablo