From f965d09243f37795634d714dc2b3bbf6f5f17c96 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 5 Sep 2017 16:12:09 -0700 Subject: [PATCH 1/5] [Karabiner] Add karabiner-elements config --- dotfiles/config/karabiner/karabiner.json | 106 +++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 dotfiles/config/karabiner/karabiner.json diff --git a/dotfiles/config/karabiner/karabiner.json b/dotfiles/config/karabiner/karabiner.json new file mode 100644 index 00000000..81286be4 --- /dev/null +++ b/dotfiles/config/karabiner/karabiner.json @@ -0,0 +1,106 @@ +{ + "global": { + "check_for_updates_on_startup": true, + "show_in_menu_bar": true, + "show_profile_name_in_menu_bar": false + }, + "profiles": [ + { + "complex_modifications": { + "parameters": { + "basic.to_if_alone_timeout_milliseconds": 1000 + }, + "rules": [ + { + "manipulators": [ + { + "description": "Change right command to command+control+option+shift.", + "from": { + "key_code": "right_command", + "modifiers": { + "optional": [ + "any" + ] + } + }, + "to": [ + { + "key_code": "left_shift", + "modifiers": [ + "left_command", + "left_control", + "left_option" + ] + } + ], + "to_if_alone": [ + { + "key_code": "escape", + "modifiers": { + "optional": [ + "any" + ] + } + } + ], + "type": "basic" + } + ] + } + ] + }, + "devices": [ + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": {}, + "identifiers": { + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 610, + "vendor_id": 1452 + }, + "ignore": false, + "simple_modifications": {} + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": {}, + "identifiers": { + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 597, + "vendor_id": 1452 + }, + "ignore": false, + "simple_modifications": {} + } + ], + "fn_function_keys": { + "f1": "vk_consumer_brightness_down", + "f10": "mute", + "f11": "volume_down", + "f12": "volume_up", + "f2": "vk_consumer_brightness_up", + "f3": "vk_mission_control", + "f4": "vk_launchpad", + "f5": "vk_consumer_illumination_down", + "f6": "vk_consumer_illumination_up", + "f7": "vk_consumer_previous", + "f8": "vk_consumer_play", + "f9": "vk_consumer_next" + }, + "name": "Default profile", + "one_to_many_mappings": {}, + "selected": true, + "simple_modifications": { + "caps_lock": "left_control" + }, + "standalone_keys": {}, + "virtual_hid_keyboard": { + "caps_lock_delay_milliseconds": 0, + "keyboard_type": "ansi", + "standalone_keys_delay_milliseconds": 200 + } + } + ] +} From bb1d7949420da3610d830ada113c57c6bd68a827 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 5 Sep 2017 16:12:24 -0700 Subject: [PATCH 2/5] [Emacs] Set do-benchmark to nil by default --- dotfiles/emacs.d/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el index 8bd85aa5..c9276388 100644 --- a/dotfiles/emacs.d/init.el +++ b/dotfiles/emacs.d/init.el @@ -15,7 +15,7 @@ (setq use-package-enable-imenu-support t use-package-always-ensure t) -(defvar imalison:do-benchmark) +(defvar imalison:do-benchmark nil) (let ((bench-file (concat (file-name-directory user-init-file) "benchmark.el"))) (when (file-exists-p bench-file) (load bench-file))) From b5ec2ba7afc7ac3db0761fbdcd373b1ed7ee3cc0 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 5 Sep 2017 16:12:31 -0700 Subject: [PATCH 3/5] [Emacs] Add gitignores --- dotfiles/emacs.d/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dotfiles/emacs.d/.gitignore b/dotfiles/emacs.d/.gitignore index 2a148406..319cc27a 100644 --- a/dotfiles/emacs.d/.gitignore +++ b/dotfiles/emacs.d/.gitignore @@ -12,6 +12,7 @@ README.html ac-comphist.dat auto-save-list backups +benchmark.el bookmarks custom-after.el custom-before.el @@ -37,6 +38,7 @@ session.* skewer-cache smex-items speed-type/ +straight/ this-machine.el tramp tutorial From e1f1e90b72e1920795642565a7e3362d243cf392 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 5 Sep 2017 16:12:47 -0700 Subject: [PATCH 4/5] [Emacs] Set default org-dir --- dotfiles/emacs.d/README.org | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 050b0f0a..b321f0a1 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -2839,6 +2839,7 @@ Intero seems to be causing hangs, so it has been disabled *** org **** config #+BEGIN_SRC emacs-lisp :tangle org-config.el +(defvar imalison:org-dir "~/org") (use-package org :bind (:map org-mode-map (("C-e" . end-of-visual-line))) From 57d916a33c09729272cfa4be341fc0c24b0ca22e Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 5 Sep 2017 16:12:54 -0700 Subject: [PATCH 5/5] [Brew] Add font and carabiner elements --- tasks/brewfiles/essential | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tasks/brewfiles/essential b/tasks/brewfiles/essential index 7bb8415c..8035a56e 100644 --- a/tasks/brewfiles/essential +++ b/tasks/brewfiles/essential @@ -1,4 +1,5 @@ tap 'thoughtbot/formulae' +tap 'caskroom/fonts' brew 'cask' brew 'coreutils' @@ -21,6 +22,7 @@ brew 'tmux' brew 'wget' brew 'zsh' +cask 'font-source-code-pro' cask 'alfred' cask 'flash' cask 'flycut' @@ -29,8 +31,7 @@ cask 'google-hangouts' cask 'gpgtools' cask 'iterm2' cask 'java' -cask 'karabiner' -cask 'macpass' +cask 'karabiner-elements' cask 'slate' cask 'sparkleshare' cask 'spotify'