summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.Xcommon20
-rw-r--r--.Xresources_solarized73
-rw-r--r--Xresources (renamed from .Xresources_gray)28
-rwxr-xr-xconkyrc (renamed from .conkyrc)0
-rw-r--r--gitconfig (renamed from .gitconfig)10
5 files changed, 24 insertions, 107 deletions
diff --git a/.Xcommon b/.Xcommon
deleted file mode 100644
index 314cfd8..0000000
--- a/.Xcommon
+++ /dev/null
@@ -1,20 +0,0 @@
-! dotfiles -- .Xcommon
-! author: johannst
-
-!xterm*font: 9x15
-!XTerm*renderFont: true
-!XTerm*faceName: Vera Serif Mono
-!XTerm*faceName: Liberation Mono
-!XTerm*faceName: Droid Sans Mono
-xterm*faceName: Terminess Powerline
-xterm*faceSize: 12
-
-XTerm*scaleHeight: 1.1
-xterm*metaSendsEscape: true
-xterm*saveLines: 16384
-xterm*loginShell: true
-xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48
-xterm*termName: xterm-256color
-xterm*eightBitInput: false
-XTerm*selectToClipboard: true
-XTerm*visualBell: false
diff --git a/.Xresources_solarized b/.Xresources_solarized
deleted file mode 100644
index 3995ec1..0000000
--- a/.Xresources_solarized
+++ /dev/null
@@ -1,73 +0,0 @@
-! dotfiles -- .Xresources_solarized
-! author: johannst
-
-#include ".Xcommon"
-
-! blue - gray mix with different brightness
-! S_base03 ^
-! S_base02 | brightness
-! S_base01 | reduces
-! S_base00 |
-
-#define S_base03 #002b36
-#define S_base02 #073642
-#define S_base01 #586e75
-#define S_base00 #657b83
-
-! S_base0 light blue
-! S_base1 light gray
-! S_base2 light beige
-! S_base3 super light yellow
-
-#define S_base0 #c8d9ea
-#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
-
-!! 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
diff --git a/.Xresources_gray b/Xresources
index 4c2ea62..c007c88 100644
--- a/.Xresources_gray
+++ b/Xresources
@@ -1,20 +1,30 @@
! dotfiles -- .Xresources_gray
! author: johannst
-#include ".Xcommon"
-
-! ------------------------------------------------------------------------------
-! --- generated with 4bit Terminal Color Scheme Designer -----------------------
-! --- http://ciembor.github.com/4bit -------------------------------------------
-! ------------------------------------------------------------------------------
-
+!XTerm*font: 9x15
+!XTerm*renderFont: true
+!XTerm*faceName: Vera Serif Mono
+!XTerm*faceName: Liberation Mono
+!XTerm*faceName: Droid Sans Mono
+XTerm*faceName: Terminess Powerline
+XTerm*faceSize: 12
+
+XTerm*scaleHeight: 1.1
+XTerm*metaSendsEscape: true
+XTerm*saveLines: 16384
+XTerm*loginShell: true
+XTerm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48
+XTerm*termName: xterm-256color
+XTerm*eightBitInput: false
+XTerm*selectToClipboard: true
+XTerm*visualBell: false
+
+! --- generated with http://ciembor.github.com/4bit
! --- special colors ---
-
*background: #262626
*foreground: #d9d9d9
! --- standard colors ---
-
! black
*color0: #000000
diff --git a/.conkyrc b/conkyrc
index b4b586d..b4b586d 100755
--- a/.conkyrc
+++ b/conkyrc
diff --git a/.gitconfig b/gitconfig
index 65d0e58..08c45e1 100644
--- a/.gitconfig
+++ b/gitconfig
@@ -1,14 +1,14 @@
-[alias]
- lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
- d = difftool
[user]
email = stoelp@eit.uni-kl.de
name = johannst
-[core]
- editor = vim
[diff]
tool = vimdiff
[difftool]
prompt = false
+[alias]
+ lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
+ d = difftool
+[core]
+ editor = vim
[color]
ui = true