suicide

.emacs.d/init.el

@@ -17,43 +17,22 @@
 (use-package all-the-icons :ensure t :if (display-graphic-p))
 (use-package elcord :ensure t :config (elcord-mode 1))
 
-(load-theme 'doom-gruvbox t)
+(load-theme 'doom-ir-black t)
 
 (set-frame-parameter (selected-frame) 'alpha '(90 . 90))
 (add-to-list 'default-frame-alist '(alpha . (90 . 90)))
 
-(set-face-attribute 'default nil :family "Fira Code" :height 130)
-
-(custom-set-faces
- '(mode-line ((t (:inherit mode-line :background "#3c3836" :foreground "#ebdbb2"))))
- '(mode-line-inactive ((t (:inherit mode-line-inactive :background "#282828" :foreground "#a89984")))))
-
+(set-face-attribute 'default nil :family "Departure Mono" :height 130)
 
 (setq backup-directory-alist
       `((".*" . "~/.local/tmp/emacsbackup/")))
 (setq make-backup-files t)
 (setq backup-by-copying t)
 
-(use-package evil
-  :ensure t
-  :init
-  (setq evil-want-keybinding nil)
-  (setq evil-want-C-u-scroll t)
-  :config
-  (evil-mode 1))
-
-(use-package evil-collection
-  :after evil
-  :ensure t
-  :config
-  (evil-collection-init))
-
 (use-package neotree :ensure t :bind ("<f9>" . neotree-toggle))
 
 (use-package vertico
   :ensure t
-  :init
-  (evil-collection-vertico-setup)
   :config
   (vertico-mode 1))
 
@@ -61,22 +40,10 @@
 
 (use-package consult
   :ensure t
-  :bind (("C-s" . consult-line) ("C-x b" . consult-buffer))
-  :init
-  (evil-collection-consult-setup))
+  :bind (("C-s" . consult-line) ("C-x b" . consult-buffer)))
 
 (use-package which-key :ensure t :config (which-key-mode 1))
 
-(use-package evil-surround
-  :ensure t
-  :config
-  (global-evil-surround-mode 1))
-
-(use-package evil-commentary
-  :ensure t
-  :config
-  (evil-commentary-mode))
-
 (use-package company :ensure t :hook (prog-mode . company-mode))
 (use-package yasnippet :ensure t :hook (prog-mode . yas-minor-mode))
 (use-package flycheck :ensure t :hook (prog-mode . flycheck-mode))
@@ -93,6 +60,7 @@
   :config (require 'lsp-java-boot))
 
 (global-set-key (kbd "C-c t") 'ansi-term)
+(global-set-key (kbd "C-s") 'swiper)
 
 (use-package web-mode
   :ensure t
@@ -126,14 +94,77 @@
 (use-package typescript-mode :ensure t :mode "\\.ts\\'")
 (use-package toml-mode :ensure t :mode "\\.toml\\'")
 (use-package yaml-mode :ensure t :mode "\\.ya?ml\\'")
+(use-package tuareg
+  :ensure t
+  :mode ("\\.ml\\'" "\\.mli\\'")
+  :hook (tuareg-mode . merlin-mode))
+
+(use-package merlin
+  :ensure t
+  :hook ((tuareg-mode caml-mode) . merlin-mode)
+  :config
+  (setq merlin-command 'opam))
+
+(use-package merlin-eldoc
+  :ensure t
+  :hook (merlin-mode . merlin-eldoc-setup))
+
+(use-package utop
+  :ensure t
+  :hook (tuareg-mode . utop-minor-mode)
+  :config
+  (setq utop-command "utop -emacs"))
+
+(use-package ocamlformat
+  :ensure t
+  :hook (tuareg-mode . ocamlformat-setup-indent)
+  :custom
+  (ocamlformat-enable 'enable-outside-detected-project))
+
+
+(use-package doom-modeline
+  :ensure t
+  :init
+  (setq doom-modeline-height 25)
+  (setq doom-modeline-bar-width 3)
+  (setq doom-modeline-buffer-file-name-style 'truncate-with-project)
+  (setq doom-modeline-icon t)
+  (setq doom-modeline-major-mode-icon t)
+  (setq doom-modeline-enable-word-count t)
+  (setq doom-modeline-vcs-max-length 12)
+  (setq doom-modeline-mode-icon nil)
+  (setq doom-modeline-minor-modes nil)
+  :config
+  (doom-modeline-mode 1)
+  (set-face-attribute 'mode-line nil
+                      :background "#000000"
+                      :foreground "#ffffff"
+                      :box nil)
+  (set-face-attribute 'mode-line-inactive nil
+                      :background "#111111"
+                      :foreground "#888888"
+                      :box nil))
 
 (custom-set-variables
+ ;; custom-set-variables 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.
+ '(custom-safe-themes
+   '("014cb63097fc7dbda3edf53eb09802237961cbb4c9e9abd705f23b86511b0a69"
+     "c5801b68568b59976a8e58104c40c9b052d46cca72e367c2e43c1f36a9e79abb"
+     default))
  '(package-selected-packages
-    '(all-the-icons company consult doom-modeline
-      doom-themes elcord emmet-mode fennel-mode flycheck
-      go-mode lsp-java lsp-ui lua-mode
-      macrostep marginalia neotree nix-mode rainbow-mode
-      rust-mode swiper toml-mode
-      typescript-mode vertico web-mode yaml-mode
-      yasnippet zig-mode evil evil-collection evil-surround evil-commentary)))
-(custom-set-faces)
+   '(all-the-icons company consult doom-modeline doom-themes elcord
+		   emmet-mode fennel-mode flycheck go-mode lsp-java
+		   lsp-ui lua-mode macrostep marginalia merlin
+		   merlin-eldoc nano-modeline neotree nix-mode
+		   ocaml-eglot ocamlformat rainbow-mode rust-mode
+		   swiper toml-mode tuareg typescript-mode utop
+		   vertico web-mode yaml-mode yasnippet zig-mode)))
+(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.
+ )