Sfoglia il codice sorgente

remove mouse changes, add dabbrev bind

Josh Bicking 7 anni fa
parent
commit
0e3d484e6d
2 ha cambiato i file con 20 aggiunte e 11 eliminazioni
  1. 9 7
      emacs.d/init.el
  2. 11 4
      emacs.d/packages/packages.el

+ 9 - 7
emacs.d/init.el

@@ -4,8 +4,8 @@
 
 (setq inhibit-splash-screen t
       inhibit-startup-echo-area-message t
-      initial-scratch-message ""	; I like things empty.
-      initial-major-mode 'text-mode)	; I'm usually not writing elisp.
+      initial-scratch-message ""
+      initial-major-mode 'text-mode)
 
 ;; Base
 
@@ -21,13 +21,10 @@
   (tool-bar-mode -1))
 
 ;; smoother scrolling
-(setq mouse-wheel-scroll-amount '(1 ((shift) . 1))) ; one line at a time
-(setq mouse-wheel-progressive-speed nil)            ; don't accelerate scrolling
 (setq scroll-margin 0
 scroll-conservatively 9999
 scroll-step 1)
 
-
 ;; Line settings and indicators
 (setq visual-line-fringe-indicators '(left-curly-arrow right-curly-arrow))
 (setq-default left-fringe-width nil)
@@ -51,7 +48,8 @@ scroll-step 1)
 
 ;; Save minibar history
 (savehist-mode 1)
-(setq savehist-additional-variables '(kill-ring search-ring regexp-search-ring))
+(setq savehist-additional-variables
+      '(kill-ring search-ring regexp-search-ring))
 
 ;; Always show matching parens
 (show-paren-mode t)
@@ -104,11 +102,15 @@ scroll-step 1)
   "Create tags file."
   (interactive "DDirectory: ")
   (shell-command
-    (format "\"%s\" -f TAGS -e -R %s" tags-generator (directory-file-name dir-name))))
+   (format "\"%s\" -f TAGS -e -R %s"
+           tags-generator (directory-file-name dir-name))))
 
 (add-to-list 'load-path (expand-file-name "packages" user-emacs-directory))
 (require 'packages)
 
+;; Buffer-based completion
+(global-set-key (kbd "C-SPC") 'dabbrev-completion)
+
 
 ;;;; System-specific configs
 

+ 11 - 4
emacs.d/packages/packages.el

@@ -241,6 +241,7 @@
   "modify numbers"
   ("u" winner-undo "undo window layout")
   ("U" winner-redo "redo window layout"))
+
   :bind (:map evil-normal-state-map
               ("zs" . hscroll-cursor-left)
               ("ze" . hscroll-cursor-right)
@@ -262,9 +263,10 @@
   :config
   ;; Increment and decrement (evil-numbers)
   (defhydra hydra-numbers (global-map "C-x")
-  "modify numbers"
-  ("a" evil-numbers/inc-at-pt "increment")
-  ("x" evil-numbers/dec-at-pt "decrement")))
+    "modify numbers"
+    ("a" evil-numbers/inc-at-pt "increment")
+    ("x" evil-numbers/dec-at-pt "decrement")))
+
 
 (use-package undo-tree
   :diminish undo-tree-mode)
@@ -293,7 +295,6 @@
   (use-package powerline-evil
     :ensure t))
 
-
 (use-package web-mode
   :config
   ;; 2 spaces for an indent
@@ -510,4 +511,10 @@
   :config
   (add-hook 'after-init-hook #'global-emojify-mode))
 
+(use-package eyebrowse
+  :config
+  (eyebrowse-mode t)
+  (eyebrowse-setup-evil-keys)
+  (setq eyebrowse-new-workspace t))
+
 (provide 'packages)