diff options
| author | Franck Cuny <fcuny@twitter.com> | 2018-11-23 09:27:06 -0800 |
|---|---|---|
| committer | Franck Cuny <fcuny@twitter.com> | 2018-11-23 09:27:06 -0800 |
| commit | 4492c5cfbe0e99666afed6780b674beaa670d1a1 (patch) | |
| tree | 0b60557a2640f364ddeef4cbca9d72b2358e618b /configs/rcs | |
| parent | [tmux] Small change to binding + fix terminal (diff) | |
| download | emacs.d-4492c5cfbe0e99666afed6780b674beaa670d1a1.tar.gz | |
[bash] Let's try to use emacs tty
Diffstat (limited to 'configs/rcs')
| -rwxr-xr-x | configs/rcs/bashrc | 2 | ||||
| -rw-r--r-- | configs/rcs/emacs.d/init.el | 37 |
2 files changed, 27 insertions, 12 deletions
diff --git a/configs/rcs/bashrc b/configs/rcs/bashrc index 42585a0..44995c8 100755 --- a/configs/rcs/bashrc +++ b/configs/rcs/bashrc @@ -1,4 +1,4 @@ -export EDITOR="emacsclient" +export EDITOR="emacsclient -nw" export HISTFILE= export LANG="en_US.UTF-8" export LC_ALL="$LANG" diff --git a/configs/rcs/emacs.d/init.el b/configs/rcs/emacs.d/init.el index ff43b51..1abd6b1 100644 --- a/configs/rcs/emacs.d/init.el +++ b/configs/rcs/emacs.d/init.el @@ -100,7 +100,7 @@ :config (progn (defun fcuny/setup-frame(&optional frame) - (fringe-mode '(5 . 5)) + (fringe-mode '(8 . 8)) (setq-default frame-title-format "%b") (set-face-attribute 'default nil :height 150 :weight 'normal :width 'normal :font "Source Code Pro") (when (eq system-type 'darwin) @@ -146,13 +146,6 @@ (setq auto-revert-verbose nil) (global-auto-revert-mode t)) -(use-package ido - :init - (ido-mode t) - :config - (setq ido-enable-prefix nil - ido-create-new-buffer 'always)) - (use-package hl-line :config (global-hl-line-mode t)) @@ -274,10 +267,10 @@ :hook (go-mode . fcuny/go-mode-setup) :init (defun fcuny/go-mode-setup () - (setq tab-width 2) + (setq tab-width 4) (add-hook 'before-save-hook 'gofmt-before-save)) :config - (when (memq windows-system '(mac ns)) + (when (memq window-system '(mac ns)) (exec-path-from-shell-copy-env "GOPATH"))) (use-package python @@ -304,7 +297,9 @@ :defer 5) (use-package puppet-mode - :ensure t) + :ensure t + :bind (:map puppet-mode-map + ("C-c |" . puppet-align-block))) (use-package yaml-mode :ensure t) @@ -325,3 +320,23 @@ :ensure t :hook ((protobuf-mode . flyspell-prog-mode) (protobuf-mode . flycheck-mode))) + +(use-package counsel + :ensure t + :init (counsel-mode 1) (ivy-mode 1) + :bind + (("M-x" . counsel-M-x) + ("C-s" . counsel-grep-or-swiper) + ("C-x C-f" . counsel-find-file) + ("C-x C-r" . counsel-recentf) + ("C-c f" . counsel-git) + ("C-c s" . counsel-git-grep) + ("C-c /" . counsel-ag) + ("C-x r l" . counsel-bookmark)) + :custom + (counsel-find-file-at-point t) + (ivy-use-virtual-buffers t) + (ivy-count-format "(%d/%d) ") + (ivy-height 10) + :config + (use-package swiper :ensure t)) |