5 files changed, 231 insertions, 35 deletions
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index 1624565..abfa11a 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -2,42 +2,43 @@
 " COLOR SCHEME:
 "=======================================================================================================================
 function! ExtendColorTheme()
-    highlight! Bold            cterm=bold                  gui=bold
+  highlight! Bold           cterm=bold                      gui=bold
-    highlight! Italic          cterm=italic                gui=italic
+  highlight! Italic         cterm=italic                    gui=italic
-    highlight! Underline       cterm=underline             gui=underline
+  highlight! Underline      cterm=underline                 gui=underline
-    highlight! BoldUnderline   cterm=bold,underline        gui=bold,underline
+  highlight! BoldUnderline  cterm=bold,underline            gui=bold,underline
-    highlight! BoldItalic      cterm=bold,Italic           gui=Bold,Italic
+  highlight! BoldItalic     cterm=bold,Italic               gui=Bold,Italic
-    highlight! Todo            cterm=bold                  gui=bold            guibg=#ffffaa                                       guifg=#000000
+  highlight! Todo           cterm=bold                      gui=bold guibg=#ffffaa guifg=#000000
-    highlight! Error                                       guibg=NONE
+  highlight! Error          cterm=NONE ctermbg=NONE            gui=NONE guibg=NONE
-    highlight! SpellBad        cterm=NONE                  gui=undercurl       guibg=NONE                                          guifg=red
+  highlight! SpellBad       cterm=NONE                      gui=undercurl guibg=NONE guifg=red
+  highlight! Ignore         cterm=NONE ctermbg=NONE ctermfg=NONE  gui=NONE guibg=NONE guifg=NONE
+  highlight! Folded         cterm=NONE ctermbg=NONE
-    highlight! link            qfSeparator                 Normal              | " reserve one space
+  highlight! EndOfBuffer    cterm=NONE ctermbg=255 ctermfg=255
-    highlight! link            qfLineNr                    Normal              | " informational line numbers should look different
-    highlight! link            SpecialKey                  NonText             | " makes tab stop (see listchars) less disturbing
+  highlight! link           qfSeparator                     Normal                                | " reserve one space
-    highlight! link            EndOfBuffer                 Ignore
+  highlight! link           qfLineNr                        Normal                                | " informational line numbers should look different
-    highlight! link            WildMenu                    Search
-    highlight! link            Convention                  Error
+  highlight! link           SpecialKey                      NonText                               | " makes tab stop (see listchars) less disturbing
-    highlight! link            VertSplit                   NonText
+  highlight! link           WildMenu                        Search
+  highlight! link           Convention                      Error
-    highlight! link            VertSplit                   LineNr
+  highlight! link           VertSplit                       NonText
-    highlight! link            Folded                      LineNr
-    highlight! link            SignColumn                  LineNr
+  highlight! link           VertSplit                       LineNr
-    highlight! link            FoldColumn                  LineNr
+  highlight! link           SignColumn                      NonText
+  highlight! link           FoldColumn                      NonText
-    highlight! link            PmenuSbar                   Pmenu
-    highlight! PmenuThumb      cterm=inverse
+  highlight! link           PmenuSbar                       Pmenu
-    highlight! MoreMsg         cterm=inverse
+  highlight! PmenuThumb     cterm=inverse
+  highlight! MoreMsg        cterm=inverse
 endfunction
 autocmd ColorScheme * call ExtendColorTheme()
+set background=light
 if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))
  let g:base16_shell_path  =  "~/.config/base16-shell/scripts"
  let base16colorspace     =  256
-  set background=dark
  source ~/.vimrc_background
 else
  let g:PaperColor_Theme_Options = {
@@ -47,6 +48,5 @@ else
        \     }
        \   }
        \ }
-  set background=light
  colorscheme PaperColor
 endif
diff --git a/plugin/signify.vim b/plugin/signify.vim
index e60cba5..5eeb2b0 100644
--- a/plugin/signify.vim
+++ b/plugin/signify.vim
@@ -13,11 +13,11 @@ augroup SIGNIFY
  let g:signify_sign_show_count        = 0
  if has("multi_byte") && (&enc == 'utf-8' || &enc == 'utf-16' || &enc == 'ucs-4')
