From 7e82dc0641e96efdfb7d2b22606f07f4ce147f8c Mon Sep 17 00:00:00 2001 From: CRy386i Date: Wed, 12 Feb 2025 16:26:48 +0200 Subject: [PATCH] update --- init.el | 56 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/init.el b/init.el index fb92725..84da45c 100644 --- a/init.el +++ b/init.el @@ -59,26 +59,34 @@ ;; Settings the smooth croll (setq scroll-margin 5 - scroll-step 1 - scroll-conservatively 10000 - scroll-preserve-screen-position 1) - + scroll-step 1 + scroll-conservatively 10000 + scroll-preserve-screen-position 1) + ;; Set backup behiviour (setq backup-by-copying t ; don't clobber symlinks backup-directory-alist '(("." . "~/.saves/")) ; don't litter my fs tree - delete-old-versions t + delete-old-versions t kept-new-versions 6 kept-old-versions 2 version-control t) ; use versioned backups - - ;; Settings keymap + + ;; Setting up unicode + (setq set-language-environment "UTF-8" + selection-coding-system 'utf-8-unix + prefer-coding-system 'utf-8-unix + set-buffer-file-coding-system 'utf-8-unix + universal-coding-system-argument 'utf-8-unix + revert-buffer-with-coding-system 'utf-8-unix) + + ;; Settings keymap :bind (("C-x t " . tab-bar-switch-to-next-tab) ("C-x t " . tab-bar-switch-to-prev-tab) ("C-x C-g" . recentf-open-files) - ("C-q" . mark-word) - ("C-x w" . downcase-word) + ("C-q" . mark-word) + ("C-x w" . downcase-word) ("C-," . shrink-window-horizontally) ("C-." . enlarge-window-horizontally) ("C-c M-c" . uncomment-region))) @@ -275,10 +283,27 @@ orderless-style-dispatchers (list #'+orderless-consult-dispatch #'orderless-affix-dispatch))) +(use-package magit + :ensure t + :bind(("C-c g" . magit-dispatch) + ("C-c f". magit-file-dispatch))) + +(use-package d-mode + :ensure t) + +(use-package sdlang-mode + :ensure t) + (use-package glsl-mode :ensure t) (use-package company-glsl + :ensure t + :config + (when (executable-find "glslangValidator") + (add-to-list 'company-backends 'company-glsl))) + +(use-package company-dcd :ensure t) (use-package company @@ -287,7 +312,7 @@ :hook ((c-mode . company-mode) (glsl-mode . company-mode) - (d-mode . company-mode)) + (d-mode . company-dcd-mode)) :custom (company-idle-delay 0.01)) @@ -296,6 +321,10 @@ :ensure t :init (global-flycheck-mode)) +(use-package flycheck-dmd-dub + :ensure t + :hook (d-mode . flycheck-dmd-dub-set-variables)) + ;; (use-package flycheck-eglot ;; :ensure t ;; :after (flycheck eglot)) @@ -321,9 +350,8 @@ :ensure t :init :bind(("C-S-c C-S-c" . mc/edit-lines) - ("C->" . mc/mark-next-like-this) - ("C-<" . mc/mark-previous-like-this) - ("C-S-c C-<" . mc/mark-previous-like-this-word))) + ("C-S-c >" . mc/mark-next-like-this) + ("C-S-c <" . mc/mark-previous-like-this))) (use-package json-mode :custom (js-indent-line 4)) @@ -345,7 +373,7 @@ '(inhibit-startup-screen t) '(menu-bar-mode nil) '(package-selected-packages - '(company-glsl glsl-mode multiple-cursors markdown-mode d-mode flycheck tree-sitter-langs tree-sitter company consult orderless vertico gruvbox-theme)) + '(sdlang-mode company-dcd flycheck-dmd-dub magit company-glsl glsl-mode multiple-cursors markdown-mode d-mode flycheck tree-sitter-langs tree-sitter company consult orderless vertico gruvbox-theme)) '(recentf-mode t) '(tab-bar-mode t) '(tab-stop-list nil)