Bladeren bron

Move to solarized. Add fish-like expansions.

Josh Bicking 7 jaren geleden
bovenliggende
commit
9cdd0a6590
4 gewijzigde bestanden met toevoegingen van 10 en 15 verwijderingen
  1. 4 2
      emacs.d/init.el
  2. 2 10
      emacs.d/packages/packages.el
  3. 0 2
      vimrc
  4. 4 1
      zshrc

+ 4 - 2
emacs.d/init.el

@@ -149,8 +149,10 @@
 
 ;; if no custom file exists, write a default one
 (unless (file-exists-p custom-file)
-  (write-region "(custom-set-variables
- '(custom-enabled-themes (quote (monokai)))
+  (write-region "(custom-set-faces
+ '(linum-relative-current-face ((t (:inherit linum :background "dim gray" :foreground "white" :underline nil)))))
+(custom-set-variables
+ '(custom-enabled-themes (quote (solarized-light)))
  '(custom-safe-themes
    (quote
     (\"c7a9a68bd07e38620a5508fef62ec079d274475c8f92d75ed0c33c45fbe306bc\" default))))

+ 2 - 10
emacs.d/packages/packages.el

@@ -164,19 +164,12 @@
 
   (undohist-initialize))
 
-(if (or (display-graphic-p) (daemonp))
-    ;; pretty powerline in X
-    (require 'init-powerline))
-
-;; basic powerline in terminal
 (use-package powerline
-  :if (not (or (display-graphic-p) (daemonp)))
   :ensure t
   :config
-  (powerline-evil-vim-color-theme))
+  (powerline-evil-vim-theme))
 
 (use-package powerline-evil
-  :if (not (display-graphic-p))
   :ensure t)
 
 (set-face-background 'powerline-evil-normal-face "#859900")
@@ -329,8 +322,7 @@
           font-lock-type-face
           font-lock-function-name-face
           font-lock-variable-name-face
-          font-lock-keyword-face
-          font-lock-string-face)))
+          font-lock-keyword-face)))
 
 
 (use-package rainbow-mode

+ 0 - 2
vimrc

@@ -44,8 +44,6 @@ map <space> <leader>
 
 """ Visual
 
-colorscheme torte " set black color scheme
-
 syntax enable " enable syntax processing
 
 set nocursorline " don't highlight current line

+ 4 - 1
zshrc

@@ -20,14 +20,17 @@ then
     # Syntax highlighting bundle.
     antigen bundle zsh-users/zsh-syntax-highlighting
 
+    antigen bundle zsh-users/zsh-autosuggestions
+
     # Load the theme.
-    antigen theme bira
+    antigen theme lambda
 
     # Tell antigen that you're done.
     antigen apply
 
 fi
 
+bindkey '^ ' autosuggest-accept
 
 # History