-    let g:signify_sign_add               = '⊕'
+    let g:signify_sign_add               = '⊕.'
-    let g:signify_sign_delete            = '⊖'
+    let g:signify_sign_delete            = '⊖.'
-    let g:signify_sign_delete_first_line = '⊖'
+    let g:signify_sign_delete_first_line = '⊖.'
-    let g:signify_sign_change            = '⊗'
+    let g:signify_sign_change            = '⊗.'
-    let g:signify_sign_changedelete      = '⊗'
+    let g:signify_sign_changedelete      = '⊗.'
  endif
  function! SignifyColorScheme()
diff --git a/utils/Xresources b/utils/Xresources
new file mode 100644
index 0000000..f536483
--- /dev/null
+++ b/utils/Xresources
@@ -0,0 +1,193 @@
+! #include "/home/max/.config/base16-xresources/xresources/base16-tomorrow-night.Xresources"
+! #include "/home/max/.config/base16-xresources/xresources/base16-google-light.Xresources"
+#include "/home/max/.config/base16-xresources/xresources/base16-tomorrow.Xresources"
+urxvt.scrollBar: false
+urxvt.background: base00
+urxvt.color0: base00
+urxvt.color1: base00
+urxvt.color2: base00
+urxvt.color3: base00
+urxvt.color4: base00
+urxvt.color5: base00
+urxvt.color6: base00
+urxvt.color7: base00
+urxvt.color8: base00
+urxvt.color9: base00
+! *Dialog.foreground:           foreground
+! *Dialog.background:           base00
+! *Dialog.Button.foreground:    base05
+! *Dialog.Button.background:    base00
+! !*Dialog.Button.pointBackground: #EAEAEA
+! !*Dialog.Button.clickBackground: #C3C3C3
+! *Dialog.text.foreground:      base02
+! *Dialog.text.background:      base00
+! *Dialog.topShadowColor:               base03
+! *Dialog.bottomShadowColor:    base04
+xscreensaver.logFile:/home/max/xscreensaver.log
+xscreensaver.verbose:true
+*.newLoginCommand:       xset dpms force off
+Xft.antialias: true
+Xft.lcdfilter: lcddefault
+Xft.hinting:   true
+Xft.rgba:      rgb
+Xft.hintstyle: hintfull
+Xft.dpi:       96
+!*passwd.passwdFont:            *-helvetica-medium-r-*-*-*-140-*-*-*-iso8859-1
+!*passwd.passwdFont:            
+!*font:                 -*-clean-medium-r-*--12-*-*-*-*-*-*-*
+!*font:                 xft:Bitstream Vera Sans Mono-8
+!*font:         *-dejavu sans-bold-r-*-*-*-*-*-*-*-*-*-*
+!*font:         *-monospace-bold-r-*-*-*-*-*-*-*-*-*-*
+!*.font: xft:monaco:bold:size=8
+!*.font: xft:RobotoMono Nerd Font:bold:size=10
+*.passwdFont: xft:monospace
+*.font: xft:monospace
+xscreensaver.overlayTextForeground:     #FFFF00
+xscreensaver.overlayTextBackground:     #000000
+*passwd.thermometer.foreground: #FF0000
+*passwd.thermometer.background: #FFFFFF
+*passwd.heading.label:          XScreenSaver %s
+*passwd.body.label:             This screen is fucked.
+*passwd.unlock.label:           unfuck
+*passwd.login.label:            dpms: off
+*passwd.user.label:             User:
+*passwd.thermometer.width:      12
+*passwd.asterisks:              True
+*passwd.uname:                  False
+XLock*mode: image
+*image.bitmap: /home/max/.lock.xpm
+*image.count: 1
+*image.erasedelay: 0
+XLock*erasedelay: 0
+XLock*icongeometry: 180x180
+! XLock*background: background
+! XLock*foreground: foreground
+XLock*description: off
+XLock*info:
+! ---=== Experiment with making Motif less ugly for DDD ===---
+! (DDD ignores generically-set Motif properties so we must do this)
+! TODO (if possible):
+!  - Hide text cursors in unfocused fields
+!  - Convert on-hover effect from shadow to background color or border
+!  - Pick better fonts and check which package provides them
+! Use the lighter background grey from the Lubuntu GTK+ theme
+! (Still a cool grey. Eyedropper the Clearlooks warm grey if necessary.)
+Ddd*background: #e0e0e0
+! These had no effect on my system but, from what I read, they help on
+! some systems.
+Ddd*enableThinThickness: True
+Ddd*enableEtchedInMenu: True
+Ddd*enableToggleColor: True
+Ddd*enableToggleVisual: True
+! Use pure white for white backgrounds like modern widget themes and websites
+Ddd*XmText.background:         #ffffff
+Ddd*XmTextField.background:    #ffffff
+Ddd*XmList.background:         #ffffff
+Ddd*GraphEdit.background:      #ffffff
+! Thick borders and shadows everywhere are archaic
+Ddd*shadowThickness: 1
+Ddd*borderThickness: 0
+Ddd*?*arg*shadowThickness: 1
+Ddd*?*arg*borderThickness: 0
+Ddd*?*buttons*shadowThickness: 1
+Ddd*?*buttons*borderThickness: 0
+! Un-cramp the menubar, menus, and toolbar to match modern compact sizing
+Ddd*menubar*marginTop: 1
+Ddd*menubar*marginBottom: 0
+Ddd*XmMenuShell*marginTop: 2
+Ddd*XmMenuShell*marginBottom: 2
+Ddd*XmMenuShell.?.marginWidth: 2
+Ddd*XmMenuShell.?.marginHeight: 2
+Ddd*toolbar*marginWidth: 5
+! Compact the menu tear-off buttons
+Ddd*XmMenuShell*XmTearOffButton*borderWidth: 0
+Ddd*XmMenuShell*XmTearOffButton*marginHeight: 0
+! DDD's interpretation of a "toggle button" shouldn't have a raised border
+Ddd*XmToggleButton*shadowThickness: 0
+Ddd*XmToggleButton*borderThickness: 0
+! The menu bar should not have a raised border
+Ddd*menubar.shadowThickness: 0
+Ddd*menubar.borderThickness: 0
+Ddd*XmMenuShell*XmTearOffButton*ShadowThickness: 2
+! ...and we do not want a border around the toolbar to make that stand out
+Ddd*main_window.?.borderThickness: 0
+Ddd*main_window.shadowThickness: 0
+! Drop-down boxes in toolbars do not have raised borders these days
+Ddd*toolbar.shadowThickness:        0
+Ddd*toolbar.?.shadowThickness:      1
+! DDD can sometimes get its GDB settings fatally messed up so duplicate
+! GUI-exposed integration defaults here for when I want to nuke ~/.ddd/init
+Ddd*cutCopyPasteBindings: KDE
+Ddd*selectAllBindings: KDE
+Ddd*buttonColorKey: c
+Ddd*FlatButtons: on
+! Good Xaw3d Defaults*customization:           -color
+*shadowWidth:             3
+*Form.background:         gray75
+*MenuButton.background:   gray75
+*SimpleMenu.background:   gray70
+*TransientShell*Dialog.background: gray70
+*Command.background:      gray75
+*Label.background:        gray75
+*ScrollbarBackground:     grey39
+*Scrollbar*background:    gray75
+*Scrollbar*width:         15
+*Scrollbar*height:        15
+*Scrollbar*shadowWidth:   2
+*Scrollbar*cursorName:    top_left_arrow
+*Scrollbar*pushThumb:     false
+*shapeStyle:              Rectangle
+*beNiceToColormap:        False
+*SmeBSB*shadowWidth:      3
+*highlightThickness:      0
+*topShadowContrast:       40
+*bottomShadowContrast:    60
+! fix up a few of the default X clients who
+! now look silly
+*xclock*shadowWidth:      0
+*xload*shadowWidth:       0
+*xcalc*shadowWidth:       0
+XTerm.vt100.faceName: Monospace:antialias=true
+XTerm.vt100.faceSize: 12
+! XTerm.vt100.font: 7x14
+XTerm.vt100.locale: true
+XTerm.vt100.utf8Title: true
+! keepassx colourscheme
+keepassx*background:   #cfcfcf
+keepassx*foreground:   #222222
+keepassx2*background:  #cfcfcf
+keepassx2*foreground:  #222222
diff --git a/utils/xinputrc b/utils/xinputrc
new file mode 100644
index 0000000..ebd7310
--- /dev/null
+++ b/utils/xinputrc
@@ -0,0 +1,3 @@
+# im-config(8) generated on Tue, 28 Feb 2017 13:21:48 +0100
+run_im ibus
+# im-config signature: ec6901ebc5d2dcf71d14062c6968658e  -
diff --git a/vimrc-common b/vimrc-common
index 7eb499f..21df101 100644
--- a/vimrc-common
+++ b/vimrc-common
@@ -160,7 +160,7 @@ set foldcolumn=2              | " I think I don't need this second indicator
 " set foldmethod=syntax         | " foldlevel: syntax, indent, manual / foldmethod=syntax makes Vim incredible slow
 set foldnestmax=1             | " top level folding only
 set foldopen=block,hor,search | " when do we unfold?
