From 76bbd07de7add0f9d13c6914f158d19630fe2f62 Mon Sep 17 00:00:00 2001
From: Chizi123 <joelgrun@gmail.com>
Date: Sun, 18 Nov 2018 12:38:46 +0000
Subject: [PATCH] added golden-ratio and org-bullets
---
init.el~ | 45 +++++++++++++++++++++------------------------
1 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/init.el~ b/init.el~
index 168f77e..e698038 100644
--- a/init.el~
+++ b/init.el~
@@ -29,24 +29,13 @@
(require 'ispell)
(setq-default ispell-program-name "aspell")
-;; x86 reference
-(setq x86-lookup-pdf "D:/Coding/x86-8664 reference.pdf")
-
;; Melpa repo
(require 'package)
(add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/") t)
(package-initialize)
;; helm
-;; (require 'helm)
(require 'helm-config)
-
-;; (define-key helm-map (kbd "<tab>") 'helm-execute-persistent-action) ; rebind tab to run persistent action
-;; (define-key helm-map (kbd "C-i") 'helm-execute-persistent-action) ; make TAB work in terminal
-;; (define-key helm-map (kbd "C-z") 'helm-select-action) ; list actions using C-z
-
-(when (executable-find "curl")
- (setq helm-google-suggest-use-curl-p t))
(setq helm-split-window-in-side-p t ; open helm buffer inside current window, not occupy whole other window
helm-move-to-line-cycle-in-source t ; move to end or beginning of source when reaching top or bottom of source.
@@ -69,10 +58,6 @@
(add-hook 'helm-minibuffer-set-up-hook
'spacemacs//helm-hide-minibuffer-maybe)
-(setq helm-autoresize-max-height 0)
-(setq helm-autoresize-min-height 20)
-;; (helm-autoresize-mode 1)
-
(global-set-key (kbd "M-x") 'helm-M-x)
(setq helm-M-x-fuzzy-match t) ;; optional fuzzy matching for helm-M-x
@@ -88,19 +73,19 @@
(helm-mode 1)
-;; undo-tree config
+;; undo-tree
(require 'undo-tree)
(global-undo-tree-mode)
-;; volatile highlights config
+;; volatile highlights
(require 'volatile-highlights)
(volatile-highlights-mode t)
-;; yasnippet config
+;; yasnippet
(require 'yasnippet)
(yas-global-mode 1)
-;; ggtags config
+;; ggtags
(require 'ggtags)
(add-hook 'c-mode-common-hook
(lambda
@@ -108,12 +93,13 @@
(ggtags-mode 1))))
(add-hook 'dired-mode-hook 'ggtags-mode)
-;; workgroups2 config
+;; workgroups2
(require 'workgroups2)
(workgroups-mode 1)
-;; smartparens config
+;; smartparens
(require 'smartparens-config)
+(add-hook 'prog-mode-hook #'smartparens-mode)
(setq sp-base-key-bindings 'paredit)
(setq sp-autoskip-closing-pair 'always)
(setq sp-hybrid-kill-entire-symbol nil)
@@ -128,7 +114,9 @@
(add-hook 'after-init-hook 'global-company-mode)
(add-to-list 'company-backends 'company-c-headers)
(setq company-backends (delete 'company-semantic company-backends))
-;; (define-key c-mode-base-map [(tab)] 'company-complete)
+(add-hook 'c-mode-common-hook
+ (lambda ()
+ (define-key c-mode-base-map [(tab)] 'company-complete)))
;; (define-key c++-mode-map [(tab)] 'company-complete)
;; ibuffer-vc config
@@ -212,9 +200,18 @@
;; guide-key
(require 'guide-key)
-(setq guide-key/guide-key-sequence '("C-x" "C-c"))
+(setq guide-key/guide-key-sequence '("C-x" "C-c" "M-g" "C-h"))
(setq guide-key/recursive-key-sequence-flag t)
+(setq guide-key/popup-window-position 'bottom)
(guide-key-mode 1) ; Enable guide-key-mode
+
+;; x86 reference
+(require 'x86-lookup)
+(setq x86-lookup-pdf "D:/Coding/x86-8664 reference.pdf")
+(global-set-key (kbd "C-h x") #'x86-lookup)
+
+;; org-bullets
+
(custom-set-variables
;; custom-set-variables was added by Custom.
@@ -223,7 +220,7 @@
;; If there is more than one, they won't work right.
'(package-selected-packages
(quote
- (guide-key ztree yasnippet workgroups2 volatile-highlights undo-tree srefactor smartparens nyan-mode magit ibuffer-vc helm-projectile ggtags flycheck-tip flycheck-pos-tip diff-hl company-c-headers clean-aindent-mode))))
+ (org org-bullets x86-lookup ztree yasnippet workgroups2 volatile-highlights undo-tree srefactor smartparens nyan-mode magit ibuffer-vc helm-projectile guide-key ggtags flycheck-tip flycheck-pos-tip diff-hl company-c-headers clean-aindent-mode))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
--
Gitblit v1.9.3