diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 231f404..79a6a39 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -433,29 +433,6 @@ MODE1 is enabled and vice-versa." (add-to-list 'eshell-output-filter-functions 'oni:eshell-buttonize-url) (add-to-list 'eshell-output-filter-functions 'eshell-truncate-buffer)) -(use-package helm - :ensure t - :bind (("M-x" . helm-M-x) - ("C-x b" . helm-buffers-list) - ("C-x r b" . helm-bookmarks) - ("C-x C-f" . helm-find-files)) - :init - (setq helm-mode-line-string nil) - :config - (setq helm-split-window-in-side-p t) - ;; Don't truncate lines in Helm buffers - (add-hook 'helm-after-initialize-hook 'oni:stop-truncating-helm-lines) - ;; Show helm buffers in a window on the right - (add-to-list 'display-buffer-alist - `(,(rx bol "*helm") display-buffer-in-side-window - (side . right) - (slot . 1)))) - -(use-package helm-buffers - :defer t - :config - (setq helm-buffer-details-flag nil)) - (use-package js2-mode :ensure t :mode (("\\.js\\'" . js2-mode) @@ -720,7 +697,7 @@ MODE1 is enabled and vice-versa." (setq magit-completing-read-function 'magit-ido-completing-read) (setq gnus-completing-read-function 'gnus-ido-completing-read) (setq select-enable-primary t) -(setq projectile-completion-system 'helm) +(setq projectile-completion-system 'ido) ;; Use the notifications library with alert. (setq alert-default-style 'libnotify) diff --git a/emacs/.emacs.d/site-lisp/oni-helm.el b/emacs/.emacs.d/site-lisp/oni-helm.el deleted file mode 100644 index cae97d3..0000000 --- a/emacs/.emacs.d/site-lisp/oni-helm.el +++ /dev/null @@ -1,36 +0,0 @@ -;;; oni-helm.el --- Extra commands and functions for helm -*- lexical-binding: t; -*- - -;; Copyright (C) 2016 Tom Willemse - -;; Author: Tom Willemse -;; Keywords: - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . - -;;; Commentary: - -;; Here are some extra commands and functions for helm. - -;;; Code: - -(require 'helm-lib) - -;;;###autoload -(defun oni:stop-truncating-helm-lines () - (with-current-buffer helm-buffer - (setq truncate-lines nil - truncate-partial-width-windows nil))) - -(provide 'oni-helm) -;;; oni-helm.el ends here