-set foldtext=printf('%*s%.*S',indent(v:foldstart),'',&textwidth-indent(v:foldstart),substitute(substitute(join(getline(v:foldstart,v:foldend),'\ '),'[[:space:]]\\+','\ ','g'),'^[[:space:]*]','','g'))
+set foldtext=printf('%*s%.*S',indent(v:foldstart),'',&textwidth-indent(v:foldstart),substitute(substitute(join(getline(v:foldstart,v:foldend),'\ '),'[[:space:]*/]\\+','\ ','g'),'^[[:space:]*]','','g'))
 " works ...
 " set foldexpr=match(synIDattr(synID(v:lnum,indent(v:lnum)+1,0),'name'),'Comment')>-1

diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim index 1624565..abfa11a 100644 --- a/plugin/max-fix-colorschemes.vim +++ b/plugin/max-fix-colorschemes.vim
@@ -2,42 +2,43 @@
2	" COLOR SCHEME:	2	" COLOR SCHEME:
3	"=======================================================================================================================	3	"=======================================================================================================================
4	function! ExtendColorTheme()	4	function! ExtendColorTheme()
5	highlight! Bold cterm=bold gui=bold	5	highlight! Bold cterm=bold gui=bold
6	highlight! Italic cterm=italic gui=italic	6	highlight! Italic cterm=italic gui=italic
7	highlight! Underline cterm=underline gui=underline	7	highlight! Underline cterm=underline gui=underline
8	highlight! BoldUnderline cterm=bold,underline gui=bold,underline	8	highlight! BoldUnderline cterm=bold,underline gui=bold,underline
9	highlight! BoldItalic cterm=bold,Italic gui=Bold,Italic	9	highlight! BoldItalic cterm=bold,Italic gui=Bold,Italic
10	highlight! Todo cterm=bold gui=bold guibg=#ffffaa guifg=#000000	10	highlight! Todo cterm=bold gui=bold guibg=#ffffaa guifg=#000000
11	highlight! Error guibg=NONE	11	highlight! Error cterm=NONE ctermbg=NONE gui=NONE guibg=NONE
12	highlight! SpellBad cterm=NONE gui=undercurl guibg=NONE guifg=red	12	highlight! SpellBad cterm=NONE gui=undercurl guibg=NONE guifg=red
13		13	highlight! Ignore cterm=NONE ctermbg=NONE ctermfg=NONE gui=NONE guibg=NONE guifg=NONE
14		14	highlight! Folded cterm=NONE ctermbg=NONE
15	highlight! link qfSeparator Normal \| " reserve one space	15	highlight! EndOfBuffer cterm=NONE ctermbg=255 ctermfg=255
16	highlight! link qfLineNr Normal \| " informational line numbers should look different	16
17		17
18	highlight! link SpecialKey NonText \| " makes tab stop (see listchars) less disturbing	18	highlight! link qfSeparator Normal \| " reserve one space
19	highlight! link EndOfBuffer Ignore	19	highlight! link qfLineNr Normal \| " informational line numbers should look different
20	highlight! link WildMenu Search	20
21	highlight! link Convention Error	21	highlight! link SpecialKey NonText \| " makes tab stop (see listchars) less disturbing
22	highlight! link VertSplit NonText	22	highlight! link WildMenu Search
23		23	highlight! link Convention Error
24	highlight! link VertSplit LineNr	24	highlight! link VertSplit NonText
25	highlight! link Folded LineNr	25
26	highlight! link SignColumn LineNr	26	highlight! link VertSplit LineNr
27	highlight! link FoldColumn LineNr	27	highlight! link SignColumn NonText
28		28	highlight! link FoldColumn NonText
29	highlight! link PmenuSbar Pmenu	29
30	highlight! PmenuThumb cterm=inverse	30	highlight! link PmenuSbar Pmenu
31	highlight! MoreMsg cterm=inverse	31	highlight! PmenuThumb cterm=inverse
		32	highlight! MoreMsg cterm=inverse
