Skip to content

Commit ceb6037

Browse files
author
bwkernel
committed
update
1 parent f7c70eb commit ceb6037

8 files changed

+53
-1
lines changed

Diff for: init.el

+5
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,12 @@
3737
;;(require 'init-utils)
3838
(require 'init-packages)
3939
(require 'init-elpa)
40+
(require 'init-exec-path-shell)
4041
(require 'init-term)
4142
;;(require 'init-simple-package)
4243
(require 'init-themes)
44+
(require 'init-powerline)
45+
(require 'init-window)
4346
(require 'init-better-defaults)
4447
(require 'init-dired)
4548
;; (require 'init-evil)
@@ -55,6 +58,8 @@
5558
(require 'init-go)
5659
(require 'init-ui)
5760
(require 'init-keybindings)
61+
(require 'init-multi-cursors)
62+
5863
(setq custom-file (expand-file-name "lisp/custom.el" user-emacs-directory))
5964
(load-file custom-file)
6065
(put 'upcase-region 'disabled nil)

Diff for: lisp/custom.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
'(omnisharp-imenu-support t)
5050
'(package-selected-packages
5151
(quote
52-
(multi-term flycheck color-theme-solarized color-theme-sanityinc-tomorrow fill-column-indicator iedit dotnet sql-indent which-key evil-nerd-commenter powerline-evil evil-surround powerline window-numbering evil company monokai-theme hungry-delete smartparens js2-mode nodejs-repl popwin omnisharp helm web-mode expand-region popup cnfonts org-pomodoro yasnippet helm-ag elpy py-autopep8 counsel go-mode company-go)))
52+
(exec-path-from-shell go-autocomplete auto-complete-config auto-complete mc-extras multiple-cursors multi-term flycheck color-theme-solarized color-theme-sanityinc-tomorrow fill-column-indicator iedit dotnet sql-indent which-key evil-nerd-commenter powerline-evil evil-surround powerline window-numbering evil company monokai-theme hungry-delete smartparens js2-mode nodejs-repl popwin omnisharp helm web-mode expand-region popup cnfonts org-pomodoro yasnippet helm-ag elpy py-autopep8 counsel go-mode company-go)))
5353
'(popwin:popup-window-position (quote right))
5454
'(popwin:popup-window-width 80)
5555
'(which-key-side-window-location (quote right)))

Diff for: lisp/init-exec-path-shell.el

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
(require-package 'exec-path-from-shell)
2+
3+
(when (memq window-system '(mac ns))
4+
(exec-path-from-shell-initialize)
5+
(exec-path-from-shell-copy-env "GOPATH"))
6+
7+
(provide 'init-exec-path-shell)

Diff for: lisp/init-go.el

+11
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,16 @@
3333
;;(load-file "$GOPATH/src/golang.org/x/tools/cmd/oracle/oracle.el")
3434
;;(add-hook 'go-mode-hook 'go-oracle-mode)
3535

36+
;; Go company
37+
(require-package 'auto-complete)
38+
(require-package 'go-autocomplete)
39+
;; (require-package 'auto-complete-config)
40+
(ac-config-default)
41+
42+
(require-package 'company-go)
43+
(add-hook 'go-mode-hook (lambda ()
44+
(set (make-local-variable 'company-backends) '(company-go))
45+
(company-mode)))
46+
3647
(provide 'init-go)
3748
;;; init-go.el ends here

Diff for: lisp/init-keybindings.el

+3
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,7 @@
3737
(global-set-key (kbd "M-n") #'scroll-up-line)
3838
(global-set-key (kbd "C-c b r") #'revert-buffer)
3939

40+
;; undo-tree-mode
41+
(global-set-key (kbd "C-c C-u") #'undo-tree-mode)
42+
4043
(provide 'init-keybindings)

Diff for: lisp/init-multi-cursors.el

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
(require-package 'multiple-cursors)
2+
3+
(defun mc/cursor-is-bar () nil)
4+
5+
(global-set-key (kbd "C-S-c C-S-c") 'mc/edit-lines)
6+
(global-set-key (kbd "C->") 'mc/mark-next-like-this)
7+
(global-set-key (kbd "C-<") 'mc/mark-previous-like-this)
8+
(global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this)
9+
10+
(require-package 'mc-extras)
11+
12+
;; (define-key mc/keymap (kbd "C-. C-d") 'mc/remove-current-cursor)
13+
;; (define-key mc/keymap (kbd "C-. d") 'mc/remove-duplicated-cursors)
14+
;; (define-key mc/keymap (kbd "C-. =") 'mc/compare-chars)
15+
16+
(mc/cua-rectangle-setup)
17+
18+
(provide 'init-multi-cursors)

Diff for: lisp/init-powerline.el

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
(require-package 'powerline)
2+
(powerline-default-theme)
3+
4+
(provide 'init-powerline)

Diff for: lisp/init-window.el

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
(require-package 'window-numbering)
2+
(window-numbering-mode 1)
3+
4+
(provide 'init-window)

0 commit comments

Comments
 (0)