diff --git a/.Xdefaults b/.Xdefaults index 7af9f3d..63bbbd6 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -55,3 +55,10 @@ URxvt.colorUL: #cc0000 !Emacs*background:black !Emacs*foreground:white +!Emacs*font: -*-bitstream vera sans mono-*-*-*-*-*-*-*-*-*-*-*-* +!Emacs*font: -bitstream-bitstream vera sans mono-medium-r-normal-*-12-120-75-75-m-0-iso8859-1:antialias=True +!Emacs*font: Bitstream Vera Sans Mono:antialias=True:pixelsize=11 +Emacs*font: Bitstream Vera Sans Mono-8:antialias=True +Emacs*menuBar: off +Emacs*toolBar: off +Emacs.verticalScrollBars: off diff --git a/.emacs b/.emacs index 56847df..d00be0f 100644 --- a/.emacs +++ b/.emacs @@ -1,8 +1,6 @@ (mapcar (lambda (x) (add-to-list 'load-path (expand-file-name x))) '("~/.emacs.d" - "/usr/share/emacs/site-lisp/clojure-mode" - "/usr/share/emacs/site-lisp/slime" - "/usr/share/emacs/site-lisp/swank-clojure")) + )) (defun require-all (packages) (mapcar #'require packages)) @@ -12,6 +10,7 @@ ido color-theme gentooish + irblack parenface bar-cursor )) @@ -20,18 +19,18 @@ ;; GLOBAL (color-theme-initialize) -(if window-system - (color-theme-gentooish) - (color-theme-dark-laptop)) +;(if window-system +; (color-theme-gentooish) +; (color-theme-dark-laptop)) +(color-theme-irblack) (bar-cursor-mode 1) - -(tool-bar-mode 0) (menu-bar-mode 0) (global-linum-mode) (setq linum-format "%3d ") (setq-default indent-tabs-mode nil) (setq indent-tabs-mode nil) +(set-language-environment "UTF-8") (winner-mode t) (tooltip-mode nil) @@ -39,7 +38,7 @@ (setq column-number-mode nil) (setq size-indication-mode nil) (setq mode-line-position nil) -(ido-mode 1) +(ido-mode t) (global-set-key "\C-m" 'reindent-then-newline-and-indent) ;No tabs (global-set-key "\C-a" 'beginning-of-line-text) @@ -79,7 +78,7 @@ (defadvice yank (after indent-region activate) (if (member major-mode '(clojure-mode emacs-lisp-mode lisp-mode)) (let ((mark-even-if-inactive t)) - (indent-region (region-beginning) (region-end) nil)))) + (indent-region (region-beginning) (region-end) nil)))) (defun tab-fix () (local-set-key [tab] 'indent-or-expand)) @@ -91,29 +90,8 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Clojure / SLIME -(require 'swank-clojure-autoload) -(setq swank-clojure-binary "~/local/bin/clj-server") - -(require-all '( - slime - clojure-mode - )) - -;(setq slime-net-coding-system 'utf-8-unix) - -(setq auto-mode-alist - (cons '("\\.clj$" . clojure-mode) - auto-mode-alist)) - -;(set-language-environment "UTF-8") -;(setq slime-net-coding-system 'utf-8-unix) -;;(slime-setup '(slime-fancy)) -(slime-setup) -(define-key clojure-mode-map (kbd "") 'indent-or-expand) -(add-hook 'slime-connected-hook 'slime-redirect-inferior-output) - -(defun lisp-enable-paredit-hook () (paredit-mode 1)) -(add-hook 'clojure-mode-hook 'lisp-enable-paredit-hook) +(add-to-list 'auto-mode-alist '("\\.clj$" . clojure-mode)) +;(define-key clojure-mode-map (kbd "") 'indent-or-expand) (defmacro defclojureface (name color desc &optional others) `(defface ,name '((((class color)) (:foreground ,color ,@others))) ,desc :group 'faces)) @@ -140,8 +118,6 @@ (add-hook 'clojure-mode-hook 'tweak-clojure-syntax) -;;(add-to-list 'slime-lisp-implementations '(sbcl ("/usr/bin/sbcl"))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Custom (custom-set-variables @@ -166,18 +142,21 @@ '(mode-line-modes (quote ("%[" "(" (:propertize ("" mode-name)) ("" mode-line-process) (:propertize ("" minor-mode-alist)) "%n" ")" "%]"))) '(require-final-newline t) '(savehist-mode t nil (savehist)) - '(scroll-bar-mode nil) '(scroll-conservatively 100000) '(scroll-down-aggressively 0.0) - '(scroll-margin 0) + '(scroll-margin 4) '(scroll-step 1) '(scroll-up-aggressively 0.0) '(show-paren-mode t nil (paren)) - '(slime-compilation-finished-hook nil) - '(swank-clojure-extra-classpaths (quote ("/usr/share/emacs/site-lisp/swank-clojure/src/main/clojure")))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(default ((t (:inherit nil :stipple nil :background "#171717" :foreground "#c0c0c0" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 90 :width normal :foundry "bitstream" :family "Bitstream Vera Sans Mono"))))) + ) + + +;;; This was installed by package-install.el. +;;; This provides support for the package system and +;;; interfacing with ELPA, the package archive. +;;; Move this code earlier if you want to reference +;;; packages in your .emacs. +(when + (load + (expand-file-name "~/.emacs.d/elpa/package.el")) + (package-initialize)) diff --git a/.emacs.d/history b/.emacs.d/history deleted file mode 100644 index 5b3faf3..0000000 --- a/.emacs.d/history +++ /dev/null @@ -1,8 +0,0 @@ -;; -*- mode: emacs-lisp; coding: utf-8-unix -*- -;; Minibuffer history file, automatically generated by `savehist'. - -(setq savehist-minibuffer-history-variables '(ido-buffer-history extended-command-history yes-or-no-p-history ido-file-history)) -(setq ido-buffer-history '("2" "ha" "Tu" "Me")) -(setq extended-command-history '("menu-bar-mode" "make-frame" "auto-fill-mode" "text-mode" "slime" "imenu" "slime" "slime-abort-connection" "slime" "slime-abort-connection" "slime" "slime-abort-connection" "slime")) -(setq yes-or-no-p-history '("yes" "yse" "yes")) -(setq ido-file-history '("2." "ha" "eu" "Scripts/" "2." "ha" "eu" "Scripts/" "some.hs" "xmonad.hs" ".xmonad/" "xmonad.hs" ".xmonad/" ".emacs" "n" "de" "src/" "vim" "Downloads/")) diff --git a/.emacs.d/irblack.el b/.emacs.d/irblack.el new file mode 100644 index 0000000..a213d4e --- /dev/null +++ b/.emacs.d/irblack.el @@ -0,0 +1,85 @@ +;; IR_Black Color Theme for Emacs. +;; +;; David Zhou +;; +;; The IR_Black theme is originally from: +;; +;; http://blog.infinitered.com/entries/show/8 +;; +(require 'color-theme) + + +(defun color-theme-irblack () + "IR_black theme taken from Vim" + (interactive) + (color-theme-install + '(color-theme-irblack + ((background-color . "#000000") + (background-mode . dark) + (border-color . "#454545") + (cursor-color . "#A8FF60") + (foreground-color . "#F6F3E8") + (mouse-color . "#A8FF60")) + (default ((t (:background "#000000" :foreground "#F6F3E8")))) + (vertical-border ((t (:background "#666666")))) + (blue ((t (:foreground "blue")))) + (border-glyph ((t (nil)))) + (buffers-tab ((t (:background "#141414" :foreground "#CACACA")))) + (font-lock-comment-face ((t (:foreground "#7C7C7C")))) + (font-lock-constant-face ((t (:foreground "#99CC99")))) + (font-lock-doc-string-face ((t (:foreground "#A8FF60")))) + (font-lock-function-name-face ((t (:foreground "#FFD2A7")))) + (font-lock-builtin-face ((t (:foreground "#96CBFE")))) + (font-lock-keyword-face ((t (:foreground "#96CBFE")))) + (font-lock-preprocessor-face ((t (:foreground "#96CBFE")))) + (font-lock-reference-face ((t (:foreground "#C6C5FE")))) + + (font-lock-regexp-grouping-backslash ((t (:foreground "#E9C062")))) + (font-lock-regexp-grouping-construct ((t (:foreground "red")))) + + (linum ((t (:background "#000000" :foreground "#666666")))) + + (minibuffer-prompt ((t (:foreground "#888888")))) + (ido-subdir ((t (:foreground "#CF6A4C")))) + (ido-first-match ((t (:foreground "#8F9D6A")))) + (ido-only-match ((t (:foreground "#8F9D6A")))) + (mumamo-background-chunk-submode ((t (:background "#222222")))) + + (font-lock-string-face ((t (:foreground "#A8FF60")))) + (font-lock-type-face ((t (:foreground "#FFFFB6")))) + (font-lock-variable-name-face ((t (:foreground "#C6C5FE")))) + (font-lock-warning-face ((t (:background "#CC1503" :foreground "#FFFFFF")))) + (gui-element ((t (:background "#D4D0C8" :foreground "black")))) + (region ((t (:background "#660000")))) + (mode-line ((t (:background "grey75" :foreground "black")))) + (highlight ((t (:background "#111111")))) + (highline-face ((t (:background "SeaGreen")))) + (left-margin ((t (nil)))) + (text-cursor ((t (:background "yellow" :foreground "black")))) + (toolbar ((t (nil)))) + (show-paren-mismatch ((t (:background "#FF1100")))) + (underline ((nil (:underline nil)))) + + ;; mumamo + (mumamo-background-chunk-major ((t (:background "#000000")))) + (mumamo-background-chunk-submode1 ((t (:background "#0A0A0A")))) + (mumamo-background-chunk-submode2 ((t (:background "#0A0A0A")))) + (mumamo-background-chunk-submode3 ((t (:background "#0A0A0A")))) + (mumamo-background-chunk-submode4 ((t (:background "#0A0A0A")))) + + ;; diff-mode + (diff-added ((t (:background "#253B22" :foreground "#F8F8F8")))) + (diff-removed ((t (:background "#420E09" :foreground "#F8F8F8")))) + (diff-content ((t nil))) + (diff-header ((t (:background "#0E2231" :foreground "#F8F8F8")))) + + + ;; nxml + (nxml-delimiter ((t (:foreground "#96CBFE")))) + (nxml-name ((t (:foreground "#96CBFE")))) + (nxml-element-local-name ((t (:foreground "#96CBFE")))) + (nxml-attribute-local-name ((t (:foreground "#FFD7B1")))) + + ))) + +(provide 'irblack) diff --git a/.vim/colors/ir_black.vim b/.vim/colors/ir_black.vim new file mode 100644 index 0000000..2e151d8 --- /dev/null +++ b/.vim/colors/ir_black.vim @@ -0,0 +1,212 @@ +" ir_black color scheme +" More at: http://blog.infinitered.com/entries/show/8 + + +" ******************************************************************************** +" Standard colors used in all ir_black themes: +" Note, x:x:x are RGB values +" +" normal: #f6f3e8 +" +" string: #A8FF60 168:255:96 +" string inner (punc, code, etc): #00A0A0 0:160:160 +" number: #FF73FD 255:115:253 +" comments: #7C7C7C 124:124:124 +" keywords: #96CBFE 150:203:254 +" operators: white +" class: #FFFFB6 255:255:182 +" method declaration name: #FFD2A7 255:210:167 +" regular expression: #E9C062 233:192:98 +" regexp alternate: #FF8000 255:128:0 +" regexp alternate 2: #B18A3D 177:138:61 +" variable: #C6C5FE 198:197:254 +" +" Misc colors: +" red color (used for whatever): #FF6C60 255:108:96 +" light red: #FFB6B0 255:182:176 +" +" brown: #E18964 good for special +" +" lightpurpleish: #FFCCFF +" +" Interface colors: +" background color: black +" cursor (where underscore is used): #FFA560 255:165:96 +" cursor (where block is used): white +" visual selection: #1D1E2C +" current line: #151515 21:21:21 +" search selection: #07281C 7:40:28 +" line number: #3D3D3D 61:61:61 + + +" ******************************************************************************** +" The following are the preferred 16 colors for your terminal +" Colors Bright Colors +" Black #4E4E4E #7C7C7C +" Red #FF6C60 #FFB6B0 +" Green #A8FF60 #CEFFAB +" Yellow #FFFFB6 #FFFFCB +" Blue #96CBFE #FFFFCB +" Magenta #FF73FD #FF9CFE +" Cyan #C6C5FE #DFDFFE +" White #EEEEEE #FFFFFF + + +" ******************************************************************************** +set background=dark +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "ir_black" + + +"hi Example guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + +" General colors +hi Normal guifg=#f6f3e8 guibg=black gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE +hi NonText guifg=#070707 guibg=black gui=NONE ctermfg=black ctermbg=NONE cterm=NONE + +hi Cursor guifg=black guibg=white gui=NONE ctermfg=black ctermbg=white cterm=reverse +hi LineNr guifg=#3D3D3D guibg=black gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE + +hi VertSplit guifg=#202020 guibg=#202020 gui=NONE ctermfg=darkgray ctermbg=darkgray cterm=NONE +hi StatusLine guifg=#CCCCCC guibg=#202020 gui=italic ctermfg=white ctermbg=darkgray cterm=NONE +hi StatusLineNC guifg=black guibg=#202020 gui=NONE ctermfg=blue ctermbg=darkgray cterm=NONE + +hi Folded guifg=#a0a8b0 guibg=#384048 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE +hi Title guifg=#f6f3e8 guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=NONE +hi Visual guifg=NONE guibg=#262D51 gui=NONE ctermfg=NONE ctermbg=darkgray cterm=NONE + +hi SpecialKey guifg=#808080 guibg=#343434 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + +hi WildMenu guifg=green guibg=yellow gui=NONE ctermfg=black ctermbg=yellow cterm=NONE +hi PmenuSbar guifg=black guibg=white gui=NONE ctermfg=black ctermbg=white cterm=NONE +"hi Ignore guifg=gray guibg=black gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + +hi Error guifg=NONE guibg=NONE gui=undercurl ctermfg=white ctermbg=red cterm=NONE guisp=#FF6C60 " undercurl color +hi ErrorMsg guifg=white guibg=#FF6C60 gui=BOLD ctermfg=white ctermbg=red cterm=NONE +hi WarningMsg guifg=white guibg=#FF6C60 gui=BOLD ctermfg=white ctermbg=red cterm=NONE + +" Message displayed in lower left, such as --INSERT-- +hi ModeMsg guifg=black guibg=#C6C5FE gui=BOLD ctermfg=black ctermbg=cyan cterm=BOLD + +if version >= 700 " Vim 7.x specific colors + hi CursorLine guifg=NONE guibg=#121212 gui=NONE ctermfg=NONE ctermbg=NONE cterm=BOLD + hi CursorColumn guifg=NONE guibg=#121212 gui=NONE ctermfg=NONE ctermbg=NONE cterm=BOLD + hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=BOLD ctermfg=white ctermbg=darkgray cterm=NONE + hi Pmenu guifg=#f6f3e8 guibg=#444444 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel guifg=#000000 guibg=#cae682 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi Search guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline +endif + +" Syntax highlighting +hi Comment guifg=#7C7C7C guibg=NONE gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE +hi String guifg=#A8FF60 guibg=NONE gui=NONE ctermfg=green ctermbg=NONE cterm=NONE +hi Number guifg=#FF73FD guibg=NONE gui=NONE ctermfg=magenta ctermbg=NONE cterm=NONE + +hi Keyword guifg=#96CBFE guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE +hi PreProc guifg=#96CBFE guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE +hi Conditional guifg=#6699CC guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE " if else end + +hi Todo guifg=#8f8f8f guibg=NONE gui=NONE ctermfg=red ctermbg=NONE cterm=NONE +hi Constant guifg=#99CC99 guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE + +hi Identifier guifg=#C6C5FE guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE +hi Function guifg=#FFD2A7 guibg=NONE gui=NONE ctermfg=brown ctermbg=NONE cterm=NONE +hi Type guifg=#FFFFB6 guibg=NONE gui=NONE ctermfg=yellow ctermbg=NONE cterm=NONE +hi Statement guifg=#6699CC guibg=NONE gui=NONE ctermfg=lightblue ctermbg=NONE cterm=NONE + +hi Special guifg=#E18964 guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE +hi Delimiter guifg=#00A0A0 guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE +hi Operator guifg=white guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE + +hi link Character Constant +hi link Boolean Constant +hi link Float Number +hi link Repeat Statement +hi link Label Statement +hi link Exception Statement +hi link Include PreProc +hi link Define PreProc +hi link Macro PreProc +hi link PreCondit PreProc +hi link StorageClass Type +hi link Structure Type +hi link Typedef Type +hi link Tag Special +hi link SpecialChar Special +hi link SpecialComment Special +hi link Debug Special + + +" Special for Ruby +hi rubyRegexp guifg=#B18A3D guibg=NONE gui=NONE ctermfg=brown ctermbg=NONE cterm=NONE +hi rubyRegexpDelimiter guifg=#FF8000 guibg=NONE gui=NONE ctermfg=brown ctermbg=NONE cterm=NONE +hi rubyEscape guifg=white guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE +hi rubyInterpolationDelimiter guifg=#00A0A0 guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE +hi rubyControl guifg=#6699CC guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE "and break, etc +"hi rubyGlobalVariable guifg=#FFCCFF guibg=NONE gui=NONE ctermfg=lightblue ctermbg=NONE cterm=NONE "yield +hi rubyStringDelimiter guifg=#336633 guibg=NONE gui=NONE ctermfg=lightgreen ctermbg=NONE cterm=NONE +"rubyInclude +"rubySharpBang +"rubyAccess +"rubyPredefinedVariable +"rubyBoolean +"rubyClassVariable +"rubyBeginEnd +"rubyRepeatModifier +"hi link rubyArrayDelimiter Special " [ , , ] +"rubyCurlyBlock { , , } + +hi link rubyClass Keyword +hi link rubyModule Keyword +hi link rubyKeyword Keyword +hi link rubyOperator Operator +hi link rubyIdentifier Identifier +hi link rubyInstanceVariable Identifier +hi link rubyGlobalVariable Identifier +hi link rubyClassVariable Identifier +hi link rubyConstant Type + + +" Special for Java +" hi link javaClassDecl Type +hi link javaScopeDecl Identifier +hi link javaCommentTitle javaDocSeeTag +hi link javaDocTags javaDocSeeTag +hi link javaDocParam javaDocSeeTag +hi link javaDocSeeTagParam javaDocSeeTag + +hi javaDocSeeTag guifg=#CCCCCC guibg=NONE gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE +hi javaDocSeeTag guifg=#CCCCCC guibg=NONE gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE +"hi javaClassDecl guifg=#CCFFCC guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE + + +" Special for XML +hi link xmlTag Keyword +hi link xmlTagName Conditional +hi link xmlEndTag Identifier + + +" Special for HTML +hi link htmlTag Keyword +hi link htmlTagName Conditional +hi link htmlEndTag Identifier + + +" Special for Javascript +hi link javaScriptNumber Number + + +" Special for Python +"hi link pythonEscape Keyword + + +" Special for CSharp +hi link csXmlTag Keyword + + +" Special for PHP diff --git a/.vim/syntax/j.vim b/.vim/syntax/j.vim new file mode 100644 index 0000000..154c562 --- /dev/null +++ b/.vim/syntax/j.vim @@ -0,0 +1,134 @@ +" Vim syntax file +" Language: J +" Maintainer: Bill Lam +" Last Change: +" 2008 Apr 04 Initial commit +" 2009 Feb 13 UPload to jwiki + +" It is by no means complete. +" Send comments, suggestions and requests to the maintainer. + +if exists("b:current_syntax") + finish +endif + +if exists("j_minlines") + let b:j_minlines = j_minlines +else + let b:j_minlines = 15 +endif +exec "syn sync linebreaks=1 minlines=" . b:j_minlines + +" jVerb +" = < <. <: > >. >: _: + +. +: * *. *: - -. -: % %. %: ^ ^. $ $. $: ~. ~: | |. |: +" , ,. ,: ; ;: # #. #: ! /: \: [ [: ] { {. {: {:: }. }: ". ": ? ?. +" A. c. C. e. E. i. i: I. j. L. o. p. p: q: r. s: u: x: +" _9: _8: _7: _6: _5: _4: _3: _2: _1: 0: 1: 2: 3: 4: 5: 6: 7: 8: 9: +" jNoun +" a. a: _. _: +" jConjuction +" ^: . .. .: : :. :: ;. !. !: " ` `: @ @. @: & &. &: &.: d. D. D: H. L: S: T. +" jAdverb +" ~ / \ /. \. } b. f. M. t. t: + +syn match jName "\a\w*" +syn match jArgument "\<[xymnuv]\.\=\>" contained +syn match jNumber "[_0-9][_0-9\.a-zA-Z]*" + +syn match jConjunction "\." +syn match jConjunction ":" + +syn match jVerb "[-!#$%\*+,;<=>\?[\]^{|]" +syn match jConjunction "[\"&@`]" +syn match jAdverb "[/\\}~]" + +syn match jVerb "[-\"#\$%\*+,<>\?^{|}~]\." +syn match jConjunction "[!&@;:\.]\." +syn match jAdverb "[/\\]\." +syn match jVerb "p\.\." + +syn match jVerb "[-\"#\$%\*+,;<>\?\[{|}~/\\]:" +syn match jConjunction "[!&@^\.:]:" +syn match jConjunction "&\.:" +syn match jVerb "{::" +syn match jVerb "_\=\d:" + +syn match jVerb "[AcCeEiIjLopr]\." +syn match jConjunction "[dDHT]\." +syn match jAdverb "[bfMt]\." + +syn match jVerb "[ipqsux]:" +syn match jConjunction "[DLS]:" +syn match jAdverb "t:" + +syn match jNoun "[a_][\.:]" +syn match jCopula "=[\.:]" +syn match jParenthesis "[()]" + +syn match jControl "\ { [ period, greater, dead_breve, dead_abovedot ] }; key { [ p, P, paragraph ] }; key { [ y, Y, yen, heart ] }; - key { [ BackSpace, bar, brokenbar ] }; + key { [ BackSpace, bar, brokenbar ] }; // Upper row, right side key { [ f, F ] }; @@ -86,7 +86,8 @@ xkb_keymap { key { [ Caps_Lock ] }; key { [ Super_L ] }; key { [ space, space ] }; - key { [ Menu ] }; + key { [ Super_R ] }; +// key { [ Menu ] }; modifier_map Lock { }; modifier_map Control { };