diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-01-10 19:35:45 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-01-10 19:35:45 -0500 |
| commit | 0080a46069fc307a7e226e15e14a1afbed19f5cd (patch) | |
| tree | cda8a48bcead1dcab7ab74dce6b7e7db7b2921f9 | |
| parent | 473538dca921e785ce8f553b244cf3afb4ec5f0a (diff) | |
| parent | 971e265cac74976670da2a87805b644e90826b95 (diff) | |
Merge branch 'master' into gluglugt60-par/master
| -rw-r--r-- | .config/X11/modmap | 7 | ||||
| -rw-r--r-- | .config/emacs/init.el | 14 |
2 files changed, 10 insertions, 11 deletions
diff --git a/.config/X11/modmap b/.config/X11/modmap index 5d95690..22d2ac6 100644 --- a/.config/X11/modmap +++ b/.config/X11/modmap @@ -9,10 +9,17 @@ ! 2: Control ! 3-7: Mod{1-5} +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + ! My desktop doesn't have a super key, so I map Caps_Lock to Super_L ! Also, use Caps_Lock for the compose key +! +! Don't bother `remove lock = Caps_Lock`; it will get reset +! approprately by the modifier reset below. keysym Caps_Lock = Super_L Multi_key +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + ! The default modifier list is dumb. Wipe it and do something ! sensible. clear shift diff --git a/.config/emacs/init.el b/.config/emacs/init.el index cc120dd..d4facb8 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -90,23 +90,15 @@ (set (make-local-variable 'tab-width) 2) (set (make-local-variable 'indent-tabs-mode) nil) ))) +(use-package cmake-mode :mode ("CMakeLists\\.txt\\'" "\\.cmake\\'")) +(use-package glsl-mode :mode ("\\.vert\\'" "\\.frag\\'" "\\.geom\\'" "\\.glsl\\'")) +(use-package go-mode :mode "\\.go\\'") (use-package graphviz-dot-mode :mode ("\\.dot\\'" "\\.gv\\'") :config (add-hook 'graphviz-dot-mode-hook '(lambda () (set (make-local-variable 'graphviz-dot-auto-indent-on-semi) nil) ))) -;;(use-package php-mode-improved -;; :mode (("\\.php[s34]?\\'" . php-mode) -;; ("\\.phtml\\'" . php-mode) -;; ("\\.inc\\'" . php-mode)) -;; :config (add-hook 'php-mode-hook -;; '(lambda () -;; (c-set-offset 'cpp-macro 0) -;; ))) -(use-package cmake-mode :mode ("CMakeLists\\.txt\\'" "\\.cmake\\'")) -(use-package glsl-mode :mode ("\\.vert\\'" "\\.frag\\'" "\\.geom\\'" "\\.glsl\\'")) -(use-package go-mode :mode "\\.go\\'") (use-package haml-mode :mode "\\.haml\\'") (use-package haskell-mode :mode (("\\.hcr\\'" . ghc-core-mode) |