From 3931697c1000a74c6a3b7163d51eba7bef53be30 Mon Sep 17 00:00:00 2001
From: horhik <horhik@tuta.io>
Date: Mon, 12 Oct 2020 11:02:45 +0300
Subject: [PATCH] add doom emacs

---
 home/emacs/.doom.d/config.el          | 20 ++++++-
 home/emacs/.doom.d/custom.el          | 38 +++++++++++++-
 home/emacs/.doom.d/flycheck_config.el | 75 ---------------------------
 home/emacs/.doom.d/init.el            | 11 +++-
 home/emacs/.emacs.d                   |  1 -
 5 files changed, 64 insertions(+), 81 deletions(-)
 delete mode 100644 home/emacs/.doom.d/flycheck_config.el
 delete mode 160000 home/emacs/.emacs.d

diff --git a/home/emacs/.doom.d/config.el b/home/emacs/.doom.d/config.el
index 6d836a4..a0cc206 100644
--- a/home/emacs/.doom.d/config.el
+++ b/home/emacs/.doom.d/config.el
@@ -69,7 +69,25 @@
 
 (custom-set-faces
 '(neo-dir-link-face ((t (:family "Mononoki Nerd Font" :size 12 :weight regular))))
-'(neo-file-link-face ((t (:family "Mononoki Nerd Font" :size 12 :weight regular)))))
+'(neo-file-link-face ((t (:family "Mononoki Nerd Font" :size 12 :weight regular))))
+'(default ((t ( :family "Mononoki Nerd Font" :size 12 :weight regular))))
+)
 
 (global-set-key  (kbd "C-c C-o") 'neotree-toggle)
 (setq neo-theme 'icons)
+
+(add-hook 'rust-mode-hook #'racer-mode)
+(add-hook 'racer-mode-hook #'eldoc-mode)
+
+
+(add-hook 'racer-mode-hook #'company-mode)
+
+(require 'rust-mode)
+(define-key rust-mode-map (kbd "TAB") #'company-indent-or-complete-common)
+(setq company-tooltip-align-annotations t)
+
+(use-package flycheck
+  :ensure t
+  :init (global-flycheck-mode))
+(use-package rustic)
+(setq lsp-rust-server `rustic)
diff --git a/home/emacs/.doom.d/custom.el b/home/emacs/.doom.d/custom.el
index 559cb1a..e09264f 100644
--- a/home/emacs/.doom.d/custom.el
+++ b/home/emacs/.doom.d/custom.el
@@ -3,10 +3,44 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(package-selected-packages '(gruvbox-theme neotree racer rust-mode)))
+ '(custom-enabled-themes '(gruvbox-dark-medium))
+ '(custom-safe-themes
+   '("aded61687237d1dff6325edb492bde536f40b048eab7246c61d5c6643c696b7f" "76bfa9318742342233d8b0b42e824130b3a50dcc732866ff8e47366aed69de11" "4cf9ed30ea575fb0ca3cff6ef34b1b87192965245776afa9e9e20c17d115f3fb" "8d7684de9abb5a770fbfd72a14506d6b4add9a7d30942c6285f020d41d76e0fa" default))
+ '(fci-rule-color "#7c6f64")
+ '(jdee-db-active-breakpoint-face-colors (cons "#0d1011" "#fabd2f"))
+ '(jdee-db-requested-breakpoint-face-colors (cons "#0d1011" "#b8bb26"))
+ '(jdee-db-spec-breakpoint-face-colors (cons "#0d1011" "#928374"))
+ '(objed-cursor-color "#fb4934")
+ '(package-selected-packages
+   '(lsp-mode rustic company racer gruvbox-theme neotree rust-mode))
+ '(rustic-ansi-faces
+   ["#282828" "#fb4934" "#b8bb26" "#fabd2f" "#83a598" "#cc241d" "#8ec07c" "#ebdbb2"])
+ '(vc-annotate-background "#282828")
+ '(vc-annotate-color-map
+   (list
+    (cons 20 "#b8bb26")
+    (cons 40 "#cebb29")
+    (cons 60 "#e3bc2c")
+    (cons 80 "#fabd2f")
+    (cons 100 "#fba827")
+    (cons 120 "#fc9420")
+    (cons 140 "#fe8019")
+    (cons 160 "#ed611a")
+    (cons 180 "#dc421b")
+    (cons 200 "#cc241d")
+    (cons 220 "#db3024")
+    (cons 240 "#eb3c2c")
+    (cons 260 "#fb4934")
+    (cons 280 "#e05744")
+    (cons 300 "#c66554")
+    (cons 320 "#ac7464")
+    (cons 340 "#7c6f64")
+    (cons 360 "#7c6f64")))
+ '(vc-annotate-very-old-color nil))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- )
+ '(neo-dir-link-face ((t (:family "Mononoki Nerd Font" :size 12 :weight regular))))
+ '(neo-file-link-face ((t (:family "Mononoki Nerd Font" :size 12 :weight regular)))))
diff --git a/home/emacs/.doom.d/flycheck_config.el b/home/emacs/.doom.d/flycheck_config.el
deleted file mode 100644
index 6d836a4..0000000
--- a/home/emacs/.doom.d/flycheck_config.el
+++ /dev/null
@@ -1,75 +0,0 @@
-;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
-
-;; Place your private configuration here! Remember, you do not need to run 'doom
-;; sync' after modifying this file!
-
-
-;; Some functionality uses this to identify you, e.g. GPG configuration, email
-;; clients, file templates and snippets.
-(setq user-full-name "John Doe"
-      user-mail-address "john@doe.com")
-
-;; Doom exposes five (optional) variables for controlling fonts in Doom. Here
-;; are the three important ones:
-;;
-;; + `doom-font'
-;; + `doom-variable-pitch-font'
-;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for
-;;   presentations or streaming.
-;;
-;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
-;; font string. You generally only need these two:
-;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light)
-;;       doom-variable-pitch-font (font-spec :family "sans" :size 13))
-
-;; There are two ways to load a theme. Both assume the theme is installed and
-;; available. You can either set `doom-theme' or manually load a theme with the
-;; `load-theme' function. This is the default:
-(setq doom-theme 'doom-one)
-
-;; If you use `org' and don't want your org files in the default location below,
-;; change `org-directory'. It must be set before org loads!
-(setq org-directory "~/org/")
-
-;; This determines the style of line numbers in effect. If set to `nil', line
-;; numbers are disabled. For relative line numbers, set this to `relative'.
-(setq display-line-numbers-type t)
-
-
-;; Here are some additional functions/macros that could help you configure Doom:
-;;
-;; - `load!' for loading external *.el files relative to this one
-;; - `use-package!' for configuring packages
-;; - `after!' for running code after a package has loaded
-;; - `add-load-path!' for adding directories to the `load-path', relative to
-;;   this file. Emacs searches the `load-path' when you load packages with
-;;   `require' or `use-package'.
-;; - `map!' for binding new keys
-;;
-;; To get information about any of these functions/macros, move the cursor over
-;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
-;; This will open documentation for it, including demos of how they are used.
-;;
-;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
-;; they are implemented.
-
-(require 'rust-mode)
-
-
-
-
-;; Rust
-(add-hook 'rust-mode-hook
-          (lambda () (setq indent-tabs-mode nil)))
-
-(setq rust-format-on-save t)
-
-(define-key rust-mode-map (kbd "C-c C-c") 'rust-run)
-
-
-(custom-set-faces
-'(neo-dir-link-face ((t (:family "Mononoki Nerd Font" :size 12 :weight regular))))
-'(neo-file-link-face ((t (:family "Mononoki Nerd Font" :size 12 :weight regular)))))
-
-(global-set-key  (kbd "C-c C-o") 'neotree-toggle)
-(setq neo-theme 'icons)
diff --git a/home/emacs/.doom.d/init.el b/home/emacs/.doom.d/init.el
index d013990..4a40a67 100644
--- a/home/emacs/.doom.d/init.el
+++ b/home/emacs/.doom.d/init.el
@@ -186,6 +186,13 @@
 (require 'package)
 (add-to-list 'package-archives
              '("melpa" . "https://melpa.org/packages/") t)
-(package-initialize)
-(package-refresh-contents)
 
+(require 'package)
+(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
+
+(require 'package)
+(add-to-list 'package-archives
+             '("MELPA Stable" . "https://stable.melpa.org/packages/") t)
+
+(package-initialize)
+;;(package-refresh-contents)
diff --git a/home/emacs/.emacs.d b/home/emacs/.emacs.d
deleted file mode 160000
index d807a75..0000000
--- a/home/emacs/.emacs.d
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d807a7513dac86dda5ff02f0297912d082b09ae2