diff --git a/.gitignore b/.gitignore index 2415f9c..85fea45 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ recentf .python-environments* TAGS eshell/history +tramp diff --git a/01mac.el b/01mac.el index 74d580d..e4ba818 100644 --- a/01mac.el +++ b/01mac.el @@ -1,3 +1,10 @@ +;;;;;;;;; GC configuration ;;;;;;;;;;;;;;;;;;; +(setq gc-cons-threshold 50000000) + + +;;;;;;;;; TRAMP configuration ;;;;;;;;;;;;;;;; +(setq tramp-default-method "ssh") + ;;;;;;;;; Emacs bindings ;;;;;;;;;;;;;;;;;;;;; (global-set-key (kbd "RET") 'newline) @@ -34,11 +41,6 @@ (interactive) (ansi-term "/bin/zsh" "ANSI-Term : Zsh"))) -;;; Get rid of bad parts of the windows -(menu-bar-mode -1) -(tool-bar-mode -1) -(scroll-bar-mode -1) - ;#====================== Backup config #============================== (setq backup-directory-alist `((".*" . "~/.emacs_backups/auto-save-list"))) @@ -93,3 +95,13 @@ ;; Disable meta on right alt (useful for Polish characters) (setq ns-right-alternate-modifier nil) + +;;; Get rid of bad parts of the windows +(menu-bar-mode -1) +(tool-bar-mode -1) +(scroll-bar-mode -1) + +;;;;;;;;;;;;;;;;; Record frequency of different commands. Review them later +(require 'keyfreq) +(keyfreq-mode 1) +(keyfreq-autosave-mode 1) diff --git a/02ivy.el b/02ivy.el index db75737..a9dcdc5 100644 --- a/02ivy.el +++ b/02ivy.el @@ -1,7 +1,7 @@ (setq-default ivy-use-virtual-buffers t ;; Display recent files in ivy-switch-buffer ivy-count-format "(%d of %d) " ;; Current candidate count style ivy-display-style 'fancy ;; Formatting style - ivy-re-builders-alist '((t . ivy--regex-fuzzy))) ;; Use fuzzy matching + ) (global-set-key (kbd "C-c a") 'counsel-ag) (global-set-key (kbd "C-c b") 'ivy-switch-buffer) diff --git a/06company-yasnippet.el b/06company-yasnippet.el index cc2d162..fe8c9d4 100644 --- a/06company-yasnippet.el +++ b/06company-yasnippet.el @@ -29,6 +29,7 @@ company-elisp ; Emacs Lisp company-clang company-cmake ;; C company-robe ;; Ruby + company-tern ;; Javascript company-ansible ;; Ansible alchemist-company ;; Elixir company-racer ;; Rust diff --git a/20web.el b/20web.el index e69de29..a104025 100644 --- a/20web.el +++ b/20web.el @@ -0,0 +1,5 @@ +;; Use js2-mode for javascript editing +(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) + +;; Tern is used for completion +(add-hook 'js2-mode-hook 'tern-mode) diff --git a/init.el b/init.el index c5465a3..a168c71 100644 --- a/init.el +++ b/init.el @@ -14,6 +14,7 @@ ;; list the packages you want (setq package-list '( + keyfreq ;; Record how often emacs commands are executed exec-path-from-shell ;; Allow to execute path from shell rainbow-delimiters ;; Colorize matching parens @@ -66,6 +67,9 @@ ;; Web web-mode company-web + js2-mode + tern + company-tern ;; Infrastructure files dockerfile-mode @@ -110,7 +114,7 @@ ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (company-web visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck racer rust-mode hydra markdown-mode solarized-theme company-ansible alchemist window-purpose column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end web-mode rvm dash-at-point robe base16-theme exec-path-from-shell)))) + (indium js2-mode keyfreq company-web visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck racer rust-mode hydra markdown-mode solarized-theme company-ansible alchemist window-purpose column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end web-mode rvm dash-at-point robe base16-theme exec-path-from-shell)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful.