From 4ae414ba4a4fc6cc4e54edde360ca91b549fc98b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 7 Sep 2013 19:18:14 +0200 Subject: [PATCH] Usex: swedish update --- .shell.d/alias_rc | 2 +- .xkb/symbols/usex | 30 +++++++++++++++--------------- .xprofile | 3 +++ 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.shell.d/alias_rc b/.shell.d/alias_rc index f34e9668..43010c02 100644 --- a/.shell.d/alias_rc +++ b/.shell.d/alias_rc @@ -89,7 +89,7 @@ alias xmorphsw='xrandr --output $(xrandr | grep "\" | cut -f1 -d" ") alias xmorphzo='xrandr --output $(xrandr | grep "\" | cut -f1 -d" ") --scale 1.2x1.2' alias xmorphzi='xrandr --output $(xrandr | grep "\" | cut -f1 -d" ") --scale 0.8x0.8' -alias xres='xrandr -s $(xrandr | awk '"'"'/^ / {print $1;exit}'"'"')' +alias xres='xrandr --output $(xrandr | awk '"'"'NR==2 {print $1;exit}'"'"') --auto && xrandr -s $(xrandr | awk '"'"'/^ / {print $1;exit}'"'"')' ##============================================================================== ## Zsh power aliases diff --git a/.xkb/symbols/usex b/.xkb/symbols/usex index 30a5cea1..0df7eb44 100644 --- a/.xkb/symbols/usex +++ b/.xkb/symbols/usex @@ -11,17 +11,17 @@ // We set Caps Lock to act as Left Control // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ -// │ ~ ~ │ ! ¡ │ @ ˝ │ # ¯ │ $ ¤ │ % ¢ │ ^ ^ │ & ½ │ * ˛ │ ( ˘ │ ) ¶ │ _ ⋅ │ + ÷ ┃ ⌫ Back ┃ -// │ ` ` │ 1 ¹ │ 2 ² │ 3 ³ │ 4 £ │ 5 € │ 6 ¼ │ 7 ½ │ 8 ¾ │ 9 ‘ │ 0 ’ │ - ¥ │ = × ┃ space ┃ +// │ ~ ~ │ ! ¡ │ @ ˝ │ # ¯ │ $ ¤ │ % ¢ │ ^ ^ │ & ¼ │ * ˛ │ ( ˘ │ ) │ _ ⋅ │ + ÷ ┃ ⌫ Back ┃ +// │ ` ` │ 1 ¹ │ 2 ² │ 3 ³ │ 4 £ │ 5 € │ 6 ¥ │ 7 ½ │ 8 ¾ │ 9 ‘ │ 0 ’ │ - ¶ │ = × ┃ space ┃ // ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫ -// ┃ ┃ Q À │ W È │ E É │ R ® │ T Ù │ Y Ü │ U Ú │ I Í │ O Ó │ P Ö │ { “ │ } ” ┃ Enter ┃ -// ┃Tab ↹ ┃ q à │ w è │ e é │ r ® │ t ù │ y ü │ u ú │ i í │ o ó │ p ö │ [ « │ ] » ┃ ⏎ ┃ +// ┃ ┃ Q À │ W È │ E É │ R ® │ T ™ │ Y Ù │ U Ú │ I Í │ O Ó │ P Å │ { “ │ } ” ┃ Enter ┃ +// ┃Tab ↹ ┃ q à │ w è │ e é │ r ® │ t © │ y ù │ u ú │ i í │ o ó │ p å │ [ « │ ] » ┃ ⏎ ┃ // ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃ // ┃ ┃ A Á │ S § │ D  │ F Ê │ G Î │ H Ô │ J Û │ K Œ │ L Æ │ : ° │ " ¨ │ | ¦ ┃ ┃ // ┃Ctrl ┃ a á │ s ß │ d â │ f ê │ g î │ h ô │ j û │ k œ │ l æ │ ; ° │ ' ´ │ \ ¬ ┃ ┃ // ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫ -// ┃ ┃ > ≥ │ Z Ä │ X Ë │ C ™ │ V Ï │ B B │ N Ñ │ M µ │ < Ç │ > ± │ ? ¿ ┃ ┃ -// ┃Shift ⇧┃ < ≤ │ z ä │ x ë │ c © │ v ï │ b b │ n ñ │ m µ │ , ç │ . ≠ │ / … ┃Shift ⇧ ┃ +// ┃ ┃ > ≥ │ Z Ä │ X Ë │ C Ï │ V Ö │ B Ü │ N Ñ │ M µ │ < Ç │ > ± │ ? ¿ ┃ ┃ +// ┃Shift ⇧┃ < ≤ │ z ä │ x ë │ c ï │ v ö │ b ü │ n ñ │ m µ │ , ç │ . ≠ │ / … ┃Shift ⇧ ┃ // ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛ // ┃Caps ┃ ┃ ┃ ␣ Non-breaking space ⍽ ┃ ┃ ┃ ┃ // ┃Lock ⇬ ┃Meta ┃Alt ┃ ␣ Space ␣ ┃AltGr ⇮┃Menu ┃Ctrl ┃ @@ -39,24 +39,24 @@ xkb_symbols "basic" { key { [ 3, numbersign, threesuperior, dead_macron ] }; key { [ 4, dollar, sterling, currency ] }; key { [ 5, percent, EuroSign, cent ] }; - key { [ 6, asciicircum, onequarter, dead_circumflex ] }; - key { [ 7, ampersand, onehalf, onehalf ] }; + key { [ 6, asciicircum, yen, dead_circumflex ] }; + key { [ 7, ampersand, onehalf, onequarter ] }; key { [ 8, asterisk, threequarters, dead_ogonek ] }; key { [ 9, parenleft, leftsinglequotemark, dead_breve ] }; key { [ 0, parenright, rightsinglequotemark, paragraph ] }; - key { [ minus, underscore, yen, 0x10022C5 ] }; + key { [ minus, underscore, paragraph, 0x10022C5 ] }; key { [ equal, plus, multiply, division ] }; key { [ q, Q, agrave, Agrave ] }; key { [ w, W, egrave, Egrave ] }; key { [ e, E, eacute, Eacute ] }; key { [ r, R, registered, registered ] }; - key { [ t, T, ugrave, Ugrave ] }; - key { [ y, Y, udiaeresis, Udiaeresis ] }; + key { [ t, T, copyright, trademark ] }; + key { [ y, Y, ugrave, Ugrave ] }; key { [ u, U, uacute, Uacute ] }; key { [ i, I, iacute, Iacute ] }; key { [ o, O, oacute, Oacute ] }; - key { [ p, P, odiaeresis, Odiaeresis ] }; + key { [ p, P, aring, Aring ] }; key { [ bracketleft, braceleft, guillemotleft, leftdoublequotemark ] }; key { [ bracketright, braceright, guillemotright, rightdoublequotemark ] }; @@ -74,9 +74,9 @@ xkb_symbols "basic" { key { [ z, Z, adiaeresis, Adiaeresis ] }; key { [ x, X, ediaeresis, Ediaeresis ] }; - key { [ c, C, copyright, trademark ] }; - key { [ v, V, idiaeresis, Idiaeresis ] }; - key { [ b, B, b, B ] }; + key { [ c, C, idiaeresis, Idiaeresis ] }; + key { [ v, V, odiaeresis, Odiaeresis ] }; + key { [ b, B, udiaeresis, Udiaeresis ] }; key { [ n, N, ntilde, Ntilde ] }; key { [ m, M, mu, mu ] }; key { [ comma, less, ccedilla, Ccedilla ] }; diff --git a/.xprofile b/.xprofile index aed66891..2cd1c9b3 100644 --- a/.xprofile +++ b/.xprofile @@ -34,3 +34,6 @@ fi ## This env variable is used by some programs (like ranger and awesome) to get ## terminal executable name. export TERMCMD="urxvt" + +## Hook. Should be sourced last +[ -f ~/.xprofile_hook ] && . ~/.xprofile_hook