dot

commit f24232ffcd3ee0f08c21c012b38a3e3388379d9c
parent 78cebd3fa30ff7a4ea8c6b755ef0e5fe3e900eb9
Author: josuah <mail@josuah.net>
Date:   Mon, 26 Sep 2016 22:53:49 -0400

Improved vim highlighting

Diffstat:
M
emacs/.emacs
 | 
28
++++++++++++++++++----------
M
vim/.vimrc
 | 
5
++---

2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/emacs/.emacs b/emacs/.emacs
@@ -21,7 +21,7 @@
 (when (fboundp 'tool-bar-mode) (tool-bar-mode -1))
 (when (fboundp 'scroll-bar-mode) (scroll-bar-mode -1))
 
-;; (load-theme 'wheatgrass t)
+(load-theme 'wombat t)
 
 (set-frame-font "mono:antialias=false:size=15")
 (add-to-list 'default-frame-alist
@@ -56,7 +56,7 @@
 (/// "packages")
 (require 'package)
 
-(setq package-list '(ivy))
+(setq package-list '(ivy swiper counsel which-key))
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
 
 (package-initialize)
@@ -77,7 +77,7 @@
 
  inhibit-startup-message t              ;Startup
  initial-scratch-message nil
- 
+
  hscroll-step 1                         ;Scrolling
  scroll-conservatively 1000
  truncate-lines t
@@ -89,7 +89,7 @@
 (defalias 'yes-or-no-p 'y-or-n-p)
 
 (require 'proced)
-(global-set-key (kbd "C-c p") 'proced)
+(global-set-key (kbd "C-x p") 'proced)
 
 (require 'files)
 (setq
@@ -117,10 +117,6 @@
 (provide 'reveal)
 (global-reveal-mode)
 
-(require 'ruler-mode)
-(add-hook 'prog-mode-hook 'ruler-mode)
-(add-hook 'text-mode-hook 'ruler-mode)
-
 (require 'which-func)
 (add-hook 'prog-mode-hook 'which-function-mode)
 (add-hook 'text-mode-hook 'which-function-mode)
@@ -291,7 +287,7 @@
 
 (add-hook 'eshell-mode-hook 'eshell-smart-initialize)
 
-
+
 (/// "erc")
 (require 'erc)
 
@@ -380,7 +376,7 @@
  gnus-ignored-from-addresses nil        ;Hide no group or email adress
  gnus-ignored-newsgroups ""
 
- mm-attachment-override-types '("image/.*") ; Display images inline
+ mm-attachment-override-types '("image/.*") ;Display images inline
 
  gnus-use-full-window nil               ;So not change window config
 
@@ -399,6 +395,18 @@
 
 (ivy-mode)
 
+(require 'swiper)
+(global-set-key (kbd "C-s") 'swiper)
+
+(require 'counsel)
+(global-set-key (kbd "M-x") 'counsel-M-x)
+
+(/// "which-key")
+(require 'which-key)
+
+(which-key-mode)
+
+(/// "emacs")
 
 (provide 'init)
 ;;; init.el ends here
diff --git a/vim/.vimrc b/vim/.vimrc
@@ -101,6 +101,8 @@ highlight StatusLineNC cterm=bold ctermfg=0
 highlight ModeMsg      cterm=bold ctermfg=2 ctermbg=0
 highlight WildMenu     cterm=none ctermfg=0 ctermbg=2
 highlight VertSplit    cterm=none ctermfg=7 ctermbg=none
+highlight IncSearch    cterm=none ctermfg=0 ctermbg=6
+highlight Visual       cterm=none ctermfg=0 ctermbg=7
 
 " Code
 highlight Comment      cterm=bold ctermfg=0
@@ -128,6 +130,3 @@ execute pathogen#infect()
 
 " UndoTree
 nmap <leader>u :UndotreeToggle<cr>
-
-" GitGutter
-let g:gitgutter_sign_column_always = 1