remove msys/cygwin support, bugfixes, and cleanup

[dotfiles.git] / base / .Xresources

diff --git a/base/.Xresources b/base/.Xresources
index fd515ca1f646b902c285e2ab65cabf1858789741..f81b439fe34bb92eed4f1f725057906f985c2d9d 100644 (file)
--- a/base/.Xresources
+++ b/base/.Xresources
@@ -1,79 +1,61 @@
 ! fonts
-*font:                    -windows-dina-medium-r-normal--10-80-96-96-c-70-\
-microsoft-cp1252
+! X11 font server fontspec
+*font:                    -windows-dina-medium-r-*-*-10-80-*-*-*-*-*
+! xft/fontconfig
+! NOTE: xterm etc. use faceName for Xft fonts. classic font server rendering is
+!       preferred so this is just in case the program doesn't support PCF.
 *faceName:                Dina
 *faceSize:                8
-Xft.antialias:            true
-Xft.dpi:                  96
-Xft.hinting:              true
+! matches font.conf, just in case
+Xft.antialias:            1
+Xft.rgba:                 rgb
+Xft.hinting:              1
 Xft.hintstyle:            hintslight
-Xft.rgba:                 none
 
 ! theming
-Xcursor.theme:            Paper
+Xcursor.theme:            Paper-Mono-Dark
 
 ! colors
-! http://ethanschoonover.com/solarized
-!#define S_base03          #002b36
-#define S_base03          #000a0d
-#define S_base02          #073642
-#define S_base01          #586e75
-#define S_base00          #657b83
-#define S_base0           #839496
-#define S_base1           #93a1a1
-#define S_base2           #eee8d5
-#define S_base3           #fdf6e3
-*background:              S_base03
-*foreground:              S_base0
-*fadeColor:               S_base03
-*cursorColor:             S_base1
-*pointerColorBackground:  S_base01
-*pointerColorForeground:  S_base1
-
-#define S_yellow          #b58900
-#define S_orange          #cb4b16
-#define S_red             #dc322f
-#define S_magenta         #d33682
-#define S_violet          #6c71c4
-#define S_blue            #268bd2
-#define S_cyan            #2aa198
-!#define S_green           #859900
-#define S_green           #85c000
-! black dark/light
-*color0:                  S_base02
-*color8:                  S_base03
-! red dark/light
-*color1:                  S_red
-*color9:                  S_orange
-! green dark/light
-*color2:                  S_green
-*color10:                 S_base01
-! yellow dark/light
-*color3:                  S_yellow
-*color11:                 S_base00
-! blue dark/light
-*color4:                  S_blue
-*color12:                 S_base0
-! magenta dark/light
-*color5:                  S_magenta
-*color13:                 S_violet
-! cyan dark/light
-*color6:                  S_cyan
-*color14:                 S_base1
-! white dark/light
-*color7:                  S_base2
-*color15:                 S_base3
-! underline
-*underlineColor:          S_yellow
-
+*background:              #010812
+*foreground:              #798699
+*fading:                  40
+*fadeColor:               #820ad5
+*cursorColor:             #6408a4
+*pointerColorBackground:  #6408a4
+*pointerColorForeground:  #191c21
+*underlineColor:          #d5820a
+! black/grey
+*color0:                  #191c21
+*color8:                  #3b434e
+! red
+*color1:                  #d51d0a
+*color9:                  #f4321e
+! green
+*color2:                  #5dd50a
+*color10:                 #75f41e
+! yellow
+*color3:                  #d5820a
+*color11:                 #f49d1e
+! blue
+*color4:                  #0a5dd5
+*color12:                 #1e75f4
+! magenta
+*color5:                  #820ad5
+*color13:                 #9d1ef4
+! cyan
+*color6:                  #0ac2d5
+*color14:                 #1ee0f4
+! light grey/white
+*color7:                  #bcc2cc
+*color15:                 #e8ebee
 
 ! URxvt
-URxvt.termName:           rxvt-256color
+URxvt.termName:           rxvt-unicode-256color
 URxvt.perl-ext:
 URxvt.perl-ext-common:    searchable-scrollback,confirm-paste,matcher,font-size
 
 URxvt.depth:              32
-URxvt.background:         rgba:0000/0a00/0d00/d000
+URxvt.background:         rgba:0100/0800/1200/d000
 URxvt.internalBorder:     1
 URxvt.dynamicColors:      true
 URxvt.intensityStyles:    false
@@ -83,9 +65,9 @@ URxvt.scrollBar_right:    true
 URxvt.urgentOnBell:       true
 URxvt.visualBell:         true
 
-URxvt.url-launcher:       /usr/local/bin/xdg-open
-URxvt.matcher.button:     1
-URxvt.matcher.pattern.0:  \\w+:/+[\\w-](?:\\.?[\\w-]+)*(?::\\d{1,5})?(?:/(?:[\\d\\w/!#$&\\-;=?~[\\]]|%[\\da-fA-F]{2})*)?
+URxvt.url-launcher:       xdg-open
+URxvt.matcher.button:     2
+URxvt.matcher.pattern.0:  [a-zA-Z\d]+:/\/[\\w-](?:\\.?[\\w-]+)*(?::\\d{1,5})?(?:/(?:[\\w\\d\\.!#$&\\-;=?~[\\]/]|%[\\da-fA-F]{2})*)?
 URxvt.matcher.rend.0:     Uline Bold fg6
 !URxvt.matcher.pattern.1:  \\s(/\\S+?):(\\d+)(?=:|$)
 !URxvt.matcher.rend.1:     Uline fg3
@@ -100,7 +82,7 @@ URxvt.keysym.M-slash:     font-size:show
 URxvt.print-pipe:         cat > "$HOME/urxvt-$(date +'%Y-%m-%d-%H%M%S')"
 
 ! bg terminal 1
-TermBg1.termName:         rxvt-256color
+TermBg1.termName:         rxvt-unicode-256color
 TermBg1.perl-ext:
 TermBg1.perl-ext-common:
 
@@ -115,7 +97,7 @@ TermBg1.shading:          80
 TermBg1.blurRadius:       2x4
 
 ! bg terminal 2
-TermBg2.termName:         rxvt-256color
+TermBg2.termName:         rxvt-unicode-256color
 TermBg2.perl-ext:
 TermBg2.perl-ext-common: