From 5e38a269dd265533461119ee8c37931304ec1d73 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 28 Aug 2017 23:12:48 -0700 Subject: [PATCH 01/27] [Emacs] Add cmm-mode --- dotfiles/emacs.d/README.org | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index d8152275..4fc2b8bb 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -2788,6 +2788,11 @@ Intero seems to be causing hangs, so it has been disabled ("M-," . pop-tag-mark))) (add-hook 'c-mode-common-hook 'imalison:cc-mode-hook))) #+END_SRC +*** C-- +#+BEGIN_SRC emacs-lisp +(use-package cmm-mode + :defer t) +#+END_SRC *** C# #+BEGIN_SRC emacs-lisp (use-package csharp-mode From 4a62c2c72a1296593f64a73dd82abb6f0746911c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 28 Aug 2017 23:24:27 -0700 Subject: [PATCH 02/27] [Emacs] Fix whitespace in README.org --- dotfiles/emacs.d/README.org | 1 - 1 file changed, 1 deletion(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index b07766c9..050b0f0a 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -2041,7 +2041,6 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab :commands string-inflection-toggle :bind ("C-c l" . string-inflection-toggle)) #+END_SRC - ** yasnippet #+BEGIN_SRC emacs-lisp (use-package yasnippet From daf81fe21a14b255a887e66b219113458e12bfa3 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 29 Aug 2017 19:29:41 -0700 Subject: [PATCH 03/27] [taffybar] Add X11 dependency --- dotfiles/config/taffybar/imalison-taffybar.cabal | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/config/taffybar/imalison-taffybar.cabal b/dotfiles/config/taffybar/imalison-taffybar.cabal index 269c7f08..dcb63a9e 100644 --- a/dotfiles/config/taffybar/imalison-taffybar.cabal +++ b/dotfiles/config/taffybar/imalison-taffybar.cabal @@ -24,6 +24,7 @@ executable imalison-taffybar , split , taffybar , xmonad-contrib>=0.13 + , X11>=1.8 default-language: Haskell2010 source-repository head From 81f5da6d3e9dda5ad21aae2f2718da048037c0fe Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 3 Sep 2017 12:17:54 -0700 Subject: [PATCH 04/27] [Emacs] Use ssh protocol by default with straight.el --- dotfiles/emacs.d/init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el index 8bd85aa5..3484bda0 100644 --- a/dotfiles/emacs.d/init.el +++ b/dotfiles/emacs.d/init.el @@ -10,6 +10,7 @@ (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) +(setq straight-vc-git-default-protocol 'ssh) (straight-use-package 'use-package) (require 'use-package) (setq use-package-enable-imenu-support t From c3bf54d75e319954541dc581b857d41958f08d2e Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 5 Sep 2017 15:40:39 -0700 Subject: [PATCH 05/27] [termite] Allow dynamic titles --- dotfiles/config/termite/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dotfiles/config/termite/config b/dotfiles/config/termite/config index e86778fa..6f5c2929 100644 --- a/dotfiles/config/termite/config +++ b/dotfiles/config/termite/config @@ -1,3 +1,6 @@ +[options] +dynamic_title = true + [colors] # Base16 Default Dark # Author: Chris Kempson (http://chriskempson.com) From f9370579d0917a1c87a1708ae240e2ba9426d874 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 5 Sep 2017 15:43:41 -0700 Subject: [PATCH 06/27] [Emacs] Add moe theme --- dotfiles/emacs.d/README.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 050b0f0a..e3019590 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -3699,7 +3699,7 @@ I've disabled magithub because it causes magit to be super slow :disabled t :config (progn - (global-git-gutter -1))) + (global-git-gutter-mode +1))) #+END_SRC ** gitolite-clone #+BEGIN_SRC emacs-lisp @@ -4717,7 +4717,7 @@ Ensure all themes that I use are installed: (setq solarized-high-contrast-mode-line t))) (defvar-setq packages-appearance - '(monokai-theme zenburn-theme base16-theme molokai-theme + '(monokai-theme zenburn-theme base16-theme molokai-theme moe-theme tango-2-theme gotham-theme sublime-themes rainbow-delimiters waher-theme ample-theme material-theme zerodark-theme color-theme-modern leuven-theme spacemacs-theme gruvbox-theme From f965d09243f37795634d714dc2b3bbf6f5f17c96 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 5 Sep 2017 16:12:09 -0700 Subject: [PATCH 07/27] [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 08/27] [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 09/27] [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 10/27] [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 11/27] [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' From 235e6eee84faf6e0b08d1dc66daf83d72e076cbc Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 5 Sep 2017 16:02:57 -0700 Subject: [PATCH 12/27] [Emacs] Don't do on all cursors when using mc-edit-lines --- dotfiles/emacs.d/.mc-lists.el | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/emacs.d/.mc-lists.el b/dotfiles/emacs.d/.mc-lists.el index 7165b675..1e00cb38 100644 --- a/dotfiles/emacs.d/.mc-lists.el +++ b/dotfiles/emacs.d/.mc-lists.el @@ -59,6 +59,7 @@ handle-switch-frame helm-M-x ido-write-file + imalison:multiple-cursors-hydra/mc/edit-lines-and-exit isearch-delete-char smex yank-rectangle From 6c775a51d581d6514431bc04537ec660a298c63a Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 13:07:27 -0700 Subject: [PATCH 13/27] [taffybar] Add taffybar code as submodule instead of stack remote --- .gitmodules | 3 +++ dotfiles/config/taffybar/stack.yaml | 4 +--- dotfiles/config/taffybar/taffybar | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 160000 dotfiles/config/taffybar/taffybar diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..bc47a6ed --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "dotfiles/config/taffybar/taffybar"] + path = dotfiles/config/taffybar/taffybar + url = git@github.com:IvanMalison/taffybar.git diff --git a/dotfiles/config/taffybar/stack.yaml b/dotfiles/config/taffybar/stack.yaml index f94e0f3e..35b37ec9 100644 --- a/dotfiles/config/taffybar/stack.yaml +++ b/dotfiles/config/taffybar/stack.yaml @@ -2,9 +2,7 @@ flags: {} extra-package-dbs: [] packages: - '.' -- location: - git: git@github.com:IvanMalison/taffybar.git - commit: e779acfe8056e6dde10638e2f7e4ec77f92b9448 +- location: "./taffybar" extra-dep: true - location: git: git@github.com:willdonnelly/dyre.git diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar new file mode 160000 index 00000000..fd1bb66d --- /dev/null +++ b/dotfiles/config/taffybar/taffybar @@ -0,0 +1 @@ +Subproject commit fd1bb66dec217f10fa03f381de11a1a6fee11c58 From 00bd7e310d8d2fc42a3464a63e9df5a6467992e4 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 14:46:52 -0700 Subject: [PATCH 14/27] [taffybar] Bump taffybar pointer --- dotfiles/config/taffybar/taffybar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index fd1bb66d..c33d1d26 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit fd1bb66dec217f10fa03f381de11a1a6fee11c58 +Subproject commit c33d1d26d76607a29b8d2d39e5afdb934aa9bb87 From 15c4078dd4ad8268d15c1bb66d4606344bdac3b6 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 14:49:50 -0700 Subject: [PATCH 15/27] [taffybar] Fix activew window color --- dotfiles/config/taffybar/taffybar.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/config/taffybar/taffybar.rc b/dotfiles/config/taffybar/taffybar.rc index e8e9684f..b2169afa 100644 --- a/dotfiles/config/taffybar/taffybar.rc +++ b/dotfiles/config/taffybar/taffybar.rc @@ -51,7 +51,7 @@ style "taffybar-icon-urgent" = "taffybar-default" { } style "taffybar-icon-active" = "taffybar-default" { - bg[NORMAL] = @dgrey + bg[NORMAL] = @lldgrey } style "taffybar-icon-minimized" = "taffybar-default" { From 769296f7c6aa7eafd43c75d3e9d3d198286fb460 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 14:50:15 -0700 Subject: [PATCH 16/27] [XMonad] Remove hyper 8 binding for rofi_paswitch --- dotfiles/xmonad/xmonad.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index 6a35c37c..b4e20fdd 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -981,7 +981,6 @@ addKeys conf@XConfig { modMask = modm } = , ((hyper, xK_0), spawn "tvpower.js") , ((modalt, xK_z), spawn "split_chrome_tab_to_next_screen.sh") , ((hyper, xK_9), spawn "start_synergy.sh") - , ((hyper, xK_8), spawn "rofi_paswitch.sh") , ((hyper, xK_slash), spawn "toggle_taffybar.sh") , ((hyper, xK_space), spawn "skippy-xd") , ((hyper, xK_i), spawn "rofi_select_input.hs") From aecfc69378e7abbf059f8e12a85684b75fe6fea4 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 15:15:37 -0700 Subject: [PATCH 17/27] [taffybar] Bump taffybar pointer --- dotfiles/config/taffybar/taffybar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index c33d1d26..2f913fd5 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit c33d1d26d76607a29b8d2d39e5afdb934aa9bb87 +Subproject commit 2f913fd5b449e649d81e4db8638b827f1298b1d9 From ac7d3df2e62bae1ebd401b6cd402cd44a613ac5f Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 15:36:57 -0700 Subject: [PATCH 18/27] [XMonad] Use submodules instead of stack git locations --- .gitmodules | 6 ++++++ dotfiles/xmonad/stack.yaml | 12 +++--------- dotfiles/xmonad/xmonad | 1 + dotfiles/xmonad/xmonad-contrib | 1 + 4 files changed, 11 insertions(+), 9 deletions(-) create mode 160000 dotfiles/xmonad/xmonad create mode 160000 dotfiles/xmonad/xmonad-contrib diff --git a/.gitmodules b/.gitmodules index bc47a6ed..f415b122 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "dotfiles/config/taffybar/taffybar"] path = dotfiles/config/taffybar/taffybar url = git@github.com:IvanMalison/taffybar.git +[submodule "dotfiles/xmonad/xmonad"] + path = dotfiles/xmonad/xmonad + url = git@github.com:IvanMalison/xmonad.git +[submodule "dotfiles/xmonad/xmonad-contrib"] + path = dotfiles/xmonad/xmonad-contrib + url = git@github.com:IvanMalison/xmonad-contrib.git diff --git a/dotfiles/xmonad/stack.yaml b/dotfiles/xmonad/stack.yaml index d1e8a34f..dd32da64 100644 --- a/dotfiles/xmonad/stack.yaml +++ b/dotfiles/xmonad/stack.yaml @@ -2,17 +2,11 @@ flags: {} extra-package-dbs: [] packages: - '.' -- location: - git: git@github.com:IvanMalison/xmonad.git - commit: 2e6312776bd277c775c32e35f9c763d3858e32a4 +- location: "./xmonad" extra-dep: true -- location: - git: git@github.com:IvanMalison/xmonad-contrib.git - commit: ad9c8001f6e2af7a87228c5feaf41aa230a639d5 +- location: "./xmonad-contrib" extra-dep: true -- location: - git: git@github.com:IvanMalison/taffybar.git - commit: 3570bdbd87a5464d7280d8750c5c153cf3dcc637 +- location: "./taffybar" extra-dep: true extra-deps: - X11-xft-0.3.1 diff --git a/dotfiles/xmonad/xmonad b/dotfiles/xmonad/xmonad new file mode 160000 index 00000000..2e631277 --- /dev/null +++ b/dotfiles/xmonad/xmonad @@ -0,0 +1 @@ +Subproject commit 2e6312776bd277c775c32e35f9c763d3858e32a4 diff --git a/dotfiles/xmonad/xmonad-contrib b/dotfiles/xmonad/xmonad-contrib new file mode 160000 index 00000000..8bfb15b7 --- /dev/null +++ b/dotfiles/xmonad/xmonad-contrib @@ -0,0 +1 @@ +Subproject commit 8bfb15b709b8add0062aac6933414fb816526cd9 From 861e4b1fdfba0d438445285839272db29df787bc Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 15:38:25 -0700 Subject: [PATCH 19/27] [XMonad] Add dependencies for taffybar build in xmonad --- dotfiles/xmonad/stack.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dotfiles/xmonad/stack.yaml b/dotfiles/xmonad/stack.yaml index dd32da64..8aa1b5cf 100644 --- a/dotfiles/xmonad/stack.yaml +++ b/dotfiles/xmonad/stack.yaml @@ -1,16 +1,18 @@ flags: {} extra-package-dbs: [] packages: -- '.' -- location: "./xmonad" +- . +- location: ./xmonad extra-dep: true -- location: "./xmonad-contrib" +- location: ./xmonad-contrib extra-dep: true -- location: "./taffybar" +- location: ./taffybar extra-dep: true extra-deps: - X11-xft-0.3.1 - dbus-0.10.12 - gtk-traymanager-0.1.6 - libxml-sax-0.7.5 +- rate-limit-1.1.1 +- time-units-1.0.0 resolver: lts-8.2 From 9533122ef98dcd2a083d80ff4458008bd95e05e4 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 15:42:42 -0700 Subject: [PATCH 20/27] [XMonad] Don't ignore xmonad --- dotfiles/xmonad/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/dotfiles/xmonad/.gitignore b/dotfiles/xmonad/.gitignore index ac62bcfa..4b2e4828 100644 --- a/dotfiles/xmonad/.gitignore +++ b/dotfiles/xmonad/.gitignore @@ -2,7 +2,6 @@ /dist/ /imalison-xmonad /taffybar -/xmonad /xmonad-x86_64-linux /xmonad.errors /xmonad.hi From 54cb39861b3418608188fd480eb4b5a6602517cb Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 17:00:38 -0700 Subject: [PATCH 21/27] [travis] Replace submodule ssh urls with http urls --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0c020ec6..c78b3657 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,11 @@ language: generic script: bash ./gen-gh-pages/deploy.sh + +before_install: + - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules + - git submodule update --init --recursive + env: global: - ENCRYPTION_LABEL: "73e6c870aa87" From 1e09187c5c3687f7b095794aeed22b06800cb514 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 17:04:54 -0700 Subject: [PATCH 22/27] Revert "[travis] Replace submodule ssh urls with http urls" This reverts commit 54cb39861b3418608188fd480eb4b5a6602517cb. --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c78b3657..0c020ec6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,6 @@ language: generic script: bash ./gen-gh-pages/deploy.sh - -before_install: - - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules - - git submodule update --init --recursive - env: global: - ENCRYPTION_LABEL: "73e6c870aa87" From cce525182ae4552c1329a705ac0752ba77074cbf Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 17:06:43 -0700 Subject: [PATCH 23/27] Use relative urls for submodules --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index f415b122..3a248350 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "dotfiles/config/taffybar/taffybar"] path = dotfiles/config/taffybar/taffybar - url = git@github.com:IvanMalison/taffybar.git + url = ../taffybar.git [submodule "dotfiles/xmonad/xmonad"] path = dotfiles/xmonad/xmonad - url = git@github.com:IvanMalison/xmonad.git + url = ../xmonad.git [submodule "dotfiles/xmonad/xmonad-contrib"] path = dotfiles/xmonad/xmonad-contrib - url = git@github.com:IvanMalison/xmonad-contrib.git + url = ../xmonad-contrib.git From 27ec812fff809096f403fa5bc36a37aea702205d Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 7 Sep 2017 21:54:54 -0700 Subject: [PATCH 24/27] [taffybar] Bump source pointer --- dotfiles/config/taffybar/taffybar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index 2f913fd5..71900f6e 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit 2f913fd5b449e649d81e4db8638b827f1298b1d9 +Subproject commit 71900f6e4f111360e31ce6d7d6b694274899f0af From 3c10e85909d63ef9d66445e703e16450dc0016c9 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 8 Sep 2017 00:06:25 -0700 Subject: [PATCH 25/27] [Emacs] Add command to make the current server the main emacs server --- dotfiles/emacs.d/README.org | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index da6f1aa8..90617991 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -1402,11 +1402,17 @@ Paradox is a package.el extension. I have no use for it now that I use straight. (use-package server :config (progn + (defun imalison:make-main-emacs-server () + (interactive) + (when (not (equal server-name "server")) + (shell-command-to-string + (format "cd ~/.emacs.d/server/ && rm -f server && ln -s %s server" server-name)))) (defun imalison:get-server-filepath () (let ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))) (expand-file-name server-name server-dir))) (setq server-use-tcp t) - (unless (server-running-p) (server-start)))) + (unless (server-running-p) (server-start)) + (imalison:make-main-emacs-server))) #+END_SRC ** list-environment #+BEGIN_SRC emacs-lisp From 7376f0c40148186a45883028cb9f9682b9ddc52e Mon Sep 17 00:00:00 2001 From: Kat Huang Date: Fri, 8 Sep 2017 12:35:21 -0700 Subject: [PATCH 26/27] [travis] Add evm bin to PATH --- gen-gh-pages/compile.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gen-gh-pages/compile.sh b/gen-gh-pages/compile.sh index 5d1721ff..e7cae1ad 100755 --- a/gen-gh-pages/compile.sh +++ b/gen-gh-pages/compile.sh @@ -8,6 +8,7 @@ TARGET=$(readlink -f "$THIS_DIR/../dotfiles/emacs.d/README.org") git clone https://github.com/rejeep/evm.git "$HOME/.evm" evm config path /tmp evm install emacs-25.1-travis --use --skip +export PATH="$HOME/.evm/bin:$PATH" curl -fsSkL https://raw.github.com/cask/cask/master/go | python From cb13c569cd9ca8398687c2be8d11c65e877c78de Mon Sep 17 00:00:00 2001 From: Kat Huang Date: Fri, 8 Sep 2017 12:35:51 -0700 Subject: [PATCH 27/27] [Brew] Add source code pro to essential --- tasks/brewfiles/essential | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/brewfiles/essential b/tasks/brewfiles/essential index 8035a56e..08936e06 100644 --- a/tasks/brewfiles/essential +++ b/tasks/brewfiles/essential @@ -12,6 +12,7 @@ brew 'gnutls' brew 'go' brew 'htop-osx' brew 'leiningen' +brew 'pass' brew 'pyenv' brew 'rcm' brew 'rbenv' @@ -24,7 +25,6 @@ brew 'zsh' cask 'font-source-code-pro' cask 'alfred' -cask 'flash' cask 'flycut' cask 'google-chrome' cask 'google-hangouts' @@ -39,3 +39,4 @@ cask 'synergy' cask 'transmission' cask 'vlc' cask 'xquartz' +cask 'font-source-code-pro'