Browse Source

Fix formatting, remove old code

Josh Bicking 7 years ago
parent
commit
b20763dc17
4 changed files with 13 additions and 21 deletions
  1. 2 2
      emacs.d/init.el
  2. 8 16
      emacs.d/packages/packages.el
  3. 1 1
      zshrc
  4. 2 2
      zshrc.local.arch

+ 2 - 2
emacs.d/init.el

@@ -22,8 +22,8 @@
 
 ;; smoother scrolling
 (setq scroll-margin 0
-scroll-conservatively 9999
-scroll-step 1)
+      scroll-conservatively 9999
+      scroll-step 1)
 
 ;; Line settings and indicators
 (setq visual-line-fringe-indicators '(left-curly-arrow right-curly-arrow))

+ 8 - 16
emacs.d/packages/packages.el

@@ -58,13 +58,13 @@
   (setq evil-default-state 'normal)
 
   ;; Move all elements of evil-emacs-state-modes to evil-motion-state-modes
-  (setq evil-motion-state-modes (append evil-emacs-state-modes evil-motion-state-modes))
-  (setq evil-emacs-state-modes (list 'magit-popup-mode))
+  (setq evil-motion-state-modes (append evil-emacs-state-modes evil-motion-state-modes)
+        evil-emacs-state-modes (list 'magit-popup-mode))
   (delete 'magit-popup-mode evil-motion-state-modes)
 
   ;; Don't echo evil's states
-  (setq evil-insert-state-message nil)
-  (setq evil-visual-state-message nil)
+  (setq evil-insert-state-message nil
+        evil-visual-state-message nil)
 
   ;; Little words (camelCase)
   (evil-define-motion evil-little-word (count)
@@ -108,9 +108,9 @@
         hscroll-step 1)
 
   (defhydra hydra-window (global-map "C-w")
-  "modify numbers"
-  ("u" winner-undo "undo window layout")
-  ("U" winner-redo "redo window layout"))
+    "modify numbers"
+    ("u" winner-undo "undo window layout")
+    ("U" winner-redo "redo window layout"))
 
   :bind (:map evil-normal-state-map
               ("zs" . hscroll-cursor-left)
@@ -197,22 +197,18 @@
 
   (evil-leader/set-key
     "d" 'diff-buffer-with-file
-    ;"b" 'buffer-menu
     "v" 'ivy-switch-buffer
     "b" 'buffer-menu
-    ;"f" '(lambda ()  (interactive) (dired '"./"))
     "f" 'neotree-toggle
     "u" 'undo-tree-visualize
-    ;"m" 'recentf-open-files
-    "m" 'ivy-switch-buffer ; includes recentf data
     "l" 'auto-fill-mode
     "s" 'flyspell-toggle-correct-mode
     "a" 'company-mode
-    ;"g" '(lambda () (interactive) (evil-magit-init) (magit-status))
     "g" 'magit-status
     "M-g" 'magit-dispatch-popup
     "c" 'flycheck-mode
     "w" '(lambda () (interactive)
+           ;; "writing" mode
            (variable-pitch-mode)
            (visual-line-mode)
            (flyspell-toggle-correct-mode))
@@ -240,7 +236,6 @@
   :config
   (editorconfig-mode 1))
 
-
 (use-package ivy
   :ensure t
   :diminish ivy-mode
@@ -248,7 +243,6 @@
   (ivy-mode)
   (setq ivy-use-virtual-buffers t))
 
-
 (use-package flx
   :ensure t
   :config
@@ -277,13 +271,11 @@
   :config
   (flycheck-pos-tip-mode))
 
-
 (use-package evil-surround
   :ensure t
   :config
   (global-evil-surround-mode 1))
 
-
 (use-package dtrt-indent
   :ensure t
   :diminish dtrt-indent-mode

+ 1 - 1
zshrc

@@ -42,7 +42,7 @@ setopt -o sharehistory
 setopt HIST_IGNORE_DUPS
 
 # Delete old recorded entry if new entry is a duplicate.
-setopt HIST_IGNORE_ALL_DUPS 
+setopt HIST_IGNORE_ALL_DUPS
 
 setopt appendhistory autocd extendedglob nomatch
 

+ 2 - 2
zshrc.local.arch

@@ -2,11 +2,11 @@
 export SWT_GTK3=0
 
 # devkitPro/devkitPPC sources
-export DEVKITPRO=/home/josh/devkitPro/ 
+export DEVKITPRO=/home/josh/devkitPro/
 export DEVKITPPC=${DEVKITPRO}/devkitPPC
 export DEVKITARM=${DEVKITPRO}/devkitARM
 
-# local bin in PATH 
+# local bin in PATH
 export PATH=$HOME/bin:$PATH
 
 # DOOM config