diff options
author | David Runge <dave@sleepmap.de> | 2015-03-25 16:29:07 +0100 |
---|---|---|
committer | David Runge <dave@sleepmap.de> | 2015-03-25 16:29:07 +0100 |
commit | 32e8f95bb412d6f61afdd18836976061635378e5 (patch) | |
tree | c0e6e65d7c5aa46ce942001051b0c35e97391283 /.vim | |
parent | 6867bda2d82e01c1daf81ee4b39443ecc6609694 (diff) | |
parent | a0ef42e0a70ac6264835ba77936d1ba5bf2294fe (diff) | |
download | dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.gz dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.bz2 dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.xz dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.zip |
Merge branch 'master' of /home/git/repositories/dotfiles
* 'master' of /home/git/repositories/dotfiles: (60 commits)
.config/systemd/user/default.target.wants/*: Deleting all user services. Not good to have them started as root.
export.zsh: Don't use /run/user/ directory for roots TMUX_TMPDIR.
.irssi: Removing irssi as gitmodule, adding it to .gitignore (so it can be added again, without being a gitmodule).
.gitignore: Adding some now unneeded stuff that will popup from time to time.
.zprezto: Updating to c34098af20cafdf016f68f3e7f612ed60ca93aa1
.irssi: Updating .irssi submodule to latest commit.
.vim/addons-settings.vim: Removing powerline support and replacing ugly stuff with ascii characters.
.vdirsyncer/config: Encapsulating paths with ~ in double quotes, as vdirsyncer creates a weird ~ folder in your home otherwise.
termite/config: Switching to Inconsolata (made available through powerline-fonts-git).
pavucontrol.ini: Removing, as it's going to be rewritten each call anyways.
.tmux.conf: Updating colours, incorporating tpm, removing powerline stuff.
.compton.conf: Adding MPlayer to comptons exclude lists.
Updating irssi settings.
.autorandr/*: Clean slate for all autorandr profiles.
.password-store: Updating password store to latest commits.
.gitignore: Removing some unneeded stuff that has been added to the repo.
fonts.conf: Updating to a correct path structure.
.fonts: Removing top level configuration.
.fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
.fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
...
Diffstat (limited to '.vim')
-rw-r--r-- | .vim/addons-settings.vim | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/.vim/addons-settings.vim b/.vim/addons-settings.vim index 11473d7..d879ba9 100644 --- a/.vim/addons-settings.vim +++ b/.vim/addons-settings.vim @@ -80,24 +80,25 @@ autocmd BufRead,BufNewFile *.js set ft=javascript syntax=jquery " ================ lightline settings ================ let g:lightline = { - \ 'colorscheme': 'wombat', - \ 'active': { - \ 'left': [ [ 'mode' ], - \ [ 'fugitive', 'readonly', 'filename', 'modified' ] ] - \ }, - \ 'component': { - \ 'readonly': '%{&readonly?"⭤":""}', - \ 'fugitive': '%{exists("*fugitive#head")?fugitive#head():""}' - \ }, - \ 'component_visible_condition': { - \ 'fugitive': '(exists("*fugitive#head") && ""!=fugitive#head())' - \ }, - \ 'separator': { 'left': '⮀', 'right': '⮂' }, - \ 'subseparator': { 'left': '⮁', 'right': '⮃' } - \ } + \ 'colorscheme': 'solarized', + \ 'active': { + \ 'left': [ [ 'mode' ], + \ [ 'fugitive', 'readonly', 'filename', 'modified' ] ] + \ }, + \ 'component': { + \ 'readonly': '%{&readonly?"x":""}', + \ 'fugitive': '%{exists("*fugitive#head")?fugitive#head():""}' + \ }, + \ 'component_visible_condition': { + \ 'fugitive': '(exists("*fugitive#head") && ""!=fugitive#head())' + \ }, + \ 'separator': { 'left': '', 'right': '' }, + \ 'subseparator': { 'left': '|', 'right': '|' } + \ } set laststatus=2 + " ================ nerdtree-tabs settings ================ " Auto open nerd tree on startup let g:nerdtree_tabs_open_on_gui_startup = 0 |