Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "switch to solarized"

This reverts commit 5621ec4.
  • Loading branch information...
commit 627543a56d6cbba48434a9b22c1d614867737de3 1 parent 4d0777e
@wjackson authored
Showing with 36 additions and 448 deletions.
  1. +34 −98 Xdefaults
  2. +0 −340 font-size
  3. +0 −3  gvimrc
  4. +2 −7 vimrc
View
132 Xdefaults
@@ -1,99 +1,35 @@
-!-------------------------------------------------------------------------------
-! Xft settings
-!-------------------------------------------------------------------------------
-Xft.dpi: 120
-Xft.antialias: true
-Xft.rgba: rgb
-Xft.hinting: true
-Xft.hintstyle: hintslight
-
-!-------------------------------------------------------------------------------
-! URxvt settings
-! Colours lifted from Solarized (http://ethanschoonover.com/solarized)
-! More info at:
-! http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod
-!-------------------------------------------------------------------------------
-
-URxvt.depth: 32
-URxvt.geometry: 90x30
-URxvt.transparent: false
-URxvt.fading: 0
-URxvt.urgentOnBell: false
-URxvt.visualBell: false
-URxvt.loginShell: true
-URxvt.saveLines: 50
-URxvt.internalBorder: 3
-URxvt.lineSpace: 0
-
-! Fonts
-URxvt.allow_bold: false
-URxvt.font: xft:DejaVu Sans Mono:pixelsize=17:spacing=mono
-
-! font-size key bindings
-URxvt.keysym.C-Up: perl:font-size:increase
-URxvt.keysym.C-Down: perl:font-size:decrease
-URxvt.keysym.C-S-Up: perl:font-size:incglobal
-URxvt.keysym.C-S-Down: perl:font-size:decglobal
-
-! Fix font space
-URxvt*letterSpace: -1
-
-! Scrollbar
-URxvt.scrollStyle: rxvt
-URxvt.scrollBar: false
-
-! Perl extensions
-URxvt.perl-ext-common: default,matcher,clipboard,font-size
-URxvt.matcher.button: 1
-URxvt.urlLauncher: google-chrome
-
-! Cursor
-URxvt.cursorBlink: true
-URxvt.cursorColor: #657b83
-URxvt.cursorUnderline: false
-
-! Pointer
-URxvt.pointerBlank: true
-
-!!Source http://github.com/altercation/solarized
-
-*background: #002b36
-*foreground: #657b83
-! *fading: 40
-*fadeColor: #002b36
-*cursorColor: #93a1a1
-*pointerColorBackground: #586e75
-*pointerColorForeground: #93a1a1
-
-!! black dark/light
-*color0: #073642
-*color8: #002b36
-
-!! red dark/light
-*color1: #dc322f
-*color9: #cb4b16
-
-!! green dark/light
-*color2: #859900
-*color10: #586e75
-
-!! yellow dark/light
-*color3: #b58900
-*color11: #657b83
-
-!! blue dark/light
-*color4: #268bd2
-*color12: #839496
-
-!! magenta dark/light
-*color5: #d33682
-*color13: #6c71c4
-
-!! cyan dark/light
-*color6: #2aa198
-*color14: #93a1a1
-
-!! white dark/light
-*color7: #eee8d5
-*color15: #fdf6e3
+URxvt*background: #000000
+URxvt*foreground: #ffffff
+
+URxvt*scrollBar_right: false
+URxvt*scrollBar: false
+URxvt*visualBell: false
+
+! black
+URxvt.color0 : #2E3436
+URxvt.color8 : #555753
+! red
+URxvt.color1 : #CC0000
+URxvt.color9 : #EF2929
+! green
+URxvt.color2 : #4E9A06
+URxvt.color10 : #8AE234
+! yellow
+URxvt.color3 : #F0CD33
+URxvt.color11 : #FCE94F
+! blue
+URxvt.color4 : #3465A4
+URxvt.color12 : #729FCF
+! magenta
+URxvt.color5 : #75507B
+URxvt.color13 : #AD7FA8
+! cyan
+URxvt.color6 : #06989A
+URxvt.color14 : #34E2E2
+! white
+URxvt.color7 : #D3D7CF
+URxvt.color15 : #EEEEEC
+
+URxvt.font: xft:DejaVu Sans Mono-9:spacing=mono:antialias=true:autohint=true:dpi=120
+URxvt.perl-ext-common: default,matcher,clipboard
View
340 font-size
@@ -1,340 +0,0 @@
-#!/usr/bin/perl
-#
-# On-the-fly adjusting of the font size in urxvt
-#
-# Copyright (c) 2008 David O'Neill
-# 2012 Noah K. Tilton <noahktilton@gmail.com>
-# 2012 Jan Larres <jan@majutsushi.net>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#
-# URL: https://github.com/majutsushi/urxvt-font-size
-#
-# Based on:
-# https://github.com/dave0/urxvt-font-size
-# https://github.com/noah/urxvt-font
-#
-#
-# USAGE
-#
-# Add font-size to the list of perl extensions:
-# URxvt.perl-ext-common: ...,font-size
-#
-# Add some keybindings:
-# URxvt.keysym.C-Up: perl:font-size:increase
-# URxvt.keysym.C-Down: perl:font-size:decrease
-# URxvt.keysym.C-S-Up: perl:font-size:incglobal
-# URxvt.keysym.C-S-Down: perl:font-size:decglobal
-#
-# Supported functions:
-# - increase/decrease:
-# increase or decrease the font size of the current terminal.
-# - incglobal/decglobal:
-# same as above and also adjust the X server values so all newly started
-# terminals will use the same fontsize.
-# - incsave/decsave:
-# same as incglobal/decglobal and also modify the ~/.Xresources file so
-# the changed font sizes will persist over a restart of the X server or
-# a reboot.
-
-use strict;
-use warnings;
-
-my %escapecodes = (
- "font" => 710,
- "boldFont" => 711,
- "italicFont" => 712,
- "boldItalicFont" => 713
-);
-
-sub on_user_command
-{
- my ($self, $cmd) = @_;
-
- if ($cmd eq "font-size:increase") {
- fonts_change_size($self, 1, 0);
- } elsif ($cmd eq "font-size:decrease") {
- fonts_change_size($self, -1, 0);
- } elsif ($cmd eq "font-size:incglobal") {
- fonts_change_size($self, 1, 1);
- } elsif ($cmd eq "font-size:decglobal") {
- fonts_change_size($self, -1, 1);
- } elsif ($cmd eq "font-size:incsave") {
- fonts_change_size($self, 1, 2);
- } elsif ($cmd eq "font-size:decsave") {
- fonts_change_size($self, -1, 2);
- }
-}
-
-sub fonts_change_size
-{
- my ($term, $change, $save) = @_;
-
- my @newfonts = ();
-
- my $curres = $term->resource('font');
- if (!$curres) {
- return;
- }
- my @curfonts = split(/,/, $curres);
-
- my $basefont = shift(@curfonts);
- my ($newbasefont, $newbasesize) = handle_font($term, $basefont, $change, 0);
- push @newfonts, $newbasefont;
-
- # Only adjust other fonts if base font changed
- if ($newbasefont ne $basefont) {
- foreach my $font (@curfonts) {
- my ($newfont, $newsize) = handle_font($term, $font, $change, $newbasesize);
- push @newfonts, $newfont;
- }
- my $newres = join(",", @newfonts);
- font_apply_new($term, $newres, "font", $save);
-
- handle_type($term, "boldFont", $change, $newbasesize, $save);
- handle_type($term, "italicFont", $change, $newbasesize, $save);
- handle_type($term, "boldItalicFont", $change, $newbasesize, $save);
- }
-
- if ($save > 1) {
- # write the new values back to the file
- my $xresources = readlink $ENV{"HOME"} . "/.Xresources";
- system("xrdb -edit " . $xresources);
- }
-}
-
-sub handle_type
-{
- my ($term, $type, $change, $basesize, $save) = @_;
-
- my $curres = $term->resource($type);
- if (!$curres) {
- return;
- }
- my @curfonts = split(/,/, $curres);
- my @newfonts = ();
-
- foreach my $font (@curfonts) {
- my ($newfont, $newsize) = handle_font($term, $font, $change, $basesize);
- push @newfonts, $newfont;
- }
-
- my $newres = join(",", @newfonts);
- font_apply_new($term, $newres, $type, $save);
-}
-
-sub handle_font
-{
- my ($term, $font, $change, $basesize) = @_;
-
- my $newfont;
- my $newsize;
- my $prefix = 0;
-
- if ($font =~ /^\s*x:/) {
- $font =~ s/^\s*x://;
- $prefix = 1;
- }
- if ($font =~ /^\s*(\[.*\])?xft:/) {
- ($newfont, $newsize) = font_change_size_xft($term, $font, $change, $basesize);
- } elsif ($font =~ /^\s*-/) {
- ($newfont, $newsize) = font_change_size_x11($term, $font, $change, $basesize);
- } else {
- # check whether the font is a valid alias and if yes resolve it to the
- # actual font
- my $lsfinfo = `xlsfonts -l $font 2>/dev/null`;
-
- if ($lsfinfo eq "") {
- # not a valid alias, ring the bell if it is the base font and just
- # return the current font
- if ($basesize == 0) {
- $term->scr_bell;
- }
- return ($font, $basesize);
- }
-
- my $fontinfo = (split(/\n/, $lsfinfo))[-1];
- my ($fontfull) = ($fontinfo =~ /\s+([-a-z0-9]+$)/);
- ($newfont, $newsize) = font_change_size_x11($term, $fontfull, $change, $basesize);
- }
-
- # $term->scr_add_lines("\r\nNew font is $newfont\n");
- if ($prefix) {
- $newfont = "x:$newfont";
- }
-
- return ($newfont, $newsize);
-}
-
-sub font_change_size_xft
-{
- my ($term, $fontstring, $change, $basesize) = @_;
-
- my @pieces = split(/:/, $fontstring);
- my @resized = ();
- my $size = 0;
- my $new_size = 0;
-
- foreach my $piece (@pieces) {
- if ($piece =~ /pixelsize=(\d+)/) {
- $size = $1;
-
- if ($basesize != 0) {
- $new_size = $basesize;
- } else {
- $new_size = ($change > 0 ? ($size + 1) : ($size - 1));
- }
-
- $piece =~ s/pixelsize=$size/pixelsize=$new_size/;
- }
- push @resized, $piece;
- }
-
- my $resized_str = join(":", @resized);
-
- # don't make fonts too small
- if ($new_size >= 10) {
- return ($resized_str, $new_size);
- } else {
- if ($basesize == 0) {
- $term->scr_bell;
- }
- return ($fontstring, $size);
- }
-}
-
-sub font_change_size_x11
-{
- my ($term, $fontstring, $change, $basesize) = @_;
-
- #-xos4-terminus-medium-r-normal-*-12-*-*-*-*-*-*-1
-
- my @fields = qw(foundry family weight slant setwidth style pixelSize pointSize Xresolution Yresolution spacing averageWidth registry encoding);
-
- my %font;
- $fontstring =~ s/^-//; # Strip leading - before split
- @font{@fields} = split(/-/, $fontstring);
-
- if ($font{registry} eq '*') {
- $font{registry} ='iso8859';
- }
-
- # Blank out the size for the pattern
- my %pattern = %font;
- $pattern{foundry} = '*';
- $pattern{setwidth} = '*';
- $pattern{pixelSize} = '*';
- $pattern{pointSize} = '*';
- # if ($basesize != 0) {
- # $pattern{Xresolution} = '*';
- # $pattern{Yresolution} = '*';
- # }
- $pattern{averageWidth} = '*';
- # make sure there are no empty fields
- foreach my $field (@fields) {
- $pattern{$field} = '*' unless defined($pattern{$field});
- }
- my $new_fontstring = '-' . join('-', @pattern{@fields});
-
- my @possible;
- # $term->scr_add_lines("\r\nPattern is $new_fontstring\n");
- open(FOO, "xlsfonts -fn '$new_fontstring' | sort -u |") or die $!;
- while (<FOO>) {
- chomp;
- s/^-//; # Strip leading '-' before split
- my @fontdata = split(/-/, $_);
-
- push @possible, [$fontdata[6], "-$_"];
- # $term->scr_add_lines("\r\npossibly $fontdata[6] $_\n");
- }
- close(FOO);
-
- if (!@possible) {
- die "No possible fonts!";
- }
-
- if ($basesize != 0) {
- # sort by font size, descending
- @possible = sort {$b->[0] <=> $a->[0]} @possible;
-
- # font is not the base font, so find the largest font that is at most
- # as large as the base font. If the largest possible font is smaller
- # than the base font bail and hope that a 0-size font can be found at
- # the end of the function
- if ($possible[0]->[0] > $basesize) {
- foreach my $candidate (@possible) {
- if ($candidate->[0] <= $basesize) {
- return ($candidate->[1], $candidate->[0]);
- }
- }
- }
- } elsif ($change > 0) {
- # sort by font size, ascending
- @possible = sort {$a->[0] <=> $b->[0]} @possible;
-
- foreach my $candidate (@possible) {
- if ($candidate->[0] > $font{pixelSize}) {
- return ($candidate->[1], $candidate->[0]);
- }
- }
- } elsif ($change < 0) {
- # sort by font size, descending
- @possible = sort {$b->[0] <=> $a->[0]} @possible;
-
- foreach my $candidate (@possible) {
- if ($candidate->[0] < $font{pixelSize} && $candidate->[0] != 0) {
- return ($candidate->[1], $candidate->[0]);
- }
- }
- }
-
- # no fitting font available, check whether a 0-size font can be used to
- # fit the size of the base font
- @possible = sort {$a->[0] <=> $b->[0]} @possible;
- if ($basesize != 0 && $possible[0]->[0] == 0) {
- return ($possible[0]->[1], $basesize);
- } else {
- # if there is absolutely no smaller/larger font that can be used
- # return the current one, and beep if this is the base font
- if ($basesize == 0) {
- $term->scr_bell;
- }
- return ("-$fontstring", $font{pixelSize});
- }
-}
-
-sub font_apply_new
-{
- my ($term, $newfont, $type, $save) = @_;
-
- # $term->scr_add_lines("\r\nnew font is $newfont\n");
-
- $term->cmd_parse("\033]" . $escapecodes{$type} . ";" . $newfont . "\033\\");
-
- # load the xrdb db
- # system("xrdb -load " . X_RESOURCES);
-
- if ($save > 0) {
- # merge the new values
- open(XRDB_MERGE, "| xrdb -merge") || die "can't fork: $!";
- local $SIG{PIPE} = sub { die "xrdb pipe broken" };
- print XRDB_MERGE "URxvt." . $type . ": " . $newfont;
- close(XRDB_MERGE) || die "bad xrdb: $! $?";
- }
-}
View
3  gvimrc
@@ -1,3 +0,0 @@
-set guifont=Bitstream\ Vera\ Sans\ Mono\ Roman\ 11
-set vb t_vb=
-set guioptions-=TLrbm
View
9 vimrc
@@ -1,13 +1,8 @@
+syntax on
filetype on
filetype plugin on
filetype indent on
-
-" solarized settings
-let g:solarized_contrast="high" "default value is normal
-let g:solarized_hitrail=1 "default value is 0
-syntax enable
-set background=dark
-colorscheme solarized
+colorscheme wombat256
set term=screen-256color
set t_Co=256
Please sign in to comment.
Something went wrong with that request. Please try again.