32		33
33	endfunction	34	endfunction
34	autocmd ColorScheme * call ExtendColorTheme()	35	autocmd ColorScheme * call ExtendColorTheme()
35		36
36		37
		38	set background=light
37	if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))	39	if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))
38	let g:base16_shell_path = "~/.config/base16-shell/scripts"	40	let g:base16_shell_path = "~/.config/base16-shell/scripts"
39	let base16colorspace = 256	41	let base16colorspace = 256
40	set background=dark
41	source ~/.vimrc_background	42	source ~/.vimrc_background
42	else	43	else
43	let g:PaperColor_Theme_Options = {	44	let g:PaperColor_Theme_Options = {
@@ -47,6 +48,5 @@ else
47	\ }	48	\ }
48	\ }	49	\ }
49	\ }	50	\ }
50	set background=light
51	colorscheme PaperColor	51	colorscheme PaperColor
52	endif	52	endif


diff --git a/plugin/signify.vim b/plugin/signify.vim index e60cba5..5eeb2b0 100644 --- a/plugin/signify.vim +++ b/plugin/signify.vim
@@ -13,11 +13,11 @@ augroup SIGNIFY
13	let g:signify_sign_show_count = 0	13	let g:signify_sign_show_count = 0
14		14
15	if has("multi_byte") && (&enc == 'utf-8' \|\| &enc == 'utf-16' \|\| &enc == 'ucs-4')	15	if has("multi_byte") && (&enc == 'utf-8' \|\| &enc == 'utf-16' \|\| &enc == 'ucs-4')
16	let g:signify_sign_add = '⊕'	16	let g:signify_sign_add = '⊕.'
17	let g:signify_sign_delete = '⊖'	17	let g:signify_sign_delete = '⊖.'
18	let g:signify_sign_delete_first_line = '⊖'	18	let g:signify_sign_delete_first_line = '⊖.'
19	let g:signify_sign_change = '⊗'	19	let g:signify_sign_change = '⊗.'
20	let g:signify_sign_changedelete = '⊗'	20	let g:signify_sign_changedelete = '⊗.'
21	endif	21	endif
22		22
23	function! SignifyColorScheme()	23	function! SignifyColorScheme()


diff --git a/utils/Xresources b/utils/Xresources new file mode 100644 index 0000000..f536483 --- /dev/null +++ b/utils/Xresources
@@ -0,0 +1,193 @@
		1	! #include "/home/max/.config/base16-xresources/xresources/base16-tomorrow-night.Xresources"
		2	! #include "/home/max/.config/base16-xresources/xresources/base16-google-light.Xresources"
		3	#include "/home/max/.config/base16-xresources/xresources/base16-tomorrow.Xresources"
		4
		5	urxvt.scrollBar: false
		6	urxvt.background: base00
		7	urxvt.color0: base00
		8	urxvt.color1: base00
		9	urxvt.color2: base00
		10	urxvt.color3: base00
		11	urxvt.color4: base00
		12	urxvt.color5: base00
		13	urxvt.color6: base00
		14	urxvt.color7: base00
		15	urxvt.color8: base00
		16	urxvt.color9: base00
		17
		18	! *Dialog.foreground: foreground
		19	! *Dialog.background: base00
		20	! *Dialog.Button.foreground: base05
		21	! *Dialog.Button.background: base00
		22	! !*Dialog.Button.pointBackground: #EAEAEA
		23	! !*Dialog.Button.clickBackground: #C3C3C3
		24	! *Dialog.text.foreground: base02
		25	! *Dialog.text.background: base00
		26	! *Dialog.topShadowColor: base03
		27	! *Dialog.bottomShadowColor: base04
		28
		29	xscreensaver.logFile:/home/max/xscreensaver.log
		30	xscreensaver.verbose:true
		31	*.newLoginCommand: xset dpms force off
		32
		33	Xft.antialias: true
		34	Xft.lcdfilter: lcddefault
		35	Xft.hinting: true
		36	Xft.rgba: rgb
		37	Xft.hintstyle: hintfull
		38	Xft.dpi: 96
		39
		40	!passwd.passwdFont: -helvetica-medium-r----140----iso8859-1
		41	!*passwd.passwdFont:
		42
		43	!font: --clean-medium-r---12-------
		44	!*font: xft:Bitstream Vera Sans Mono-8
		45	!font: -dejavu sans-bold-r----------
		46	!font: -monospace-bold-r----------
		47	!*.font: xft:monaco:bold:size=8
		48	!*.font: xft:RobotoMono Nerd Font:bold:size=10
		49	*.passwdFont: xft:monospace
		50	*.font: xft:monospace
		51
		52
		53	xscreensaver.overlayTextForeground: #FFFF00
		54	xscreensaver.overlayTextBackground: #000000
		55
		56
		57	*passwd.thermometer.foreground: #FF0000
		58	*passwd.thermometer.background: #FFFFFF
		59
		60	*passwd.heading.label: XScreenSaver %s
		61	*passwd.body.label: This screen is fucked.
		62	*passwd.unlock.label: unfuck
		63	*passwd.login.label: dpms: off
		64	*passwd.user.label: User:
		65	*passwd.thermometer.width: 12
		66	*passwd.asterisks: True
		67	*passwd.uname: False
		68
		69
		70	XLock*mode: image
		71	*image.bitmap: /home/max/.lock.xpm
		72	*image.count: 1
		73	*image.erasedelay: 0
		74	XLock*erasedelay: 0
		75	XLock*icongeometry: 180x180
		76	! XLock*background: background
		77	! XLock*foreground: foreground
		78	XLock*description: off
		79	XLock*info:
		80
		81
		82
		83
		84	! ---=== Experiment with making Motif less ugly for DDD ===---
		85	! (DDD ignores generically-set Motif properties so we must do this)
		86	! TODO (if possible):
		87	! - Hide text cursors in unfocused fields
		88	! - Convert on-hover effect from shadow to background color or border
		89	! - Pick better fonts and check which package provides them
		90
		91	! Use the lighter background grey from the Lubuntu GTK+ theme
		92	! (Still a cool grey. Eyedropper the Clearlooks warm grey if necessary.)
		93	Ddd*background: #e0e0e0
		94
		95	! These had no effect on my system but, from what I read, they help on
		96	! some systems.
		97	Ddd*enableThinThickness: True
		98	Ddd*enableEtchedInMenu: True
		99	Ddd*enableToggleColor: True
		100	Ddd*enableToggleVisual: True
		101
		102	! Use pure white for white backgrounds like modern widget themes and websites
		103	Ddd*XmText.background: #ffffff
		104	Ddd*XmTextField.background: #ffffff
		105	Ddd*XmList.background: #ffffff
		106	Ddd*GraphEdit.background: #ffffff
		107
		108	! Thick borders and shadows everywhere are archaic
		109	Ddd*shadowThickness: 1
		110	Ddd*borderThickness: 0
		111	Ddd?arg*shadowThickness: 1
		112	Ddd?arg*borderThickness: 0
		113	Ddd?buttons*shadowThickness: 1
		114	Ddd?buttons*borderThickness: 0
		115
		116	! Un-cramp the menubar, menus, and toolbar to match modern compact sizing
		117	DddmenubarmarginTop: 1
		118	DddmenubarmarginBottom: 0
		119	DddXmMenuShellmarginTop: 2
		120	DddXmMenuShellmarginBottom: 2
		121	Ddd*XmMenuShell.?.marginWidth: 2
		122	Ddd*XmMenuShell.?.marginHeight: 2
		123	DddtoolbarmarginWidth: 5
		124
		125	! Compact the menu tear-off buttons
		126	DddXmMenuShellXmTearOffButton*borderWidth: 0
		127	DddXmMenuShellXmTearOffButton*marginHeight: 0
		128
		129	! DDD's interpretation of a "toggle button" shouldn't have a raised border
		130	DddXmToggleButtonshadowThickness: 0
		131	DddXmToggleButtonborderThickness: 0
		132
		133	! The menu bar should not have a raised border
		134	Ddd*menubar.shadowThickness: 0
		135	Ddd*menubar.borderThickness: 0
		136	DddXmMenuShellXmTearOffButton*ShadowThickness: 2
		137
		138	! ...and we do not want a border around the toolbar to make that stand out
		139	Ddd*main_window.?.borderThickness: 0
		140	Ddd*main_window.shadowThickness: 0
		141
		142	! Drop-down boxes in toolbars do not have raised borders these days
		143	Ddd*toolbar.shadowThickness: 0
		144	Ddd*toolbar.?.shadowThickness: 1
		145
		146	! DDD can sometimes get its GDB settings fatally messed up so duplicate
		147	! GUI-exposed integration defaults here for when I want to nuke ~/.ddd/init
		148	Ddd*cutCopyPasteBindings: KDE
		149	Ddd*selectAllBindings: KDE
		150	Ddd*buttonColorKey: c
		151	Ddd*FlatButtons: on
		152
		153
		154	! Good Xaw3d Defaults*customization: -color
		155	*shadowWidth: 3
		156	*Form.background: gray75
		157	*MenuButton.background: gray75
		158	*SimpleMenu.background: gray70
		159	TransientShellDialog.background: gray70
		160	*Command.background: gray75
		161	*Label.background: gray75
		162	*ScrollbarBackground: grey39
		163	Scrollbarbackground: gray75
		164	Scrollbarwidth: 15
		165	Scrollbarheight: 15
		166	ScrollbarshadowWidth: 2
		167	ScrollbarcursorName: top_left_arrow
		168	ScrollbarpushThumb: false
		169	*shapeStyle: Rectangle
		170	*beNiceToColormap: False
		171	SmeBSBshadowWidth: 3
		172	*highlightThickness: 0
		173	*topShadowContrast: 40
		174	*bottomShadowContrast: 60
		175	! fix up a few of the default X clients who
		176	! now look silly
		177	xclockshadowWidth: 0
		178	xloadshadowWidth: 0
		179	xcalcshadowWidth: 0
		180
		181
		182	XTerm.vt100.faceName: Monospace:antialias=true
		183	XTerm.vt100.faceSize: 12
		184	! XTerm.vt100.font: 7x14
		185	XTerm.vt100.locale: true
		186	XTerm.vt100.utf8Title: true
		187
		188
		189	! keepassx colourscheme
		190	keepassx*background: #cfcfcf
		191	keepassx*foreground: #222222
		192	keepassx2*background: #cfcfcf
		193	keepassx2*foreground: #222222


