reorganize git, yasnippet and compilation

- join git related packages in git section
- join yasnippet related packages, moved to productivity
- join compilation related declarations to common programming
This commit is contained in:
Łukasz Pankowski 2019-12-17 09:55:25 +01:00
parent a0f1d0439d
commit 208524ec82

102
init.el
View File

@ -106,9 +106,21 @@
:config :config
(which-key-mode)) (which-key-mode))
;;; Helm version for `C-h b`.
(use-package helm-descbinds
:init
(helm-descbinds-mode))
;;; List of personal key bindings
(global-set-key (kbd "C-c h b") 'describe-personal-keybindings)
;;; ### More efficient buffer/file selection ### ;;; ### More efficient buffer/file selection ###
(global-set-key "\C-cq" #'bury-buffer)
(use-package helm (use-package helm
:init :init
(setq helm-split-window-default-side 'other (setq helm-split-window-default-side 'other
@ -136,32 +148,6 @@
("<backtab>" . helm-select-action) ("<backtab>" . helm-select-action)
("C-i" . helm-execute-persistent-action))) ("C-i" . helm-execute-persistent-action)))
(use-package helm-swoop
:bind
(("C-s" . helm-swoop-without-pre-input)
("C-S-s" . helm-swoop)))
(use-package helm-descbinds
:init
(helm-descbinds-mode))
(use-package helm-git-grep
:bind
(("C-c j" . helm-git-grep)
("C-c J" . helm-git-grep-at-point)))
(use-package helm-ls-git
:bind
(("C-c g" . helm-ls-git-ls)))
(use-package helm-make
:bind
(("C-c K" . helm-make)))
(use-package helm-c-yasnippet
:bind
(("C-c y" . helm-yas-complete)))
;;; Install [ripgrep](https://github.com/BurntSushi/ripgrep) (rg) and ;;; Install [ripgrep](https://github.com/BurntSushi/ripgrep) (rg) and
;;; add ;;; add
@ -169,7 +155,7 @@
:bind :bind
(("C-c r" . helm-rg))) (("C-c r" . helm-rg)))
;;; Directory sidebar ;;; File explorer sidebar
(use-package treemacs (use-package treemacs
:bind :bind
@ -234,6 +220,13 @@
;;; ### In buffer movement enhancements ### ;;; ### In buffer movement enhancements ###
;;; Improved in buffer search
(use-package helm-swoop
:bind
(("C-s" . helm-swoop-without-pre-input)
("C-S-s" . helm-swoop)))
;;; Type substring and wait to select one of its visible occurrences ;;; Type substring and wait to select one of its visible occurrences
;;; (even in other windows) with a single or two letters. ;;; (even in other windows) with a single or two letters.
@ -281,9 +274,7 @@
:hook (prog-mode . ws-butler-mode)) :hook (prog-mode . ws-butler-mode))
;;; ### Convenience functions, aliases, and key bindings ### ;;; ### Spell checking ###
;; Convenience functions and aliases
(defun am () (defun am ()
"Change dictionary to american." "Change dictionary to american."
@ -297,11 +288,6 @@
(defalias 'ir #'ispell-region) (defalias 'ir #'ispell-region)
;; Bind keys
(global-set-key "\C-ck" #'compile)
(global-set-key "\C-cq" #'bury-buffer)
;;; ### Shell and terminal ### ;;; ### Shell and terminal ###
@ -329,6 +315,15 @@
(setq git-messenger:show-detail t (setq git-messenger:show-detail t
git-messenger:use-magit-popup t)) git-messenger:use-magit-popup t))
(use-package helm-git-grep
:bind
(("C-c j" . helm-git-grep)
("C-c J" . helm-git-grep-at-point)))
(use-package helm-ls-git
:bind
(("C-c g" . helm-ls-git-ls)))
;;; ### Switching buffers ### ;;; ### Switching buffers ###
@ -359,6 +354,22 @@ of the key binding used to execute this command."
(global-set-key (kbd "s-s") my-switch-to-register-map) (global-set-key (kbd "s-s") my-switch-to-register-map)
;;; ### Yasnippet and abbrev mode ###
(setq-default abbrev-mode 1)
(use-package yasnippet
:hook (after-init . yas-global-mode)
:bind
(:map yas-minor-mode-map
("C-c & t" . yas-describe-tables)
("C-c & &" . org-mark-ring-goto)))
(use-package helm-c-yasnippet
:bind
(("C-c y" . helm-yas-complete)))
;;; Programming languages ;;; Programming languages
;;; --------------------- ;;; ---------------------
@ -398,6 +409,15 @@ of the key binding used to execute this command."
("C-c e i" . lsp-find-implementation) ("C-c e i" . lsp-find-implementation)
("C-c e t" . lsp-find-type-definition))) ("C-c e t" . lsp-find-type-definition)))
;;; Compilation
(global-set-key "\C-ck" #'compile)
(use-package helm-make
:bind
(("C-c K" . helm-make)))
;;; [my common settings for programming modes]: #common-settings-for-programming-modes ;;; [my common settings for programming modes]: #common-settings-for-programming-modes
@ -859,18 +879,6 @@ inserted between the braces between the braces."
;;; ----------- ;;; -----------
;;; ### Yasnippet and abbrev mode ###
(setq-default abbrev-mode 1)
(use-package yasnippet
:hook (after-init . yas-global-mode)
:bind
(:map yas-minor-mode-map
("C-c & t" . yas-describe-tables)
("C-c & &" . org-mark-ring-goto)))
;;; ### Web mode ### ;;; ### Web mode ###
(defun my-web-mode-hook-fn() (defun my-web-mode-hook-fn()