From 1b5b806cc3ed758ff53e38ff0695b824e84d84c3 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 4 Jul 2017 09:57:55 +0200 Subject: Emacs: Remove column and line number from modeline --- emacs/.emacs.d/init.org | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index a647479..406c15f 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -286,7 +286,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))) -- cgit 1.4.1 From 46d1b3c01050695d04055490242427e845da4354 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 4 Jul 2017 09:58:42 +0200 Subject: Emacs: Diminish editorconfig mode --- emacs/.emacs.d/init.org | 1 + 1 file changed, 1 insertion(+) diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index 406c15f..a3bd64f 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -894,6 +894,7 @@ with spaces. Perfect! #+BEGIN_SRC emacs-lisp (use-package editorconfig + :diminish "EC" :config (editorconfig-mode 1)) #+END_SRC -- cgit 1.4.1 From 67259c20e4abc05c4df23afeab021358f0ef1566 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 4 Jul 2017 10:04:17 +0200 Subject: Emacs: Diminish flyspell mode --- emacs/.emacs.d/init.org | 1 + 1 file changed, 1 insertion(+) diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index a3bd64f..db0469f 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -2395,6 +2395,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. -- cgit 1.4.1 From ad4197f2e45fe1706d6ef0ccd3518244f545617c Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 5 Jul 2017 13:33:58 +0200 Subject: nix: Use node 8 for node packages --- nix/.config/nixpkgs/config.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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; -- cgit 1.4.1 From d6ec7cc74977961c10f459e12324c574f658a3a7 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 5 Jul 2017 13:34:30 +0200 Subject: Karabiner: Swap ~ <-> § --- karabiner/.config/karabiner/karabiner.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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, -- cgit 1.4.1 From 4d72527ee9f7ba3a5b9ee5b978987e13189a4b8f Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 5 Jul 2017 13:35:07 +0200 Subject: Emacs: Remove company-nixos-options It keeps breaking completion, which is annoying. --- emacs/.emacs.d/init.org | 7 ------- 1 file changed, 7 deletions(-) diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index db0469f..0441db4 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -1141,13 +1141,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 -- cgit 1.4.1 From 967d4abeb9be21ed2d9f7dcb4025cc8f0dc61a82 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 5 Jul 2017 13:35:41 +0200 Subject: Emacs: Use mac-auto-operator-composition-mode on mac-port --- emacs/.emacs.d/init.org | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index 0441db4..97ddebc 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 -- cgit 1.4.1 From 205ff22d5088491657d81c68942775f9b90d5ee0 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 5 Jul 2017 13:36:01 +0200 Subject: Emacs: Diminish some Javascript minor modes --- emacs/.emacs.d/init.org | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index 97ddebc..7833ac5 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -2225,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 @@ -2245,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 -- cgit 1.4.1 From 2e755628ac5c22bf5ce799a41c7bc5f9acbd0e44 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 5 Jul 2017 13:36:17 +0200 Subject: Emacs: Load avy on idle --- emacs/.emacs.d/init.org | 1 + 1 file changed, 1 insertion(+) diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index 7833ac5..61c7e0d 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -2618,6 +2618,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) -- cgit 1.4.1