Update

2 files changed, 39 insertions, 25 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 2c9b7ef..186c23b 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -36,7 +36,7 @@
  '(jdee-db-spec-breakpoint-face-colors (cons "#1c1f2b" "#676E95"))
  '(objed-cursor-color "#ff5370")
  '(package-selected-packages
-   '(evil-numbers ccls org-superstar company-lsp lsp-ui lsp-mode evil-mc vterm evil-surround cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode symon toc-org yaml-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key dmenu lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode))
+   '(helm-ag evil-numbers ccls org-superstar company-lsp lsp-ui lsp-mode evil-mc vterm evil-surround cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode symon toc-org yaml-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key dmenu lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode))
  '(pdf-view-midnight-colors (cons "#EEFFFF" "#292D3E"))
  '(pos-tip-background-color "#2E2A29")
  '(pos-tip-foreground-color "#d4d4d6")
diff --git a/.config/emacs/org/config.org b/.config/emacs/org/config.org
index 650c1c9..a2f8b85 100644
--- a/.config/emacs/org/config.org
+++ b/.config/emacs/org/config.org
@@ -185,8 +185,8 @@
 *** Evil numbers
 #+BEGIN_SRC emacs-lisp
   (require 'evil-numbers)
-  (define-key evil-normal-state-map (kbd "C-c a") 'evil-numbers/inc-at-pt)
-  (define-key evil-normal-state-map (kbd "C-c x") 'evil-numbers/dec-at-pt)
+  (define-key evil-normal-state-map (kbd "C-c C-a") 'evil-numbers/inc-at-pt)
+  (define-key evil-normal-state-map (kbd "C-c C-x") 'evil-numbers/dec-at-pt)
 #+END_SRC
 
 *** Centaur tabs
@@ -220,6 +220,7 @@
 			(string-prefix-p "*Helm" name)
 			(string-prefix-p "*Compile-Log*" name)
 			(string-prefix-p "*compilation*" name)
+			(string-prefix-p "*Flymake diagnostics" name)
 			(string-prefix-p "*lsp" name)
 			(string-prefix-p "*scratch*" name)
 			(string-prefix-p "*Messages*" name)
@@ -227,6 +228,7 @@
 			(string-prefix-p "*Mingus Help*" name)
 			(string-prefix-p "*Mingus*" name)
 			(string-prefix-p "*Mingus Browser*" name)
+			(string-prefix-p "TAGS" name)
 			(and (string-prefix-p "magit" name)
 				(not (file-name-extension name))))))
 
@@ -286,21 +288,21 @@
 
 *** NeoTree
 #+BEGIN_SRC emacs-lisp
-(require 'neotree)
-(setq neo-vc-integration '(face))
-(evil-define-key 'normal neotree-mode-map (kbd "TAB") 'neotree-enter)
-(evil-define-key 'normal neotree-mode-map (kbd "SPC") 'neotree-quick-look)
-(evil-define-key 'normal neotree-mode-map (kbd "q") 'neotree-hide)
-(evil-define-key 'normal neotree-mode-map (kbd "RET") 'neotree-enter)
-(evil-define-key 'normal neotree-mode-map (kbd "g") 'neotree-refresh)
-(evil-define-key 'normal neotree-mode-map (kbd "n") 'neotree-next-line)
-(evil-define-key 'normal neotree-mode-map (kbd "p") 'neotree-previous-line)
-(evil-define-key 'normal neotree-mode-map (kbd "A") 'neotree-stretch-toggle)
-(evil-define-key 'normal neotree-mode-map (kbd "H") 'neotree-hidden-file-toggle)
-(evil-define-key 'normal neotree-mode-map (kbd "|") 'neotree-enter-vertical-split)
-(evil-define-key 'normal neotree-mode-map (kbd "S") 'neotree-enter-vertical-split)
-(evil-define-key 'normal neotree-mode-map (kbd "/") 'neotree-enter-horizontal-split)
-(evil-define-key 'normal neotree-mode-map (kbd "s") 'neotree-enter-horizontal-split)
+  (require 'neotree)
+  (setq neo-vc-integration '(face))
+  (evil-define-key 'normal neotree-mode-map (kbd "TAB") 'neotree-enter)
+  (evil-define-key 'normal neotree-mode-map (kbd "SPC") 'neotree-quick-look)
+  (evil-define-key 'normal neotree-mode-map (kbd "q") 'neotree-hide)
+  (evil-define-key 'normal neotree-mode-map (kbd "RET") 'neotree-enter)
+  (evil-define-key 'normal neotree-mode-map (kbd "g") 'neotree-refresh)
+  (evil-define-key 'normal neotree-mode-map (kbd "n") 'neotree-next-line)
+  (evil-define-key 'normal neotree-mode-map (kbd "p") 'neotree-previous-line)
+  (evil-define-key 'normal neotree-mode-map (kbd "A") 'neotree-stretch-toggle)
+  (evil-define-key 'normal neotree-mode-map (kbd "H") 'neotree-hidden-file-toggle)
+  (evil-define-key 'normal neotree-mode-map (kbd "|") 'neotree-enter-vertical-split)
+  (evil-define-key 'normal neotree-mode-map (kbd "S") 'neotree-enter-vertical-split)
+  (evil-define-key 'normal neotree-mode-map (kbd "/") 'neotree-enter-horizontal-split)
+  (evil-define-key 'normal neotree-mode-map (kbd "s") 'neotree-enter-horizontal-split)
 #+END_SRC
 
 *** Helm, projectile
@@ -391,13 +393,24 @@
 ;; (require 'color-identifiers-mode)
 ;; (global-color-identifiers-mode)
 
-;; (require 'rainbow-delimiters)
-;; (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
+(require 'rainbow-delimiters)
+(add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
 #+END_SRC
 
 *** C default style
 #+BEGIN_SRC emacs-lisp
-(setq c-default-style "bsd")
+  (c-add-style "openbsd"
+			   '("bsd"
+				 (c-backspace-function . delete-backward-char)
+				 (c-syntactic-indentation-in-macros . nil)
+				 (c-tab-always-indent . nil)
+				 (c-hanging-braces-alist
+				  (block-close . c-snug-do-while))
+				 (c-offsets-alist
+				  (arglist-cont-nonempty . *)
+				  (statement-cont . *))
+				 (indent-tabs-mode . t)))
+  (setq c-default-style "openbsd")
 #+END_SRC
 
 *** Autopair
@@ -523,10 +536,10 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
 	(quote
 	("ansi-term" "*ansi-term*"
 	(lambda nil
-	(vterm)))))
+	(ansi-term shell-pop-term-shell)))))
 
-;; (setq shell-pop-term-shell "/usr/local/bin/zsh")
-(add-to-list 'evil-emacs-state-modes 'term-mode)
+(setq shell-pop-term-shell "/usr/local/bin/zsh")
+(add-to-list 'evil-emacs-state-modes 'ansi-term-mode)
 #+END_SRC
 
 *** org-superstar
@@ -634,7 +647,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
   ;; References whose filenames are under this project
   (setq company-transformers nil company-lsp-async t company-lsp-cache-candidates nil)
   (setq ccls-sem-highlight-method 'font-lock)
-  (ccls-use-default-rainbow-sem-highlight)
+  ;; (ccls-use-default-rainbow-sem-highlight)
 #+END_SRC
 
 ** Compilation
@@ -689,6 +702,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
 #+BEGIN_SRC emacs-lisp
 (global-set-key [f1] 'shell-pop)
 (global-set-key [f2] 'neotree-toggle)
+(global-set-key [f3] 'flymake-show-diagnostics-buffer)
 (global-set-key [f4] 'helm-make-projectile)
 (global-set-key [f5] 'undo-tree-visualize)
 (global-set-key (kbd "C-x d") 'dired)