diff options
| -rw-r--r-- | emacs/.emacs.d/init.org | 23 | ||||
| -rw-r--r-- | karabiner/.config/karabiner/karabiner.json | 13 | ||||
| -rw-r--r-- | nix/.config/nixpkgs/config.nix | 5 |
3 files changed, 29 insertions, 12 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index 07c1115..99d5899 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -259,10 +259,13 @@ on the right things. #+END_SRC Make symbols prettier. Turns out, in many cases, this is already -configured, just not enabled. +configured, just not enabled. If using the mac-port version of Emacs, +it has it's own, more extensive version. #+BEGIN_SRC emacs-lisp -(global-prettify-symbols-mode +1) +(if (eq window-system 'mac) + (mac-auto-operator-composition-mode +1) + (global-prettify-symbols-mode +1)) #+END_SRC ** Page Breaks @@ -286,7 +289,8 @@ correct, at least for Liberation Mono. ** Modeline #+BEGIN_SRC emacs-lisp -(column-number-mode t) +(column-number-mode -1) +(line-number-mode -1) (size-indication-mode t) (setq frame-title-format '("%f" (dired-directory dired-directory))) @@ -893,6 +897,7 @@ with spaces. Perfect! #+BEGIN_SRC emacs-lisp (use-package editorconfig + :diminish "EC" :config (editorconfig-mode 1)) #+END_SRC @@ -1139,13 +1144,6 @@ seems to work perfectly well for me. :after company) #+END_SRC -#+BEGIN_SRC emacs-lisp -(use-package company-nixos-options - :defer 30 - :config (progn - (add-to-list 'company-backends 'company-nixos-options))) -#+END_SRC - * Dates & Times ** Calendar @@ -2227,6 +2225,7 @@ Instead, do this: #+BEGIN_SRC emacs-lisp (use-package indium + :diminish (indium-interaction-mode . "In") :config (progn (add-hook 'js2-mode-hook #'indium-interaction-mode))) #+END_SRC @@ -2247,7 +2246,7 @@ completions, besides other IDE-like things. #+BEGIN_SRC emacs-lisp (use-package tern - :commands ap/enable-tern + :diminish tern-mode :if (executable-find "tern") :defer 5 :config (progn @@ -2394,6 +2393,7 @@ Sometimes I might want to show off my emacs usage. #+BEGIN_SRC emacs-lisp (use-package flyspell + :diminish "﹏" :config (progn (defun flyspell-detect-ispell-args (&optional run-together) "If RUN-TOGETHER is true, spell check the CamelCase words. @@ -2619,6 +2619,7 @@ somehow I prefer it. #+BEGIN_SRC emacs-lisp (use-package avy + :defer 5 :bind (("M-g g" . avy-goto-line) ("M-g M-g" . avy-goto-line) ("C-|" . avy-goto-line) diff --git a/karabiner/.config/karabiner/karabiner.json b/karabiner/.config/karabiner/karabiner.json index 2488e95..8faf2cc 100644 --- a/karabiner/.config/karabiner/karabiner.json +++ b/karabiner/.config/karabiner/karabiner.json @@ -6,6 +6,12 @@ }, "profiles": [ { + "complex_modifications": { + "parameters": { + "basic.to_if_alone_timeout_milliseconds": 1000 + }, + "rules": [] + }, "devices": [ { "disable_built_in_keyboard_if_exists": false, @@ -52,6 +58,7 @@ "left_control": "left_command", "left_option": "right_control", "menu": "fn", + "non_us_backslash": "grave_accent_and_tilde", "right_command": "right_option", "right_control": "right_command", "right_option": "right_control" @@ -62,6 +69,12 @@ } }, { + "complex_modifications": { + "parameters": { + "basic.to_if_alone_timeout_milliseconds": 1000 + }, + "rules": [] + }, "devices": [ { "disable_built_in_keyboard_if_exists": false, diff --git a/nix/.config/nixpkgs/config.nix b/nix/.config/nixpkgs/config.nix index 3b50693..dc4e40a 100644 --- a/nix/.config/nixpkgs/config.nix +++ b/nix/.config/nixpkgs/config.nix @@ -2,7 +2,10 @@ packageOverrides = super: let self = super.pkgs; in with self; rec { - myEmacs = super.callPackage ./emacs.nix {}; + myEmacs = super.callPackage ./emacs.nix { + emacs = if stdenv.isDarwin then emacs25Macport else emacs; + }; + nodejs = pkgs.nodejs-8_x; }; allowUnfree = true; |