From 1ce9906cb051aee8776f73ca7a761237a1f77149 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 24 Jul 2018 18:49:42 +0100 Subject: [vim] Change scope of flags --- guile/.guile | 2 ++ guix/.guix-env | 2 +- python/.pythonrc | 6 ++++++ qutebrowser/.config/qutebrowser/config.py | 3 ++- tmux/.tmux.conf | 2 +- vim/.vimrc | 23 ++++++++++++++--------- 6 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 guile/.guile diff --git a/guile/.guile b/guile/.guile new file mode 100644 index 0000000..bcbc981 --- /dev/null +++ b/guile/.guile @@ -0,0 +1,2 @@ +(use-modules (ice-9 readline)) +(activate-readline) diff --git a/guix/.guix-env b/guix/.guix-env index 821079b..f5c75f5 100644 --- a/guix/.guix-env +++ b/guix/.guix-env @@ -5,7 +5,7 @@ export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale export LC_ALL=en_US.utf8 # Paths -# export PATH="$HOME/.guix-profile/bin:$HOME/.guix-profile/sbin${PATH:+:}$PATH" +export PATH="$HOME/.guix-profile/bin:$HOME/.guix-profile/sbin${PATH:+:}$PATH" # export CPATH="/home/urbain/.guix-profile/include${CPATH:+:}$CPATH" # export LIBRARY_PATH="/home/urbain/.guix-profile/lib${LIBRARY_PATH:+:}$LIBRARY_PATH" diff --git a/python/.pythonrc b/python/.pythonrc index 8a57e36..f384a57 100644 --- a/python/.pythonrc +++ b/python/.pythonrc @@ -1,2 +1,8 @@ import numpy as np import sympy as sym +import matplotlib.pyplot as plt + +try: + import hermipy as hm +except ImportError: + pass diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py index 60b8fb0..fd4ee20 100644 --- a/qutebrowser/.config/qutebrowser/config.py +++ b/qutebrowser/.config/qutebrowser/config.py @@ -51,7 +51,8 @@ c.url.searchengines = { 'DEFAULT': 'https://startpage.com/do/search?query={}', 'aw': 'https://wiki.archlinux.org/index.php?search={}', 'ddg': 'https://duckduckgo.com/?q={}', - 'dic': 'https://dictionary.cambridge.org/dictionary/english/{}', + 'cam': 'https://dictionary.cambridge.org/dictionary/english/{}', + 'dic': 'http://www.dictionary.com/browse/{}', 'google': 'https://www.google.com/search?hl=en&q={}', 'hn': 'https://hn.algolia.com/?query={}', 'lit': 'https://www.littre.org/definition/{}', diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 92a0594..5fc66ee 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -21,7 +21,7 @@ bind -n C-Right next-window bind-key P swap-window -t -1 bind-key N swap-window -t +1 -PILOT_BOUNDARY=create +PILOT_BOUNDARY=ignore PILOT_MODE=wintab PILOT_ROOT=$HOME/Dropbox/projects/vim-wintab source-file $PILOT_ROOT/pilot.tmux diff --git a/vim/.vimrc b/vim/.vimrc index ed0c8ec..f457698 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -16,7 +16,6 @@ Plug 'PotatoesMaster/i3-vim-syntax' Plug 'SirVer/ultisnips' Plug 'airblade/vim-gitgutter' Plug 'AndrewRadev/splitjoin.vim' -Plug 'arcticicestudio/nord-vim' Plug 'beloglazov/vim-online-thesaurus' Plug 'critiqjo/lldb.nvim' Plug 'easymotion/vim-easymotion' @@ -40,6 +39,7 @@ Plug 'lervag/vimtex' Plug 'machakann/vim-highlightedyank' Plug 'majutsushi/tagbar' Plug 'neomake/neomake' +Plug 'KKPMW/sacredforest-vim' Plug 'scrooloose/nerdtree' Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' } Plug 'terryma/vim-expand-region' @@ -66,11 +66,11 @@ let g:zoomwintab_hidetabbar=0 Plug 'vim-scripts/ReplaceWithRegister' Plug 'vim-scripts/gmsh.vim' Plug 'wellle/targets.vim' -" Plug 'zchee/deoplete-clang' +Plug 'zchee/deoplete-clang' Plug '~/Dropbox/projects/vim-remembrall' Plug '~/Dropbox/projects/vim-wintab' -" Plug 'urbainvaes/vim-tmux-pilot' +Plug 'urbainvaes/vim-tmux-pilot' if has("nvim") " Plug 'roxma/nvim-completion-manager' @@ -84,10 +84,12 @@ endif " Colors Plug 'altercation/vim-colors-solarized' +Plug 'arcticicestudio/nord-vim' Plug 'KKPMW/moonshine-vim' +Plug 'KKPMW/sacredforest-vim' Plug 'junegunn/seoul256.vim' Plug 'romainl/Apprentice' -Plug 'josuegaleas/jay' +" Plug 'josuegaleas/jay' call plug#end() " }}} "" Plugin mappings {{{ @@ -231,7 +233,7 @@ let g:vimtex_view_method='zathura' let g:vimtex_quickfix_mode=2 let g:vimtex_compiler_progname='nvr' -let g:pilot_boundary='create' +let g:pilot_boundary='ignore' let g:pilot_mode='wintab' " YouCompleteMe @@ -380,7 +382,7 @@ inoreabbrev #!! "#!/usr/bin/env" . (empty(&filetype) ? '' : ' '.&filetype inoremap 1z=eA " Unimpaired -nmap co =o +nmap co yo " }}} "" Colorscheme {{{ @@ -495,13 +497,15 @@ xnoremap ,g :let g:my_fillprg=g:my_searchprgs[g:my_searchprg] nnoremap ,f :let g:my_fillprg=g:my_findprgs[g:my_findprg]:call FillSearch() " Cycle search / find prgs -nnoremap cog :let g:my_searchprg=(g:my_searchprg+1)%len(g:my_searchprgs) -nnoremap cof :let g:my_findprg=(g:my_findprg+1)%len(g:my_findprgs) +nnoremap cog :let g:my_searchprg=(g:my_searchprg+1)%len(g:my_searchprgs):let &ro = &ro +nnoremap cof :let g:my_findprg=(g:my_findprg+1)%len(g:my_findprgs):let &ro = &ro " }}} "" Status line {{{ +set showtabline=2 let g:tabprefix = "" let g:tablabel = "%N%{flagship#tabmodified()} %{flagship#tabcwds('shorten',',')}" +let g:flagship_skip = 'FugitiveStatusline' function! Mixed_indent() let l:spaces=search('\v(^ +)','n') @@ -513,10 +517,11 @@ augroup myflags autocmd! autocmd BufEnter,BufRead,BufWritePost * let b:trailing=search('\s\+$','n') autocmd BufEnter,BufRead,BufWritePost * let b:mixed=Mixed_indent() + autocmd User Flags call Hoist("buffer", "[%{FugitiveHead('')}]") autocmd User Flags call Hoist("buffer", "%{b:trailing?'[tw]':''}") autocmd User Flags call Hoist("buffer", "%{b:mixed?'[mixed]':''}") autocmd User Flags call Hoist("buffer", "%{&paste?'[paste]':''}") - autocmd User Flags call Hoist("window", "[Search: %{g:my_searchprgs[g:my_searchprg]}, Find: %{g:my_findprgs[g:my_findprg]}]") + autocmd User Flags call Hoist("global", {"hl": "Statusline"}, "[%{g:my_searchprgs[g:my_searchprg]}, %{g:my_findprgs[g:my_findprg]}]") augroup END " }}} "" Neovim {{{ -- cgit v1.2.3