From 9c5f3faa856a2ee565a5825a6058544c786c0d56 Mon Sep 17 00:00:00 2001 From: Mikael Capelle Date: Wed, 20 Dec 2017 11:01:33 +0100 Subject: [PATCH 01/11] Update init.el. --- .emacs.d/init.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 5105521..5708307 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -35,6 +35,7 @@ (scroll-bar-mode -1)) (column-number-mode t) (line-number-mode t) +(desktop-save-mode t) ;; Command rebinding @@ -74,6 +75,11 @@ (ansi-color-apply-on-region compilation-filter-start (point-max)))) (add-hook 'compilation-filter-hook 'my-colorize-compilation-buffer)) +;; Retrieve PATH from fish shell +(when (memq window-system '(mac ns x)) + (setq exec-path-from-shell-shell-name "/usr/local/bin/fish") + (exec-path-from-shell-initialize)) + ;; Auto complete + Yasnippet (use-package sr-speedbar From 196f1dae34c6f91e515abedcd6fc5491da1af622 Mon Sep 17 00:00:00 2001 From: Mikael Capelle Date: Wed, 20 Dec 2017 11:02:38 +0100 Subject: [PATCH 02/11] Untrack custom.el. --- .emacs.d/custom.el | 205 --------------------------------------------- .gitignore | 14 +--- 2 files changed, 1 insertion(+), 218 deletions(-) delete mode 100644 .emacs.d/custom.el diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el deleted file mode 100644 index 897de2a..0000000 --- a/.emacs.d/custom.el +++ /dev/null @@ -1,205 +0,0 @@ -;;; custom.el -- Face & Variable customization - -;;; Commentary: - -;; This file is mainly generated by Emacs' customize-* commands. - -;;; Code: - -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(compilation-scroll-output t) - '(electric-pair-pairs (quote ((34 . 34) (123 . 125)))) - '(flycheck-c/c++-clang-executable "clang-3.8") - '(flycheck-gcc-args (quote (""))) - '(flycheck-gnat-include-path (quote ("."))) - '(flycheck-python-flake8-executable nil) - '(package-selected-packages - (quote - (dockerfile-mode dired+ flycheck-pyflakes abyss-theme helm-projectile projectile ggtags ssh nlinum solarized-theme helm-flycheck helm-flyspell yaml-mode web-mode sr-speedbar sokoban smart-compile pythonic python-mode powerline poker php-mode openwith markdown-mode magit json-mode js-comint jedi javadoc-lookup java-snippets java-imports hydandata-light-theme helm-spotify helm-package helm-ls-git helm-bibtex flycheck-pos-tip flycheck-color-mode-line fish-mode diffview cython-mode company-web company-math company-jedi company-dict company-c-headers company-auctex ac-octave ac-math ac-c-headers 2048-game))) - '(py-flake8-command "/usr/bin/python3 -m flake8") - '(py-python-command "python3") - '(safe-local-variable-values - (quote - ((eval progn - (setq flycheck-clang-include-path - (list - (concat root-path "/vendor/rapidjson/include/") - (concat root-path "/vendor/tclap/include/") - (concat root-path "/lib/build/include/") - "/opt/ibm/ILOG/CPLEX_Studio1271/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1271/concert/include")) - (setq flycheck-clang-args - (quote - ("-W" "-Wall" "-DS_CPLEX"))) - (setq flycheck-clang-language-standard "c++14")) - (eval setq company-clang-arguments - (list "-std=c++14" "-DS_CPLEX" - (concat "-I" root-path "/vendor/rapidjson/include/") - (concat "-I" root-path "/vendor/tclap/include/") - (concat "-I" root-path "/lib/build/include/") - "-I/opt/ibm/ILOG/CPLEX_Studio1271/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1271/concert/include")) - (eval progn - (setq flycheck-clang-include-path - (list - (concat root-path "/vendor/rapidjson/include/") - (concat root-path "/vendor/tclap/include/") - (concat root-path "/lib/build/include/") - "/opt/ibm/ILOG/CPLEX_Studio127/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio127/concert/include")) - (setq flycheck-clang-args - (quote - ("-W" "-Wall" "-DS_CPLEX"))) - (setq flycheck-clang-language-standard "c++14")) - (eval setq company-clang-arguments - (list "-std=c++14" "-DS_CPLEX" - (concat "-I" root-path "/vendor/rapidjson/include/") - (concat "-I" root-path "/vendor/tclap/include/") - (concat "-I" root-path "/lib/build/include/") - "-I/opt/ibm/ILOG/CPLEX_Studio127/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio127/concert/include")) - (eval progn - (setq flycheck-clang-include-path - (list - (concat root-path "/lemon/include/") - "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")) - (setq flycheck-clang-args - (quote - ("-W" "-Wall" "-DS_CPLEX" "-DIL_STD"))) - (setq flycheck-clang-language-standard "c++14")) - (eval setq company-clang-arguments - (list "-std=c++14" "-DS_CPLEX" "-DIL_STD" - (concat "-I" root-path "/lemon/include/") - "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")) - (eval progn - (setq flycheck-clang-include-path - (list - (concat root-path "/vendor/tclap/include/") - (concat root-path "/vendor/tclap-tuple/include/") - (concat root-path "/lib/inc/") - "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")) - (setq flycheck-clang-args - (quote - ("-W" "-Wall" "-DS_CPLEX" "-DIL_STD"))) - (setq flycheck-clang-language-standard "c++14")) - (eval setq company-clang-arguments - (list "-std=c++14" "-DS_CPLEX" "-DIL_STD" - (concat "-I" root-path "/vendor/tclap/include/") - (concat "-I" root-path "/vendor/tclap-tuple/include/") - (concat "-I" root-path "/lib/inc/") - "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")) - (eval progn - (setq flycheck-clang-include-path - (list - (concat root-path "/vendor/tclap/include/") - (concat root-path "/vendor/tclap-tuple/include/") - (concat root-path "/lib/inc/") - "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")) - (setq flycheck-clang-args - (quote - ("-W" "-Wall" "-DS_CPLEX"))) - (setq flycheck-clang-language-standard "c++14")) - (eval progn - (setq flycheck-clang-include-path - (list - (concat root-path "/vendor/tclap/include/") - (concat root-path "/vendor/tclap-tuple/include/") - (concat root-path "/lib/inc") - "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")) - (setq flycheck-clang-args - (quote - ("-W" "-Wall" "-DS_CPLEX"))) - (setq flycheck-clang-language-standard "c++14")) - (eval setq company-clang-arguments - (list "-std=c++14" "-DS_CPLEX" - (concat "-I" root-path "/vendor/tclap/include/") - (concat "-I" root-path "/vendor/tclap-tuple/include/") - (concat "-I" root-path "/lib/inc/") - "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")) - (eval progn - (setq flycheck-clang-include-path - (list - (concat root-path "/vendor/rapidjson/include/") - (concat root-path "/vendor/tclap/include/") - (concat root-path "/lib/build/include/") - "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")) - (setq flycheck-clang-args - (quote - ("-W" "-Wall" "-DS_CPLEX"))) - (setq flycheck-clang-language-standard "c++14")) - (eval setq company-clang-arguments - (list "-std=c++14" "-DS_CPLEX" - (concat "-I" root-path "/vendor/rapidjson/include/") - (concat "-I" root-path "/vendor/tclap/include/") - (concat "-I" root-path "/lib/build/include/") - "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")) - (eval progn - (setq flycheck-clang-include-path - (list - (concat root-path "/vendor/tclap/include/") - (concat root-path "/vendor/tclap-tuple/include/") - "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")) - (setq flycheck-clang-args - (quote - ("-W" "-Wall" "-DS_CPLEX"))) - (setq flycheck-clang-language-standard "c++14")) - (eval setq company-clang-arguments - (list "-std=c++14" "-DS_CPLEX" - (concat "-I" root-path "/vendor/tclap/include/") - (concat "-I" root-path "/vendor/tclap-tuple/include/") - "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")) - (eval set - (make-local-variable - (quote root-path)) - (file-name-directory - (let - ((d - (dir-locals-find-file "."))) - (if - (stringp d) - d - (car d))))) - (company-clang-arguments "-std=c++14" "-DS_CPLEX" "-I/home/mcapelle/Dev/cpp/lns/vendor/rapidjson/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/" "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include") - (company-clang-arguments "-std=c++14" "-Iinclude") - (company-clang-arguments "-std=c++14" "-I/home/mcapelle/Dev/cpp/lns/vendor/rapidjson/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/" "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include") - (company-clang-arguments "-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/" "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include") - (company-clang-arguments - ("-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/")) - (company-clang-arguments . clang-args) - (eval setq clang-args - ("-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/")) - (encoding . utf-8) - (company-clang-arguments "-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/")))) - '(tab-width 4)) -;; (custom-set-faces -;; ;; custom-set-faces was added by Custom. -;; ;; If you edit it by hand, you could mess it up, so be careful. -;; ;; Your init file should contain only one such instance. -;; ;; If there is more than one, they won't work right. -;; '(powerline-active1 ((t (:inherit nil :background "grey11" :foreground "white")))) -;; '(powerline-active2 ((t (:inherit nil :background "grey40" :foreground "white")))) -;; '(powerline-inactive1 ((t (:inherit nil :background "gray11" :foreground "white")))) -;; '(powerline-inactive2 ((t (:inherit nil :background "grey20" :foreground "white"))))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(flycheck-color-mode-line-warning-face ((t (:inherit flycheck-fringe-error :background "coral")))) - '(flycheck-error-list-error ((t (:inherit font-lock-warning-face :background "white" :foreground "firebrick" :slant normal :weight bold :height 1.0 :width normal)))) - '(flycheck-error-list-warning ((t (:inherit warning)))) - '(flycheck-fringe-error ((t (:inherit font-lock-warning-face :background "firebrick" :foreground "white")))) - '(flycheck-fringe-warning ((t (:inherit warning)))) - '(linum ((t (:inherit fringe :background "white" :foreground "gray")))) - '(mmm-code-submode-face ((t (:background "white")))) - '(mmm-default-submode-face ((t (:background "white")))) - '(web-mode-doctype-face ((t (:foreground "darkgray")))) - '(web-mode-html-attr-equal-face ((t (:inherit web-mode-html-attr-name-face :foreground "chocolate")))) - '(web-mode-html-attr-name-face ((t (:foreground "chocolate")))) - '(web-mode-html-attr-value-face ((t (:inherit font-lock-string-face :foreground "sea green")))) - '(web-mode-html-tag-face ((t (:foreground "steel blue")))) - '(whitespace-line ((t (:background "lightgray" :foreground "dark violet" :init font-lock-warning-face)))) - '(whitespace-space ((t (:foreground "gray"))))) - -(provide 'custom) -;;; custom.el ends here diff --git a/.gitignore b/.gitignore index 0517e96..eb5f24d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -.emacs.d/elpa -.emacs.d/session.* -.emacs.d/auto-save-list -.emacs.d/ac-comphist.dat -*~ -.emacs.d/tramp -fish/fish_history -fish/fishd.* -/.emacs.d/elpa/* -*.elc -/.emacs.d/abbrev_defs -/.emacs.d/semanticdb/!home!mcapelle!Dev!cpp!lns!lib!inc!semantic.cache -/.emacs.d/semanticdb/!home!mcapelle!Dev!cpp!lns!lib!src!semantic.cache +.emacs.d/custom.el From 5279bfa91ca9c591ceec9b210cb6dc2fde98c0af Mon Sep 17 00:00:00 2001 From: Mikael Capelle Date: Wed, 20 Dec 2017 11:02:56 +0100 Subject: [PATCH 03/11] Update fish configuration. --- fish/config.fish | 54 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/fish/config.fish b/fish/config.fish index 3e2835a..bca1783 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,33 +1,51 @@ # Fish configuration file set -x LC_ALL en_US.utf8 -set -x TERM xterm-256color +set -x PYTHONIOENCODING UTF-8 + +if test (uname) != "Darwin" + set -x TERM xterm-256color +end # Aliases -alias ls='ls --color=auto' -alias ll='ls -l' -alias la='ls -A' -alias l='ls -CF' -alias rm='rm -i --preserve-root' +if test (uname) != "Darwin" + alias ls='ls --color=auto' + alias ll='ls -l' + alias la='ls -A' + alias l='ls -CF' + + alias rm='rm -i --preserve-root' +else + alias rm='rm -i' +end + +if test (uname) = "Darwin" + set -xg PATH /usr/local/bin /usr/local/sbin $PATH + set -xg PATH /Library/Frameworks/Python.framework/Versions/3.5/bin $PATH + set -xg PATH /Users/mcapelle/Applications/GNAT/bin $PATH +end + +if test -e {$HOME}/Dev/python/libs + set -xg PYTHONPATH "$HOME/Dev/python/libs:$PYTHONPATH" +end if test -z "$MYSOFT_PATH" - set -xg MYSOFT_PATH {$HOME}/.softwares + set -xg MYSOFT_PATH {$HOME}/.softwares - if test -e $MYSOFT_PATH - set -xg PATH $PATH $MYSOFT_PATH/bin - set -xg PYTHONPATH "$MYSOFT_PATH/pythonlibs:$PYTHONPATH" + if test -e $MYSOFT_PATH + set -xg PATH $PATH $MYSOFT_PATH/bin - # GUROBI - if ls $MYSOFT_PATH | grep "gurobi" > /dev/null - set -xg GUROBI_PATH (ls -d $MYSOFT_PATH/gurobi*/linux64 | tail -1) - set -xg LD_LIBRARY_PATH "$LD_LIBRARY_PATH:$GUROBI_PATH/lib" - set -xg GRB_LICENSE_FILE $GUROBI_PATH/gurobi.lic - set -xg PATH $GUROBI_PATH/bin $PATH - #set -x PYTHONPATH $GUROBI_PATH/lib/python3.4_utf32:$PYTHONPATH + # GUROBI + if ls $MYSOFT_PATH | grep "gurobi" > /dev/null + set -xg GUROBI_PATH (ls -d $MYSOFT_PATH/gurobi*/linux64 | tail -1) + set -xg LD_LIBRARY_PATH "$LD_LIBRARY_PATH:$GUROBI_PATH/lib" + set -xg GRB_LICENSE_FILE $GUROBI_PATH/gurobi.lic + set -xg PATH $GUROBI_PATH/bin $PATH + #set -x PYTHONPATH $GUROBI_PATH/lib/python3.4_utf32:$PYTHONPATH + end end - end end From d0e3bdb0d52eeb24ec1cab1be4bb17f82c75c551 Mon Sep 17 00:00:00 2001 From: Mikael Capelle Date: Wed, 20 Dec 2017 11:03:11 +0100 Subject: [PATCH 04/11] Update script. --- script.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script.sh b/script.sh index 8b29874..2e8f9c4 100755 --- a/script.sh +++ b/script.sh @@ -5,9 +5,9 @@ ln -f -s $(pwd)/.emacs.d $HOME/ # Shell configurations ln -f -s $(pwd)/.bashrc $HOME/ -ln -f -s $(pwd)/.zshrc $HOME/ -ln -f -s $(pwd)/.oh-my-zsh $HOME/ -ln -f -s $(pwd)/zsh-custom $HOME/.config/zsh-custom +# ln -f -s $(pwd)/.zshrc $HOME/ +# ln -f -s $(pwd)/.oh-my-zsh $HOME/ +# ln -f -s $(pwd)/zsh-custom $HOME/.config/zsh-custom ln -f -s $(pwd)/fish $HOME/.config ln -f -s $(pwd)/alias.sh $HOME/.config From b22b4b440825be9bbffcf859929a5a9f2f106051 Mon Sep 17 00:00:00 2001 From: Mikael Capelle Date: Wed, 20 Dec 2017 11:03:36 +0100 Subject: [PATCH 05/11] Ignore DS_Store. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index eb5f24d..79b5594 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -.emacs.d/custom.el +**/.DS_Store From 1c9ee15fe4d8fb4b47c3f0244afc61ae0a6a0628 Mon Sep 17 00:00:00 2001 From: Mikael Capelle Date: Wed, 20 Dec 2017 11:08:12 +0100 Subject: [PATCH 06/11] Update fishd. --- fish/fishd_all | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 fish/fishd_all diff --git a/fish/fishd_all b/fish/fishd_all new file mode 100644 index 0000000..c6798bf --- /dev/null +++ b/fish/fishd_all @@ -0,0 +1,35 @@ +# This file is automatically generated by the fish. +# Do NOT edit it directly, your changes will be overwritten. +SET __fish_init_1_22_0:\x1d +SET __fish_init_1_50_0:\x1d +SET __fish_init_2_39_8:\x1d +SET __fish_init_2_3_0:\x1d +SET __prompt_initialized_2:\x1d +SET fish_color_autosuggestion:555\x1eyellow +SET fish_color_cancel:\x2dr +SET fish_color_command:005fd7\x1epurple +SET fish_color_comment:ff5f5f +SET fish_color_cwd:green +SET fish_color_cwd_root:red +SET fish_color_end:brmagenta +SET fish_color_error:red\x1e\x2d\x2dbold +SET fish_color_escape:cyan +SET fish_color_history_current:cyan +SET fish_color_host:\x2do\x1ecyan +SET fish_color_match:cyan +SET fish_color_normal:normal +SET fish_color_operator:cyan +SET fish_color_param:00afff\x1ecyan +SET fish_color_quote:brown +SET fish_color_redirection:normal +SET fish_color_search_match:\x2d\x2dbackground\x3dpurple +SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SET fish_color_status:red +SET fish_color_user:\x2do\x1egreen +SET fish_color_valid_path:\x2d\x2dunderline +SET fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x1b\x5b32mhelp\x1b\x5b30m\x1b\x28B\x1b\x5bm\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish +SET fish_key_bindings:fish_default_key_bindings +SET fish_pager_color_completion:normal +SET fish_pager_color_description:555\x1eyellow +SET fish_pager_color_prefix:cyan +SET fish_pager_color_progress:cyan From 156d45706188077f379b63f347b5f8e1026fab24 Mon Sep 17 00:00:00 2001 From: Mikael Capelle Date: Wed, 20 Dec 2017 11:10:08 +0100 Subject: [PATCH 07/11] Update gitignore. --- .gitignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitignore b/.gitignore index 79b5594..6bdc61d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,13 @@ +# Emacs file +*~ +.emacs.d/custom.el +.emacs.d/.python-environments +.emacs.d/auto-save-list +.emacs.d/elpa +.emacs.d/projectile-bookmarks.eld + +# Mac file **/.DS_Store + +# Fish +fish/fishd.* \ No newline at end of file From 0519784d9073b8cb9fc06365314a6e7d294ab272 Mon Sep 17 00:00:00 2001 From: Mikael Capelle Date: Wed, 20 Dec 2017 11:45:46 +0100 Subject: [PATCH 08/11] Update fishd, links do not work. --- fish/{fishd_all => fishd} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename fish/{fishd_all => fishd} (97%) diff --git a/fish/fishd_all b/fish/fishd similarity index 97% rename from fish/fishd_all rename to fish/fishd index c6798bf..d72771a 100644 --- a/fish/fishd_all +++ b/fish/fishd @@ -32,4 +32,4 @@ SET fish_key_bindings:fish_default_key_bindings SET fish_pager_color_completion:normal SET fish_pager_color_description:555\x1eyellow SET fish_pager_color_prefix:cyan -SET fish_pager_color_progress:cyan +SET fish_pager_color_progress:cyan \ No newline at end of file From e4596be1367cd8ec1599a1d7340827739769f4d1 Mon Sep 17 00:00:00 2001 From: Mikael Capelle Date: Wed, 20 Dec 2017 10:47:37 +0000 Subject: [PATCH 09/11] Update .oh-my-zsh. --- .oh-my-zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.oh-my-zsh b/.oh-my-zsh index 291e96d..c3b072e 160000 --- a/.oh-my-zsh +++ b/.oh-my-zsh @@ -1 +1 @@ -Subproject commit 291e96dcd034750fbe7473482508c08833b168e3 +Subproject commit c3b072eace1ce19a48e36c2ead5932ae2d2e06d9 From 9a0b083f65e749cad70111cc6c2f9cb240c59f00 Mon Sep 17 00:00:00 2001 From: Mikael Capelle Date: Wed, 20 Dec 2017 10:48:34 +0000 Subject: [PATCH 10/11] Ignore eshell. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6bdc61d..e430bd2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .emacs.d/auto-save-list .emacs.d/elpa .emacs.d/projectile-bookmarks.eld +.emacs.d/eshell/ # Mac file **/.DS_Store From c39ce74d66a0a60cc713329de28b943d5b4f1054 Mon Sep 17 00:00:00 2001 From: Mikael Capelle Date: Thu, 21 Dec 2017 14:31:54 +0100 Subject: [PATCH 11/11] Update locale in fish configuration. --- fish/config.fish | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fish/config.fish b/fish/config.fish index bca1783..ea5bbde 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,6 +1,8 @@ # Fish configuration file -set -x LC_ALL en_US.utf8 +set -x LC_CTYPE en_US.UTF-8 +set -x LC_ALL en_US.UTF-8 + set -x PYTHONIOENCODING UTF-8 if test (uname) != "Darwin"