aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--after/ftplugin/python.vim10
-rw-r--r--ftplugin/python.vim1
-rw-r--r--ftplugin/text.vim2
-rw-r--r--plugin/max-fix-colorschemes.vim7
-rw-r--r--utils/Xresources2
-rw-r--r--utils/default-font.conf21
-rw-r--r--utils/gtkrc-2.01
-rw-r--r--vimrc4
-rw-r--r--vimrc-common6
9 files changed, 38 insertions, 16 deletions
diff --git a/after/ftplugin/python.vim b/after/ftplugin/python.vim
new file mode 100644
index 0000000..642e1c0
--- /dev/null
+++ b/after/ftplugin/python.vim
@@ -0,0 +1,10 @@
1python3 << EOF
2import os
3import sys
4import vim
5for p in sys.path:
6 # Add each directory in sys.path, if it exists.
7 if os.path.isdir(p):
8 # Command 'set' needs backslash before each space.
9 vim.command(r"set path+=%s" % (p.replace(" ", r"\ ")))
10EOF
diff --git a/ftplugin/python.vim b/ftplugin/python.vim
new file mode 100644
index 0000000..1268957
--- /dev/null
+++ b/ftplugin/python.vim
@@ -0,0 +1 @@
let &path=system('python -c "import sys; print(\",\".join(sys.path))"')
diff --git a/ftplugin/text.vim b/ftplugin/text.vim
index 0336a13..9097834 100644
--- a/ftplugin/text.vim
+++ b/ftplugin/text.vim
@@ -6,7 +6,7 @@ set autoindent nosmartindent nocindent
6 6
7set formatoptions+=n " When formatting text, recognize numbered lists. 7set formatoptions+=n " When formatting text, recognize numbered lists.
8set formatoptions+=1 " do not break after a one letter word 8set formatoptions+=1 " do not break after a one letter word
9set formatoptions+=p " Don't break lines at single spaces that follow periods. 9" set formatoptions+=p " Don't break lines at single spaces that follow periods.
10 10
11set formatoptions+=aw " Automatic formatting of paragraphs (w=only if space in the end) 11set formatoptions+=aw " Automatic formatting of paragraphs (w=only if space in the end)
12 12
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index 1535dc7..b9c7657 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -24,8 +24,8 @@ function! ExtendColorTheme()
24 highlight! link Tabline StatusLine 24 highlight! link Tabline StatusLine
25 highlight! link VertSplit LineNr 25 highlight! link VertSplit LineNr
26 highlight! link SignColumn LineNr 26 highlight! link SignColumn LineNr
27 highlight! link FoldColumn LineNr 27 highlight! link FoldColumn VertSplit
28 highlight! link Folded LineNr 28 " highlight! link Folded LineNr
29 highlight! link EndOfBuffer LineNr 29 highlight! link EndOfBuffer LineNr
30endfunction 30endfunction
31autocmd ColorScheme * call ExtendColorTheme() 31autocmd ColorScheme * call ExtendColorTheme()
@@ -45,6 +45,9 @@ else
45 \ 'theme': { 45 \ 'theme': {
46 \ 'default.dark': { 46 \ 'default.dark': {
47 \ 'transparent_background': 1 47 \ 'transparent_background': 1
48 \ },
49 \ 'default.light': {
50 \ 'transparent_background': 1
48 \ } 51 \ }
49 \ } 52 \ }
50 \ } 53 \ }
diff --git a/utils/Xresources b/utils/Xresources
index f536483..5723999 100644
--- a/utils/Xresources
+++ b/utils/Xresources
@@ -1,6 +1,6 @@
1! #include "/home/max/.config/base16-xresources/xresources/base16-tomorrow-night.Xresources" 1! #include "/home/max/.config/base16-xresources/xresources/base16-tomorrow-night.Xresources"
2! #include "/home/max/.config/base16-xresources/xresources/base16-google-light.Xresources" 2! #include "/home/max/.config/base16-xresources/xresources/base16-google-light.Xresources"
3#include "/home/max/.config/base16-xresources/xresources/base16-tomorrow.Xresources" 3#include "/home/max/.local/share/base16/base16-xresources/xresources/base16-tomorrow.Xresources"
4 4
5urxvt.scrollBar: false 5urxvt.scrollBar: false
6urxvt.background: base00 6urxvt.background: base00
diff --git a/utils/default-font.conf b/utils/default-font.conf
index 3992d07..cf01d6d 100644
--- a/utils/default-font.conf
+++ b/utils/default-font.conf
@@ -3,20 +3,25 @@
3<!DOCTYPE fontconfig SYSTEM "/etc/fonts/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>monospace</string></test>
7 <edit mode="prepend" name="family"><string>Hack Nerd Font Mono</string></edit>
8 <edit mode="prepend" name="family"><string>Hack</string></edit>
9 <edit mode="prepend" name="family"><string>emoji</string></edit>
10 <edit mode="prepend" name="family"><string>emojione</string></edit>
11 <edit mode="prepend" name="family"><string>FuraCode Nerd Font Mono Medium</string></edit>
12 <test name="slant" compare="not_eq"><const>italic</const></test>
13 <edit mode="assign" name="style"><string>bold</string></edit>
14 </match>
15 <match target="pattern">
6 <test qual="any" name="family"><string>serif</string></test> 16 <test qual="any" name="family"><string>serif</string></test>
7 <edit name="family" mode="assign" binding="same"><string>Noto Serif</string></edit> 17 <edit name="family" mode="prepend" binding="same"><string>Noto Serif</string></edit>
8 </match> 18 </match>
9 <match target="pattern"> 19 <match target="pattern">
10 <test qual="any" name="family"><string>sans-serif</string></test> 20 <test qual="any" name="family"><string>sans-serif</string></test>
11 <edit name="family" mode="assign" binding="same"><string>Noto Sans</string></edit> 21 <edit name="family" mode="prepend" binding="same"><string>Noto Sans</string></edit>
12 </match> 22 </match>
13 <match target="pattern"> 23 <match target="pattern">
14 <test qual="any" name="family"><string>monospace</string></test> 24 <edit name="dpi" mode="assign"><double>102</double></edit>
15 <edit mode="assign" name="family"><string>Hack</string></edit>
16 <edit mode="prepend" name="family"><string>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>
20 </match> 25 </match>
21</fontconfig> 26</fontconfig>
22 <!-- 27 <!--
diff --git a/utils/gtkrc-2.0 b/utils/gtkrc-2.0
new file mode 100644
index 0000000..05caadc
--- /dev/null
+++ b/utils/gtkrc-2.0
@@ -0,0 +1 @@
gtk-icon-theme-name="gnome"
diff --git a/vimrc b/vimrc
index cc4cae8..058a66b 100644
--- a/vimrc
+++ b/vimrc
@@ -9,7 +9,9 @@ set ttyfast | " improves speed for terminal vim (incompatible with nvim)
9set nottybuiltin | " use external termcaps 9set nottybuiltin | " use external termcaps
10set restorescreen | " restores the console after exiting vim (intentionally not in nvim) 10set restorescreen | " restores the console after exiting vim (intentionally not in nvim)
11 11
12autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib") 12" autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib")
13" autocmd VimLeave * call system("xsel -ib", getreg('+'))
14autocmd VimLeave * call system('echo ' . shellescape(getreg('+')) . ' | xclip -selection clipboard')
13 15
14 16
15" scripts from the default vim installation, which do not get loaded by default, but are useful. 17" scripts from the default vim installation, which do not get loaded by default, but are useful.
diff --git a/vimrc-common b/vimrc-common
index 44dea70..6415842 100644
--- a/vimrc-common
+++ b/vimrc-common
@@ -80,7 +80,7 @@ if has("multi_byte")
80 set listchars+=trail:· | " symbols used when using :set list (which displays non-printable chars) 80 set listchars+=trail:· | " symbols used when using :set list (which displays non-printable chars)
81 " set listchars+=eol:↲ | " symbols used when using :set list (which displays non-printable chars) 81 " set listchars+=eol:↲ | " symbols used when using :set list (which displays non-printable chars)
82 " set listchars+=space:· | " symbols used when using :set list (which displays non-printable chars) 82 " set listchars+=space:· | " symbols used when using :set list (which displays non-printable chars)
83 set showbreak+=› | " symbol used in the beginning of a wrapped line 83 "set showbreak+=› | " symbol used in the beginning of a wrapped line
84 84
85 " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective) 85 " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective)
86 set nolist 86 set nolist
@@ -223,8 +223,8 @@ if has("autocmd")
223 let g:html_indent_script1 = "inc" 223 let g:html_indent_script1 = "inc"
224 let g:html_indent_style1 = "inc" 224 let g:html_indent_style1 = "inc"
225 225
226 let g:loaded_ruby_provider = 1 " disable ruby support 226 " let g:loaded_ruby_provider = 1 " disable ruby support
227 let g:loaded_python_provider = 1 " disable python 3 227 " let g:loaded_python_provider = 1 " disable python 3
228 228
229 let g:LatexBox_latexmk_preview_continuously = 1 229 let g:LatexBox_latexmk_preview_continuously = 1
230 let g:LatexBox_viewer = "evince" 230 let g:LatexBox_viewer = "evince"
..