diff options
| -rw-r--r-- | init.el | 5 | ||||
| -rw-r--r-- | init/functions.el | 2 | ||||
| -rw-r--r-- | init/settings.el | 33 |
3 files changed, 9 insertions, 31 deletions
diff --git a/init.el b/init.el index 0989b0e4fab0..86876c121c59 100644 --- a/init.el +++ b/init.el @@ -21,14 +21,13 @@ dash dockerfile-mode erlang - flx-ido flycheck go-mode gruber-darker-theme haskell-mode + helm hi2 idle-highlight-mode - ido-completing-read+ iy-go-to-char magit markdown-mode+ @@ -42,9 +41,7 @@ rainbow-delimiters rainbow-mode rust-mode - s smart-mode-line - smex switch-window terraform-mode undo-tree diff --git a/init/functions.el b/init/functions.el index 6389931bc0b3..29d07f81120a 100644 --- a/init/functions.el +++ b/init/functions.el @@ -96,7 +96,7 @@ Including indent-buffer, which should not be called automatically on save." (defun esk-sudo-edit (&optional arg) (interactive "p") (if (or arg (not buffer-file-name)) - (find-file (concat "/sudo:root@localhost:" (ido-read-file-name "File: "))) + (find-file (concat "/sudo:root@localhost:" (read-file-name "File: "))) (find-alternate-file (concat "/sudo:root@localhost:" buffer-file-name)))) ;; Evaluate sexp and replace it with result diff --git a/init/settings.el b/init/settings.el index 4fcd1cd074d0..5db6619c8c24 100644 --- a/init/settings.el +++ b/init/settings.el @@ -2,6 +2,13 @@ ; ## Generic settings ## +;; Make Helm go! +(require 'helm-config) +(global-set-key (kbd "M-x") #'helm-M-x) +(global-set-key (kbd "C-x r b") #'helm-filtered-bookmarks) +(global-set-key (kbd "C-x C-f") #'helm-find-files) +(helm-mode 1) + ; Hide those ugly tool bars (tool-bar-mode 0) (scroll-bar-mode 0) @@ -19,8 +26,6 @@ ;; Go away go away (setq initial-scratch-message "") -(flx-ido-mode 1) -(setq ido-use-faces nil) (setq gc-cons-threshold 20000000) (setq uniquify-buffer-name-style 'forward) @@ -72,35 +77,11 @@ (setq x-super-keysym 'meta x-alt-keysym 'alt)) -(setq smex-save-file (concat user-emacs-directory ".smex-items")) -(setq smex-key-advice-ignore-menu-bar t) -(smex-initialize) -(global-set-key (kbd "M-x") 'smex) - (add-to-list 'safe-local-variable-values '(lexical-binding . t)) (add-to-list 'safe-local-variable-values '(whitespace-line-column . 80)) (set-default 'indent-tabs-mode nil) -;; ido-mode is like magic pixie dust! -(ido-mode t) - -;; ido-completing-read+ enables ido everywhere, not just for buffers and files. -(require 'ido-completing-read+) -(ido-ubiquitous-mode 1) - -(setq ido-enable-prefix nil - ido-enable-flex-matching t - ido-auto-merge-work-directories-length nil - ido-create-new-buffer 'always - ido-use-filename-at-point 'guess - ido-use-virtual-buffers t - ido-handle-duplicate-virtual-buffers 2 - ido-max-prospects 10) - -;; Swedish! -(set-language-environment 'Swedish) - ;; UTF-8 please (setq locale-coding-system 'utf-8) ; pretty (set-terminal-coding-system 'utf-8) ; pretty |