diff --git a/utils/xinputrc b/utils/xinputrc new file mode 100644 index 0000000..ebd7310 --- /dev/null +++ b/utils/xinputrc
@@ -0,0 +1,3 @@
		1	# im-config(8) generated on Tue, 28 Feb 2017 13:21:48 +0100
		2	run_im ibus
		3	# im-config signature: ec6901ebc5d2dcf71d14062c6968658e -


diff --git a/vimrc-common b/vimrc-common index 7eb499f..21df101 100644 --- a/vimrc-common +++ b/vimrc-common
@@ -160,7 +160,7 @@ set foldcolumn=2 \| " I think I don't need this second indicator
160	" set foldmethod=syntax \| " foldlevel: syntax, indent, manual / foldmethod=syntax makes Vim incredible slow	160	" set foldmethod=syntax \| " foldlevel: syntax, indent, manual / foldmethod=syntax makes Vim incredible slow
161	set foldnestmax=1 \| " top level folding only	161	set foldnestmax=1 \| " top level folding only
162	set foldopen=block,hor,search \| " when do we unfold?	162	set foldopen=block,hor,search \| " when do we unfold?
163	set foldtext=printf('%s%.S',indent(v:foldstart),'',&textwidth-indent(v:foldstart),substitute(substitute(join(getline(v:foldstart,v:foldend),'\ '),'[[:space:]]\\+','\ ','g'),'^[[:space:]*]','','g'))	163	set foldtext=printf('%s%.S',indent(v:foldstart),'',&textwidth-indent(v:foldstart),substitute(substitute(join(getline(v:foldstart,v:foldend),'\ '),'[[:space:]/]\\+','\ ','g'),'^[[:space:]]','','g'))
164		164
165	" works ...	165	" works ...
166	" set foldexpr=match(synIDattr(synID(v:lnum,indent(v:lnum)+1,0),'name'),'Comment')>-1	166	" set foldexpr=match(synIDattr(synID(v:lnum,indent(v:lnum)+1,0),'name'),'Comment')>-1