Clean up emacs configuration

2 files changed, 29 insertions, 12 deletions

diff --git a/emacs/.emacs.d/drobillized-theme.el b/emacs/.emacs.d/drobillized-theme.el
index 327a5a8..9f677ce 100644
--- a/emacs/.emacs.d/drobillized-theme.el
+++ b/emacs/.emacs.d/drobillized-theme.el
@@ -223,8 +223,7 @@ Reload the theme after changing anything in this group."
  `(rainbow-delimiters-depth-9-face ((t (:inherit rainbow-delimiters-base-face :foreground "#536171"))))
  `(region ((t (:background "#152900"))))
  `(secondary-selection ((t (:background "#344E00"))))
- `(smerge-refined-change ((t (:background "grey10"))) t)
- `(smerge-refined-changed ((t (:background "grey10"))))
+ `(smerge-refined-changed ((t (:background "grey20"))))
  `(smerge-refined-removed ((t (:inherit smerge-refined-change :foreground ,red))))
  `(smerge-base ((t (:foreground ,green))) t)
  `(smerge-lower ((t (:foreground ,orange))) t)
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index c3b75e4..20e9b49 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -43,6 +43,7 @@
              "")))))
 
 (defun clang-format-c-mode-hook ()
+  "Load C family configuration from clang-format configuration."
   (let* ((clang-format-config
           (shell-command-to-string "clang-format -dump-config"))
          (c-offset (get-clang-format-option clang-format-config "IndentWidth" t))
@@ -75,7 +76,6 @@
 ;;; Packages
 
 (require 'package)
-;; (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
 (add-to-list 'package-archives '("melpa" . "https://stable.melpa.org/packages/"))
 (package-initialize)
 (unless (package-installed-p 'use-package)
@@ -85,37 +85,53 @@
 
 (setq use-package-always-ensure t)
 
+;(use-package ansi-color :commands compile :after (ivy) :config (counsel-mode))
+
 (use-package clang-format
-  :commands (c-mode c++-mode objc-mode)
   :after (s)
+  :commands (clang-format-buffer clang-format-region)
   :hook (c-mode-common . clang-format-c-mode-hook))
 
 (use-package counsel :after (ivy) :config (counsel-mode))
 (use-package counsel-gtags :commands ggtags-mode)
 (use-package counsel-projectile :after (counsel projectile))
 (use-package diminish)
-;; (use-package dired-rainbow)
 (use-package flyspell :commands flyspell-mode)
 (use-package flyspell-correct-ivy :after (flyspell ivy) :commands flyspell-mode)
 (use-package ggtags :commands ggtags-mode)
 (use-package ivy :config (ivy-mode))
 (use-package dpkg-dev-el :commands debian-changelog-mode)
-(use-package magit :commands magit-status :after (diff-hl) :bind ("C-c m" . magit-status) :config (define-key magit-mode-map (kbd "C-<tab>") nil))
+
+;; (use-package lsp-mode
+;;   :config
+;;   (progn
+;;     (setq lsp-clients-clangd-args '("-j=4" "-background-index" "-log=error"))
+;;     (lsp-register-client
+;;      (make-lsp-client :new-connection (lsp-tramp-connection "clangd")
+;;                       :major-modes '(c-mode c++-mode)
+;;                       :remote? t
+;;                       :server-id 'clangd-remote))))
+
+(use-package magit
+  :commands magit-status
+  :after (diff-hl)
+  :bind ("C-c m" . magit-status)
+  :config (define-key magit-mode-map (kbd "C-<tab>") nil))
+
 (use-package markdown-mode :commands markdown-mode)
 (use-package pdf-tools :magic ("%PDF" . pdf-view-mode) :config (pdf-tools-install))
+(use-package prettier :commands prettier-prettify)
 (use-package projectile :config (projectile-global-mode))
 (use-package quack :commands scheme-mode)
 (use-package rainbow-delimiters :commands prog-mode)
 (use-package smart-tabs-mode :commands (c-mode c++-mode))
 (use-package spaceline)
 (use-package swiper :commands swiper)
-;; (use-package ttl-mode :commands ttl-mode)
 (use-package tramp)
 
+(require 'glsl-mode)
 (require 'spaceline-config)
-
 (require 'turtle-mode)
-(require 'glsl-mode)
 
 ;;; Basic editor configuration
 
@@ -178,6 +194,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(Man-switches "--nj")
+ '(auth-source-save-behavior nil)
  '(auto-revert-interval 1)
  '(backup-by-copying t)
  '(backup-directory-alist `((".*" \, temporary-file-directory)))
@@ -191,7 +208,7 @@
  '(cursor-in-non-selected-windows 'hollow)
  '(custom-enabled-themes '(drobillized))
  '(custom-safe-themes
-   '("34dd19be0ae289b90ea8e6f3e33d588a54b7f734f122892bcfdbb2e45acded57" default))
+   '("e934d513254f836610229c89e19a54bb83b7bf2e41ce97910511bd3f7decabe8" default))
  '(delete-old-versions t)
  '(delete-selection-mode t)
  '(dired-omit-files "^\\.?#\\|^\\.$\\|^\\.\\.\\|^\\..*$")
@@ -201,7 +218,7 @@
    '((".*\\.oftc.net" "#mesonbuild")
      (".*\\.libera.chat" "#ardour-dev" "#ingen" "#lv2" "#lobsters")))
  '(erc-autojoin-mode t)
- '(erc-insert-timestamp-function 'ks-timestamp)
+ '(erc-insert-timestamp-function 'ks-timestamp t)
  '(erc-join-buffer 'bury)
  '(erc-log-channels-directory "~/.erc/logs")
  '(erc-log-insert-log-on-open t)
@@ -275,7 +292,7 @@
  '(menu-bar-mode nil)
  '(ns-use-srgb-colorspace nil)
  '(package-selected-packages
-   '(quack vterm ace-window cython-mode groovy-mode jenkins qml-mode ninja-mode bison-mode csv-mode apache-mode auctex clang-format cmake-mode counsel-gtags counsel-projectile diff-hl diminish dired-rainbow dockerfile-mode flyspell-correct-ivy ggtags git-gutter-fringe glsl-mode ivy jinja2-mode json-mode llvm-mode magit markdown-mode meson-mode n3-mode pdf-tools pkgbuild-mode projectile rainbow-delimiters rust-mode smart-tabs-mode spaceline swift-mode ttl-mode use-package yaml-mode))
+   '(debian-el dpkg-dev-el scss-mode typescript-mode prettier vue-mode python-black quack vterm ace-window cython-mode groovy-mode jenkins qml-mode ninja-mode bison-mode csv-mode apache-mode auctex clang-format cmake-mode counsel-gtags counsel-projectile diff-hl diminish dired-rainbow dockerfile-mode flyspell-correct-ivy ggtags git-gutter-fringe glsl-mode ivy jinja2-mode json-mode llvm-mode magit markdown-mode meson-mode n3-mode pdf-tools pkgbuild-mode projectile rainbow-delimiters rust-mode smart-tabs-mode spaceline swift-mode ttl-mode use-package yaml-mode))
  '(pdf-view-midnight-colors '("#C3D1D1" . "#141414"))
  '(powerline-default-separator nil)
  '(projectile-completion-system 'ivy)
@@ -289,6 +306,7 @@
               "-"))))
  '(projectile-mode-line-prefix "P")
  '(projectile-use-git-grep t)
+ '(python-black-extra-args '("-l 79"))
  '(quack-pretty-lambda-p t)
  '(quack-run-scheme-always-prompts-p t)
  '(savehist-mode t)