diff --git a/.bashrc b/.bashrc index 758003f..d683c95 100755 --- a/.bashrc +++ b/.bashrc @@ -124,7 +124,7 @@ PYTHONPATH=${PYTHONPATH}:${GUROBI_PATH}/lib/python3.4_utf32 export PYTHONPATH # data folders (may be used for multiple things) -export DATA_FOLDER=/opt/data +export DATA_FOLDER=/net/cetus/data/ogsn export DATASETS_FOLDER=${DATA_FOLDER}/datasets export INSTANCES_FOLDER=${DATA_FOLDER}/instances export RESULTS_FOLDER=${DATA_FOLDER}/results diff --git a/.emacs.d/clang-complete b/.emacs.d/clang-complete deleted file mode 120000 index 95a708e..0000000 --- a/.emacs.d/clang-complete +++ /dev/null @@ -1 +0,0 @@ -/home/mcapelle/.emacs.d/sources/emacs-clang-complete-async/clang-complete \ No newline at end of file diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index ff1b1a4..7ca845a 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -6,7 +6,7 @@ '(flycheck-gcc-args (quote (""))) '(package-selected-packages (quote - (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))) + (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))) '(safe-local-variable-values (quote ((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") diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 973284e..a3d6922 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -106,7 +106,8 @@ (add-hook 'flycheck-mode-hook 'flycheck-pos-tip-mode) (add-hook 'flycheck-after-syntax-check-hook 'flycheck-autolist-hook) (global-flycheck-mode) - (setq flycheck-clang-args '("-std=c++14"))) + (setq flycheck-clang-language-standard "-std=c++14") + (setq flycheck-clang-args '("-W" "-Wall"))) (use-package company :init @@ -187,17 +188,20 @@ (use-package markdown-mode :mode "\\.text\\'" "\\.markdown\\'" "\\.md\\'") -;; White space mode +;; White space mode & Fill mode column (setq-default fill-column 95) (setq whitespace-line-column 95) (add-hook 'before-save-hook 'whitespace-cleanup) +(add-hook 'visual-line-mode-hook 'visual-fill-column-mode) +(global-visual-line-mode t) + (add-hook 'python-mode-hook (lambda () (setq whitespace-line-column 140))) (add-hook 'LaTeX-mode-hook (lambda () (setq whitespace-line-column -1))) +(add-hook 'LaTeX-mode-hook (lambda () (setq whitespace-line-column -1))) (global-whitespace-mode 1) -(add-hook 'web-mode-hook 'turn-on-auto-fill) (add-hook 'LaTeX-mode-hook 'turn-on-auto-fill) ;; Electric pair mode @@ -303,3 +307,4 @@ (setq custom-file "~/.emacs.d/custom.el") (load custom-file) +(put 'narrow-to-region 'disabled nil) diff --git a/.emacs.d/irony/bin/irony-server b/.emacs.d/irony/bin/irony-server deleted file mode 100755 index 937f6fc..0000000 Binary files a/.emacs.d/irony/bin/irony-server and /dev/null differ diff --git a/install-packages.el b/install-packages.el index 647cfc0..11248c3 100644 --- a/install-packages.el +++ b/install-packages.el @@ -1,3 +1,11 @@ +;;; install-packages --- Install required packages + +;;; Commentary: + +;; Install the required packages. + +;;; Code: + (require 'package) ;; You might already have this line (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/")) @@ -8,11 +16,13 @@ (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/"))) (package-initialize) ;; You might already have this line +(package-refresh-contents) (package-install '2048-game) -(package-install 'ac-c-headers) -(package-install 'ac-math) -(package-install 'ac-octave) +(package-install 'async) +(package-install 'auctex) +(package-install 'auto-complete) +(package-install 'company) (package-install 'company-auctex) (package-install 'company-c-headers) (package-install 'company-dict) @@ -20,70 +30,43 @@ (package-install 'company-math) (package-install 'company-web) (package-install 'cython-mode) +(package-install 'dash) +(package-install 'dash-functional) (package-install 'diffview) (package-install 'fish-mode) +(package-install 'flycheck) (package-install 'flycheck-color-mode-line) (package-install 'flycheck-pos-tip) +(package-install 'helm) (package-install 'helm-bibtex) +(package-install 'helm-core) (package-install 'helm-flycheck) (package-install 'helm-flyspell) (package-install 'helm-ls-git) -(package-install 'helm-package) +(package-install 'helm-projectile) (package-install 'helm-spotify) (package-install 'hydandata-light-theme) (package-install 'java-imports) (package-install 'java-snippets) (package-install 'javadoc-lookup) (package-install 'jedi) +(package-install 'jedi-core) (package-install 'js-comint) (package-install 'json-mode) +(package-install 'json-reformat) (package-install 'magit) +(package-install 'magit-popup) (package-install 'markdown-mode) -(package-install 'nlinum) -(package-install 'openwith) +(package-install 'math-symbol-lists) (package-install 'php-mode) -(package-install 'poker) (package-install 'powerline) +(package-install 'projectile) (package-install 'python-mode) -(package-install 'pythonic) -(package-install 'smart-compile) -(package-install 'sokoban) (package-install 'solarized-theme) (package-install 'sr-speedbar) +(package-install 'visual-fill-column) (package-install 'web-mode) (package-install 'yaml-mode) -(package-install 'async) -(package-install 'auctex) -(package-install 'auto-complete) -(package-install 'company) -(package-install 'concurrent) -(package-install 'ctable) -(package-install 'dash) -(package-install 'dash-functional) -(package-install 'deferred) -(package-install 'epc) -(package-install 'epl) -(package-install 'f) -(package-install 'flycheck) -(package-install 'git-commit) -(package-install 'helm) -(package-install 'helm-core) -(package-install 'jedi-core) -(package-install 'json-reformat) -(package-install 'json-snatcher) -(package-install 'let-alist) -(package-install 'magit-popup) -(package-install 'math-symbol-lists) -(package-install 'multi) -(package-install 'nvm) -(package-install 'parsebib) -(package-install 'pcache) -(package-install 'pkg-info) -(package-install 'popup) -(package-install 'pos-tip) -(package-install 'python-environment) -(package-install 's) -(package-install 'seq) -(package-install 'web-completion-data) -(package-install 'with-editor) (package-install 'yasnippet) + +;;; install-packages.el ends here