Cleanup

3 files changed, 444 insertions, 1 deletions

diff --git a/xorg/gtkrc-2.0 b/xorg/gtkrc-2.0
new file mode 100644
index 0000000..7e04893
--- /dev/null
+++ b/xorg/gtkrc-2.0
@@ -0,0 +1 @@
+gtk-font-name="Sans Serif 7" 
diff --git a/xorg/neo2 b/xorg/neo2
new file mode 100644
index 0000000..00a6034
--- /dev/null
+++ b/xorg/neo2
@@ -0,0 +1,442 @@
+// based on a keyboard map from an 'xkb/symbols/de' file
+//
+// $XKeyboardConfig: xkeyboard-config/symbols/de,v 1.17 2007/07/15 22:12:12 svu Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
+
+default
+xkb_symbols "basic" {
+
+    include "latin(type4)"
+
+    name[Group1]="Germany";
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
+    key <AE03>	{ [         3,    section, threesuperior,    sterling ]	};
+    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
+
+    key <AE11> {type[Group1]="FOUR_LEVEL_PLUS_LOCK",  symbols[Group1]=
+                  [ssharp, question, backslash, questiondown, 0x1001E9E ]};
+// The unicode capital letter sharp s U+1E9E is transformed to "SS"
+// to match the rules for capitalizing sharp s in german.
+// If the capital sharp s is needed, delete the line
+// starting with <U1E9C> from /usr/share/X11/locale/iso8859-15/Compose.
+// If both doubled S and capital sharp s are needed, use  0x1001E9E
+// for capital sharp s and some free unicode codepoint like 0x1001E9C
+// for doubled S. Don`t forget to change this in the Compose file, too.
+
+    key <AE12>	{ [dead_acute, dead_grave, dead_cedilla,  dead_ogonek ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
+    key <AD06>	{ [         z,          Z,    leftarrow,          yen ]	};
+    key <AD11>	{ [udiaeresis, Udiaeresis, dead_diaeresis, dead_abovering ] };
+    key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};
+
+    key <AC10>	{ [odiaeresis, Odiaeresis, dead_doubleacute, dead_doubleacute ] };
+    key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_caron]	};
+    key <TLDE>	{ [dead_circumflex, degree,     notsign,      notsign ]	};
+
+    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_breve ]	};
+    key <AB01>	{ [         y,          Y, guillemotleft,        less ]	};
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // modify the basic German layout to not have any dead keys
+
+    include "de(basic)"
+    name[Group1]="Germany - Eliminate dead keys";
+
+    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
+    key <AE12>	{ [apostrophe,      grave,      cedilla,      cedilla ]	};
+    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde,       macron ]	};
+    key <AC10>	{ [odiaeresis, Odiaeresis,  doubleacute,  doubleacute ]	};
+    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,  asciicircum ]	};
+    key <BKSL>	{ [numbersign, apostrophe,        grave,        grave ]	};
+    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "deadgraveacute" {
+    // modify the basic German layout to have only acute and grave
+    // as dead keys (tilde and circumflex are needed as spacing characters
+    // in many programming languages)
+
+    include "de(basic)"
+    name[Group1]="Germany - Dead grave acute";
+
+    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde,  dead_macron ]	};
+    key <BKSL>	{ [numbersign, apostrophe,        grave,        grave ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "deadacute" {
+    // modify the basic German layout to have only acute as
+    // dead keys (ASCII grave, tilde and circumflex are needed as
+    // spacing characters in many programming languages and text formatters)
+
+    include "de(deadgraveacute)"
+
+    name[Group1]="Germany - Dead acute";
+
+    key <AE12>	{ [dead_acute,      grave, dead_cedilla,  dead_ogonek ]	};
+    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_grave ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "ro" {
+    // add romanian-specific letters to the basic German layout.
+    // Romanian symbols are accessible with combination of <AltGr> and
+    // 'a', 's', 't', 'i', 'ä (&auml)' (+<Shift> for capital letters).
+    // To view romanian-specific symbols, add "export LC_CTYPE=ro_RO"
+    // or "export LC_CTYPE=de_DE.utf8" to your .profile.
+
+    include "de(basic)"
+
+    name[Group1]="Germany - Romanian keyboard with German letters";
+
+    key <AD05> { [         t,    T,           tcedilla,     Tcedilla    ] };
+    key <AD08> { [         i,    I,        icircumflex,  Icircumflex    ] };
+    key <AC01> { [         a,    A,        acircumflex,  Acircumflex    ] };
+    key <AC02> { [         s,    S,           scedilla,     Scedilla    ] };
+    key <AC11> { [ adiaeresis,   Adiaeresis,    abreve,       Abreve    ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "ro_nodeadkeys" {
+    // add romanian-specific letters to the German nodeadkeys layout.
+    // Read the comment for de_ro !
+
+    include "de(nodeadkeys)"
+    name[Group1]="Germany - Romanian keyboard with German letters, eliminate dead keys";
+
+    key <AD05> { [         t,    T,           tcedilla,     Tcedilla    ] };
+    key <AD08> { [         i,    I,        icircumflex,  Icircumflex    ] };
+    key <AC01> { [         a,    A,        acircumflex,  Acircumflex    ] };
+    key <AC02> { [         s,    S,           scedilla,     Scedilla    ] };
+    key <AC11> { [ adiaeresis,   Adiaeresis, abreve,       Abreve       ] };
+};
+
+// German Dvorak keymap by Thorsten Staerk (www.staerk.de/thorsten)
+// Have acute and grave as dead keys, tilde and circumflex alive as they are needed 
+// in many programming languages.
+// to use this keymap, use a 105-key-keyboard and the command setxkbmap -model pc105 -layout dvorak -variant de
+// source: http://www-lehre.informatik.uni-osnabrueck.de/~rfreund/dvorak.php
+partial alphanumeric_keys 
+xkb_symbols "dvorak" {
+    include "us(dvorak)"
+
+    name[Group1]="Germany - Dvorak";
+
+    key <TLDE> { [ asciicircum, degree ] };
+
+    key <AE01> { [ 1, exclam, onesuperior ] };
+    key <AE02> { [ 2, quotedbl, twosuperior ] };
+    key <AE03> { [ 3, section, threesuperior ] };
+    key <AE04> { [ 4, dollar, bar ] };
+    key <AE05> { [ 5, percent, bar ] };
+    key <AE06> { [ 6, ampersand, brokenbar ] };
+    key <AE07> { [ 7, slash, braceleft ] };
+    key <AE08> { [ 8, parenleft, bracketleft ] };
+    key <AE09> { [ 9, parenright, bracketright ] };
+    key <AE10> { [ 0, equal, braceright ] };
+    key <AE11> { [ plus, asterisk, asciitilde ] };
+    key <AE12> { [ less, greater, dead_grave ] };
+
+    key <AD01> { [ udiaeresis, Udiaeresis, at ] };
+    key <AD02> { [ comma, semicolon, dead_diaeresis ] };
+    key <AD03> { [ period, colon ] };
+    key <AD08> { [ c, C, copyright, Cacute ] };
+    key <AD09> { [ t, T, trademark ] };
+    key <AD10> { [ z, Z, zabovedot, Zabovedot ] };
+    key <AD11> { [ question, ssharp ] };
+    key <AD12> { [ slash, backslash, dead_acute ] };
+
+    key <AC01> { [ a, A, at, aogonek ] };
+    key <AC02> { [ o, O, oacute, Oacute ] };
+    key <AC03> { [ e, E, EuroSign, eogonek ] };
+    key <AC04> { [ i, I ] };
+    key <AC05> { [ u, U ] };
+    key <AC06> { [ h, H ] };
+    key <AC07> { [ d, D ] };
+    key <AC08> { [ r, R, registered ] };
+    key <AC09> { [ n, N, nacute, Nacute ] };
+    key <AC10> { [ s, S, sacute, Sacute] };
+    key <AC11> { [ l, L, lstroke, Lstroke ] };
+
+    key <AB01> { [ odiaeresis, Odiaeresis ] };
+    key <AB02> { [ q, Q, at ] };
+    key <AB07> { [ m, M, mu ] };
+    key <AB10> { [ numbersign, apostrophe ] };
+
+    key <BKSL> { [ minus, underscore, hyphen, diaeresis] };
+
+    key <LSGT> { [ adiaeresis, Adiaeresis, bar ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // For naming consistency
+
+    include "de(basic)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+    // For naming consistency
+
+    include "de(Sundeadkeys)"
+
+    name[Group1]="Germany - Sun dead keys";
+};
+
+
+// German NEO-Layout
+// adopted 2004 by Hanno Behrens <Hanno.Behrens@gmx.de>
+// inspired by Dvorak/de-ergo  http://www.goebel-consult.de/de-ergo/
+//
+// Authors: 
+//      <lucky at zankt dot net>
+//      Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany>
+//
+// Other Questions:
+//      <mailinglist at neo-layout dot org>
+//
+// $Revision$, $Date$
+// http://pebbles.schattenlauf.de/layout.php
+
+
+partial alphanumeric_keys modifier_keys keypad_keys
+xkb_symbols "neo" {
+
+    name[Group1]= "German Neostyle";
+
+    // Modifier definition
+    // -----------------------
+
+    // Mod3 (FIXME Nur CAPS+BKSL ist Caps_Lock – Nicht andersherum, siehe Ticket #30)
+    key.type[Group1]="THREE_LEVEL";
+    key <BKSL> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
+    key <CAPS> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
+
+    // Definition des Neo-Mod4
+    key.type[Group1]="ONE_LEVEL";
+    key <LSGT> { [ 0xfe11 ]};
+    key <RALT> { [ 0xfe11 ]};
+    modifier_map Mod3 { <LSGT>, <RALT> };
+    // Achtung:  ^^^ Dies ist eine X-Server-Variable, nicht unser Mod3.
+
+    // Ebenen im Neo-Jargon, hier im Treiber andere Reihenfolge
+    // -------------------------------------------------------------
+    // Ebene 1: normal
+    // Ebene 2: Shift
+    // Ebene 3: Mod3
+    // Ebene 4: Mod4 (zum Markieren Shift+Mod4)
+    // Ebene 5: Shift+Mod3
+    // Ebene 6: Mod3+Mod4 (in dieser Reihenfolge)
+    // Compose (keine eigene Ebene): Mod3+Tab
+    // Feststelltaste (Capslock): Shift+Shift
+    //
+    // Ebenen im Xkeymap-Jargon, hier in der Treiberdatei
+    // -------------------------------------------------------
+    // Die von uns genannte Ebene 6 ist auf den X-Level 7 
+    // verschoben, da der X-Level 6 mit Shift+Mod4 zu erreichen ist.
+    // Die Navigationstasten von Ebene 4 (mit X-Mod4 bzw. X-Level 5)
+    // werden teilweise, um auch mit Shift+Mod4 zu funktionieren,
+    // nochmal im X-Level 6 wiederholt. Also so:
+    // Ebene1      Ebene2      Ebene3      Ebene5      Ebene4      Eb4+Shift      Ebene6
+    // X-Level1    X-Level2    X-Level3    X-Level4    X-Level5    X-Level6       X-Level7
+
+    key.type[Group1]="EIGHT_LEVEL_ALPHABETIC" ;
+
+    // general Lock
+    // -----------------
+    // Einrasten über linke Win-Taste+Modifier, Lösen über nochmaliges Betätigen des Modifiers
+    // ShiftLock und Mod5Lock funktionieren, aber Achtung:
+    // FIXME Mod3Lock lässt sich aber nicht mehr lösen!!!!
+
+
+    // Tab as Multi_key (Compose)
+    // -------------------------------
+    key  <TAB> { [ Tab, ISO_Left_Tab, Multi_key ] };
+
+    // number row
+    // ---------------
+
+    // These are the levels used, and Xorg's translations with type="EIGHT_LEVEL":
+    //  Base    Shift   Mod3    Shift+Mod3  Mod4    Shift+Mod4  Mod3+Mod4
+    //                          Mod5                            Mod6
+    //  Level1  Level2  Level3  Level4      Level5  Level6      Level7
+    //                  Ebene1          Ebene2          Ebene3                  Ebene5                  Ebene4          Ebene4+Shift    Ebene6
+
+    key <TLDE> { [ dead_circumflex, dead_caron,         dead_breve,             dead_stroke,        dead_belowdot,  NoSymbol,    dead_belowdot  ] };
+ 
+    key <AE01> { [ 1,           degree,                 onesuperior,            U2081,          enfilledcircbullet, NoSymbol,    notsign        ] };
+    key <AE02> { [ 2,           numerosign,             twosuperior,            U2082,              U2023,          NoSymbol,    logicalor      ] };
+    key <AE03> { [ 3,           section,                threesuperior,          U2083,              NoSymbol,       NoSymbol,    logicaland     ] };
+    key <AE04> { [ 4,           guillemotright,         U203A,                  U2113,              Prior,          Prior,       uptack         ] };
+    key <AE05> { [ 5,           guillemotleft,          U2039,                  femalesymbol,       NoSymbol,       NoSymbol,    U2221          ] };
+    key <AE06> { [ 6,           EuroSign,               cent,                   malesymbol,         sterling,       NoSymbol,    U2225          ] };
+
+    key <AE07> { [ 7,           dollar,                 yen,                    Greek_kappa,        currency,       NoSymbol,    U21C8          ] };
+    key <AE08> { [ 8,           doublelowquotemark,     singlelowquotemark,     U27E8,              KP_Divide,      NoSymbol,    U21C5          ] };
+    key <AE09> { [ 9,           leftdoublequotemark,    leftsinglequotemark,    U27E9,              KP_Multiply,    NoSymbol,    U220B          ] };
+    key <AE10> { [ 0,           rightdoublequotemark,   rightsinglequotemark,   U2080,              minus,          NoSymbol,    emptyset       ] };
+
+    key <AE11> { [ minus,       endash,                 emdash,                 U2011,              NoSymbol,       NoSymbol,    hyphen         ] };
+    key <AE12> { [ dead_acute,  dead_grave,             dead_cedilla,           dead_ogonek,        dead_abovedot,  NoSymbol,    dead_abovering ] };
+
+    // top row
+    // ------------
+    // xvlcwkhgfqß
+    key <AD01> { [ x,           X,                      ellipsis,               Greek_xi,           U22EE,          NoSymbol,    Greek_XI         ] };
+    key <AD02> { [ v,           V,                      underscore,             NoSymbol,           BackSpace,      BackSpace,   U2259            ] };
+    key <AD03> { [ l,           L,                      bracketleft,            Greek_lambda,       Up,             Up,          Greek_LAMBDA     ] };
+    key <AD04> { [ c,           C,                      bracketright,           Greek_chi,          Delete,         Delete,      U2102            ] };
+    key <AD05> { [ w,           W,                      asciicircum,            Greek_omega,        Insert,         Insert,      Greek_OMEGA      ] };
+
+    key <AD06> { [ k,           K,                      exclam,                 U03F0,              exclamdown,     NoSymbol,    radical          ] };
+    key <AD07> { [ h,           H,                      less,                   Greek_psi,          7,              NoSymbol,    Greek_PSI        ] };
+    key <AD08> { [ g,           G,                      greater,                Greek_gamma,        8,              NoSymbol,    Greek_GAMMA      ] };
+    key <AD09> { [ f,           F,                      equal,                  Greek_phi,          9,              NoSymbol,    Greek_PHI        ] };
+    key <AD10> { [ q,           Q,                      ampersand,              U03D5,              plus,           NoSymbol,    U211A            ] };
+    key <AD11> { [ ssharp,      U1E9E,                  U017F,              Greek_finalsmallsigma,  NoSymbol,       NoSymbol,    jot              ] };
+
+    key <AD12> { [ dead_tilde,  dead_macron,            dead_diaeresis,         dead_doubleacute,   dead_stroke,    NoSymbol,    NoSymmol         ] };
+
+    // middle row
+    // ---------------
+    // uiaeosnrtdy
+    key <AC01> { [ u,           U,                      backslash,              NoSymbol,           Home,           Home,        U222E             ] };
+    key <AC02> { [ i,           I,                      slash,                  Greek_iota,         Left,           Left,        integral          ] };
+    key <AC03> { [ a,           A,                      braceleft,              Greek_alpha,        Down,           Down,        U2200             ] };
+    key <AC04> { [ e,           E,                      braceright,             Greek_epsilon,      Right,          Right,       U2203             ] };
+    key <AC05> { [ o,           O,                      asterisk,               Greek_omicron,      End,            End,         elementof         ] };
+
+    key <AC06> { [ s,           S,                      question,               Greek_sigma,        questiondown,   NoSymbol,    Greek_SIGMA       ] };
+    key <AC07> { [ n,           N,                      parenleft,              Greek_nu,           4,              NoSymbol,    U2115             ] };
+    key <AC08> { [ r,           R,                      parenright,             U03F1,              5,              NoSymbol,    U211D             ] };
+    key <AC09> { [ t,           T,                      minus,                  Greek_tau,          6,              NoSymbol,    partialderivative ] };
+    key <AC10> { [ d,           D,                      colon,                  Greek_delta,        comma,          NoSymbol,    Greek_DELTA       ] };
+    key <AC11> { [ y,           Y,                      at,                     Greek_upsilon,      period,         NoSymbol,    nabla             ] };
+
+    // bottom row
+    // ---------------
+    // üöäpzbm,.j
+    key <AB01> { [ udiaeresis,  Udiaeresis,             numbersign,             NoSymbol,           Escape,         Escape,      variation         ] };
+    key <AB02> { [ odiaeresis,  Odiaeresis,             dollar,                 NoSymbol,           Tab,            Tab,         U2111             ] };
+    key <AB03> { [ adiaeresis,  Adiaeresis,             bar,                    Greek_eta,          Next,           Next,        U211C             ] };
+    key <AB04> { [ p,           P,                      asciitilde,             Greek_pi,           Return,         Return,      Greek_PI          ] };
+    key <AB05> { [ z,           Z,                      grave,                  Greek_zeta,         NoSymbol,       NoSymbol,    U2124             ] };
+
+    key <AB06> { [ b,           B,                      plus,                   Greek_beta,         colon,          NoSymbol,    U21D0             ] };
+    key <AB07> { [ m,           M,                      percent,                Greek_mu,           1,              NoSymbol,    ifonlyif          ] };
+    key <AB08> { [ comma,       NoSymbol,               quotedbl,               Greek_rho,          2,              NoSymbol,    U21D2             ] };
+    key <AB09> { [ period,      NoSymbol,               apostrophe,             U03D1,              3,              NoSymbol,    Greek_THETA       ] };
+    key <AB10> { [ j,           J,                      semicolon,              Greek_theta,        semicolon,      NoSymbol,    U221D             ] };
+
+    // Space key
+    // --------------
+    key <SPCE> { [ space,       space,                  space,                  nobreakspace,       0,              NoSymbol,    U202F             ] };
+
+    // Keypad
+    // ===========
+
+    // Num-Lock gibt es bei Neo nicht mehr:
+    //key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    // Die ehemalige Num-Lock-Taste erzeugt nun diverse Zeichen:
+    key <NMLK> { [ Tab,           ISO_Left_Tab,   equal,        U2248,        notequal,   NoSymbol,   U2261 ] };
+
+    // topmost row
+    // ----------------
+    key <KPDV> { [ KP_Divide,     KP_Divide,      division,     U2223,        U2300,      NoSymbol,   U2044 ] };
+    key <KPMU> { [ KP_Multiply,   KP_Multiply,    U22C5,        multiply,     U2299,      NoSymbol,   U2297 ] };
+    key <KPSU> { [ KP_Subtract,   KP_Subtract,    U2212,        U2216,        U2296,      NoSymbol,   U2238 ] };
+
+    // top row
+    // ------------
+    key  <KP7> { [ KP_7,          U2714,          U2195,        U230A,        KP_Home,    KP_Home,    U2308 ] };
+    key  <KP8> { [ KP_8,          U2718,          U2191,        U2229,        KP_Up,      KP_Up,      U22C2 ] };
+    key  <KP9> { [ KP_9,          dagger,         U20D7,        U230B,        KP_Prior,   KP_Prior,   U2309 ] };
+    key <KPAD> { [ KP_Add,        KP_Add,         plusminus,    U2213,        U2295,      NoSymbol,   U2214 ] };
+
+    // middle row
+    // ----------------
+    key  <KP4> { [ KP_4,          U2663,          leftarrow,    includedin,   KP_Left,    KP_Left,    U2286 ] };
+    key  <KP5> { [ KP_5,          EuroSign,       infinity,     U22B6,        KP_Begin,   KP_Begin,   U22B7 ] };
+    key  <KP6> { [ KP_6,          brokenbar,      rightarrow,   includes,     KP_Right,   KP_Right,   U2287 ] };
+
+    // bottom row
+    // ---------------
+    key  <KP1> { [ KP_1,          U2666,          U2194,        U226A,        KP_End,     KP_End,     U2264    ] };
+    key  <KP2> { [ KP_2,          U2665,          downarrow,    union,        KP_Down,    KP_Down,    U22C3    ] };
+    key  <KP3> { [ KP_3,          U2660,          U21CC,        U226B,        KP_Next,    KP_Next,    U2265    ] };
+    key <KPEN> { [ KP_Enter,      KP_Enter,       KP_Enter,     KP_Enter,     KP_Enter,   KP_Enter,   KP_Enter ] };
+    key <KPEQ> { [ KP_Equal ] };
+
+    // bottommost row
+    // -------------------
+    key  <KP0> { [ KP_0,         U2423,   percent,   U2030,        KP_Insert,   KP_Insert,   U25A1    ] };
+    key <KPDL> { [ KP_Decimal,   comma,   period,    apostrophe,   KP_Delete,   KP_Delete,   quotedbl ] };
+
+};
+
+// Copied from macintosh_vndr/de
+// olh@suse.de   very close to MacOS map
+
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    include "de"
+    name[Group1]= "Germany - Macintosh";
+
+    // Alphanumeric section
+    key <AE01>	{ [         1,     exclam,   exclamdown,           at ]	};
+    key <AE05>	{ [         5,    percent,  bracketleft       ]	};
+    key <AE06>	{ [         6,  ampersand, bracketright       ]	};
+    key <AE07>	{ [         7,      slash,          bar,    backslash ]	};
+    key <AE08>	{ [         8,  parenleft,    braceleft,   asciitilde ]	};
+    key <AE09>	{ [         9, parenright,   braceright       ]	};
+    key <AD01>	{ [         q,          Q, guillemotleft, guillemotright ]	};
+    key <AD04>	{ [         r,          R,   registered       ]	};
+    key <AD07>	{ [         u,          U,    diaeresis,       Aacute ]	};
+    key <AD08>	{ [         i,          I,        slash,  Ucircumflex ]	};
+    key <AD11>	{ [ udiaeresis, Udiaeresis, periodcentered,    degree ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde       ]	}; 
+    key <AC01>	{ [         a,          A,        aring,        Aring ]	};
+    key <AC05>	{ [         g,          G,    copyright       ]	};
+    key <AC06>	{ [         h,          H,  ordfeminine       ]	};
+    key <AC09>	{ [         l,          L,           at       ]	};
+    key <AC10>	{ [ odiaeresis, Odiaeresis,  dead_acute       ]	};
+    key <AB06>	{ [         n,          N,   asciitilde       ]	};
+
+};
+
+partial alphanumeric_keys 
+xkb_symbols "mac_nodeadkeys" {
+    // modify the standard German mac layout to not have any dead keys
+    include "de(mac)"
+    name[Group1]= "Germany - Macintosh, eliminate dead keys";
+    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
+
+    key <TLDE>	{ [ asciicircum,    degree,     notsign       ]	};
+    key <AE12>	{ [      acute,      grave,     cedilla       ]	};
+    key <AD11>	{ [ udiaeresis, Udiaeresis,   diaeresis       ]	};
+    key <AD12>	{ [       plus,   asterisk,  asciitilde,       macron ]	};
+    key <AC10>	{ [ odiaeresis, Odiaeresis,       acute       ]	};
+    key <AC11>	{ [ adiaeresis, Adiaeresis, asciicircum       ]	};
+
+    key <BKSL>	{ [ numbersign, apostrophe,       grave       ]	};
+};
diff --git a/xorg/xdefaults b/xorg/xdefaults
index 16a0f8a..014e59f 100644
--- a/xorg/xdefaults
+++ b/xorg/xdefaults
@@ -19,7 +19,7 @@ URxvt*inheritPixmap: false
 
 URxvt*keysym.M-u: perl:mark-yank-urls:activate_mark_mode
 URxvt*underlineURLs: true
-URxvt*perl-lib: /home/gideonstar/etc/
+URxvt*perl-lib: /home/gideonstar/etc/perl/
 URxvt*perl-ext: selection,mark-yank-urls
 URxvt*perl-ext-common: default,matcher
 URxvt*urlLauncher: firefox