aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2019-10-07 23:55:10 +0200
committerMax Christian Pohle2019-10-07 23:55:10 +0200
commitbd4fa1331b6543ddee67324ade50419f2c036105 (patch)
treee8c8351f60a57d277cd85b633c0eb204adcc4d97
parent6a1f77b32224bb86c50c687ea1f8f70cf4b440a0 (diff)
downloadvim-bd4fa1331b6543ddee67324ade50419f2c036105.tar.bz2
vim-bd4fa1331b6543ddee67324ade50419f2c036105.zip
further C&P and keyboard arrow fixes
-rw-r--r--ftplugin/c.vim5
-rw-r--r--plugin/KarlMarks.vim3
-rw-r--r--plugin/max-fix-colorschemes.vim5
-rw-r--r--utils/default-font.conf69
-rw-r--r--vimrc2
-rw-r--r--vimrc-common11
6 files changed, 53 insertions, 42 deletions
diff --git a/ftplugin/c.vim b/ftplugin/c.vim
index 3a874ff..96251d9 100644
--- a/ftplugin/c.vim
+++ b/ftplugin/c.vim
@@ -7,3 +7,8 @@ map <buffer> = :pyf /usr/share/clang/clang-format.py<CR>
7 7
8let c_space_errors=1 8let c_space_errors=1
9let c_gnu=1 9let c_gnu=1
10
11
12hi! cConstant gui=italic
13hi! cConditional gui=italic
14hi! cInclude gui=italic
diff --git a/plugin/KarlMarks.vim b/plugin/KarlMarks.vim
index 6e5a408..3340dad 100644
--- a/plugin/KarlMarks.vim
+++ b/plugin/KarlMarks.vim
@@ -2,6 +2,7 @@ let g:markerbar_additional = '"' " position in buffer when left
2let g:markerbar_additional .= '<>' " start/end last selection 2let g:markerbar_additional .= '<>' " start/end last selection
3let g:markerbar_additional .= '{}' " start/end paragraph 3let g:markerbar_additional .= '{}' " start/end paragraph
4let g:markerbar_additional .= '()' " start/end sentence 4let g:markerbar_additional .= '()' " start/end sentence
5let g:markerbar_additional .= '[]' " start/end sentence
5let g:markerbar_additional .= '.' " last change 6let g:markerbar_additional .= '.' " last change
6let g:markerbar_additional .= "^" " insert mode stopped 7let g:markerbar_additional .= "^" " insert mode stopped
7let g:markerbar_additional .= "'`" 8let g:markerbar_additional .= "'`"
@@ -25,4 +26,4 @@ endfunction
25autocmd CursorHold * call KarlMarks() 26autocmd CursorHold * call KarlMarks()
26 27
27" important for distraction free reading while changing windows 28" important for distraction free reading while changing windows
28set signcolumn=yes 29" setlocal signcolumn=yes
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index c357117..96b57e2 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -19,7 +19,8 @@ function! ExtendColorTheme()
19 highlight! Error ctermbg=NONE cterm=NONE gui=NONE guibg=NONE 19 highlight! Error ctermbg=NONE cterm=NONE gui=NONE guibg=NONE
20 highlight! SpellBad cterm=NONE gui=undercurl guibg=NONE guifg=red 20 highlight! SpellBad cterm=NONE gui=undercurl guibg=NONE guifg=red
21 highlight! Ignore ctermbg=NONE ctermfg=NONE cterm=NONE gui=NONE guibg=NONE guifg=NONE 21 highlight! Ignore ctermbg=NONE ctermfg=NONE cterm=NONE gui=NONE guibg=NONE guifg=NONE
22 22 highlight! LineNr cterm=italic gui=italic
23
23 if has("gui_running") 24 if has("gui_running")
24 highlight invisible gui=NONE guifg=background guibg=background 25 highlight invisible gui=NONE guifg=background guibg=background
25 else 26 else
@@ -62,7 +63,7 @@ else
62 let g:PaperColor_Theme_Options = { 63 let g:PaperColor_Theme_Options = {
63 \ 'theme': { 64 \ 'theme': {
64 \ 'default': { 65 \ 'default': {
65 \ 'transparent_background': 0 66 \ 'transparent_background': 1
66 \ } 67 \ }
67 \ } 68 \ }
68 \ } 69 \ }
diff --git a/utils/default-font.conf b/utils/default-font.conf
index b5bb196..3992d07 100644
--- a/utils/default-font.conf
+++ b/utils/default-font.conf
@@ -1,6 +1,6 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<!-- this is a configuration file for fontconfig and should be copied or linked to ~/.config/fontconfig/conf.d/ --> 2<!-- this is a configuration file for fontconfig and should be copied or linked to ~/.config/fontconfig/conf.d/ -->
3<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> 3<!DOCTYPE fontconfig SYSTEM "/etc/fonts/fonts.dtd">
4<fontconfig> 4<fontconfig>
5 <match target="pattern"> 5 <match target="pattern">
6 <test qual="any" name="family"><string>serif</string></test> 6 <test qual="any" name="family"><string>serif</string></test>
@@ -12,42 +12,37 @@
12 </match> 12 </match>
13 <match target="pattern"> 13 <match target="pattern">
14 <test qual="any" name="family"><string>monospace</string></test> 14 <test qual="any" name="family"><string>monospace</string></test>
15 <!--
16 <edit mode="assign" name="embolden">
17 <bool>true</bool>
18 </edit>
19 -->
20 <edit mode="assign" name="style"><string>Bold</string></edit>
21 <edit mode="assign" name="family"><string>Hack</string></edit> 15 <edit mode="assign" name="family"><string>Hack</string></edit>
22 <edit mode="prepend" name="family"><string>PowerlineSymbols</string></edit> 16 <edit mode="prepend" name="family"><string>emoji</string></edit>
23 <edit mode="prepend" name="family"><string>Noto Color Emoji</string></edit> 17
18 <test name="slant" compare="not_eq"><const>italic</const></test>
19 <edit mode="assign" name="style"><string>bold</string></edit>
24 </match> 20 </match>
25</fontconfig> 21</fontconfig>
26 22 <!--
27<!-- 23 family: "Anonymous Pro for Powerline"(s)
28 family: "Anonymous Pro for Powerline"(s) 24 family: "Consolas for Powerline"(s) "Consolas for Powerline FixedD"(s)
29 family: "Consolas for Powerline"(s) "Consolas for Powerline FixedD"(s) 25 family: "DejaVu Sans Mono for Powerline"(s)
30 family: "DejaVu Sans Mono for Powerline"(s) 26 family: "Droid Sans Mono for Powerline"(s)
31 family: "Droid Sans Mono for Powerline"(s) 27 family: "Inconsolata for Powerline"(s)
32 family: "Inconsolata for Powerline"(s) 28 family: "Inconsolata-dz for Powerline"(s)
33 family: "Inconsolata-dz for Powerline"(s) 29 family: "Liberation Mono for Powerline"(s)
34 family: "Liberation Mono for Powerline"(s) 30 family: "Menlo for Powerline"(s)
35 family: "Menlo for Powerline"(s) 31 family: "Meslo LG L DZ for Powerline"(s)
36 family: "Meslo LG L DZ for Powerline"(s) 32 family: "Meslo LG L for Powerline"(s)
37 family: "Meslo LG L for Powerline"(s) 33 family: "Meslo LG M DZ for Powerline"(s)
38 family: "Meslo LG M DZ for Powerline"(s) 34 family: "Meslo LG M for Powerline"(s)
39 family: "Meslo LG M for Powerline"(s) 35 family: "Meslo LG S DZ for Powerline"(s)
40 family: "Meslo LG S DZ for Powerline"(s) 36 family: "Meslo LG S for Powerline"(s)
41 family: "Meslo LG S for Powerline"(s) 37 family: "PowerlineSymbols"(s)
42 family: "PowerlineSymbols"(s) 38 family: "Source Code Pro for Powerline"(s)
43 family: "Source Code Pro for Powerline"(s) 39 family: "Source Code Pro for Powerline"(s) "Source Code Pro Black"(s)
44 family: "Source Code Pro for Powerline"(s) "Source Code Pro Black"(s) 40 family: "Source Code Pro for Powerline"(s) "Source Code Pro ExtraLight"(s)
45 family: "Source Code Pro for Powerline"(s) "Source Code Pro ExtraLight"(s) 41 family: "Source Code Pro for Powerline"(s) "Source Code Pro Light"(s)
46 family: "Source Code Pro for Powerline"(s) "Source Code Pro Light"(s) 42 family: "Source Code Pro for Powerline"(s) "Source Code Pro Medium"(s)
47 family: "Source Code Pro for Powerline"(s) "Source Code Pro Medium"(s) 43 family: "Source Code Pro for Powerline"(s) "Source Code Pro Semibold"(s)
48 family: "Source Code Pro for Powerline"(s) "Source Code Pro Semibold"(s) 44 family: "Terminus for Powerline"(s)
49 family: "Terminus for Powerline"(s) 45 family: "Ubuntu Mono derivative Powerline"(s)
50 family: "Ubuntu Mono derivative Powerline"(s) 46 family: "xos4 Terminess Powerline"(s)
51 family: "xos4 Terminess Powerline"(s) 47 family: "xos4 Terminus for Powerline"(s)
52 family: "xos4 Terminus for Powerline"(s) 48 -->
53-->
diff --git a/vimrc b/vimrc
index 6f80d2f..cc4cae8 100644
--- a/vimrc
+++ b/vimrc
@@ -12,8 +12,6 @@ set restorescreen | " restores the console after exiting vim (intentionally no
12autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib") 12autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib")
13 13
14 14
15xnoremap "+y y:call system("wl-copy", @")<cr>
16
17" scripts from the default vim installation, which do not get loaded by default, but are useful. 15" scripts from the default vim installation, which do not get loaded by default, but are useful.
18if filereadable($VIMRUNTIME.'/macros/editexisting.vim') 16if filereadable($VIMRUNTIME.'/macros/editexisting.vim')
19 packadd! editexisting 17 packadd! editexisting
diff --git a/vimrc-common b/vimrc-common
index b8900c4..4b00369 100644
--- a/vimrc-common
+++ b/vimrc-common
@@ -333,6 +333,12 @@ augroup KEYBOARD_MAPPING
333 nnoremap <s-up> vk 333 nnoremap <s-up> vk
334 vnoremap <s-up> k 334 vnoremap <s-up> k
335 335
336 " if the wildmenu is configured to to display suggestions vertically, then
337 " reconfigure the cursor keys to work in that direction
338 if &wildoptions =~# 'pum'
339 cnoremap <expr> <up> pumvisible() ? "<C-p>" : "\<up>"
340 cnoremap <expr> <down> pumvisible() ? "<C-n>" : "\<down>"
341 endif
336 342
337 343
338 " INSERT_MODE_MAPPINGS: 344 " INSERT_MODE_MAPPINGS:
@@ -344,6 +350,11 @@ augroup KEYBOARD_MAPPING
344 if has('nvim') " only neovim... 350 if has('nvim') " only neovim...
345 " shortcut \t opens a terminal in a horizontal split 351 " shortcut \t opens a terminal in a horizontal split
346 nnoremap <leader>t :new +terminal<CR> 352 nnoremap <leader>t :new +terminal<CR>
353 else
354 " allow vim to yank in wayland
355 if $XDG_SESSION_TYPE ==# 'wayland'
356 xnoremap "+y y:call system("wl-copy", @")<cr>
357 endif
347 endif 358 endif
348augroup END 359augroup END
349 360
..