diff --git a/init.el b/init.el index fc62fa0..fb92725 100644 --- a/init.el +++ b/init.el @@ -80,7 +80,8 @@ ("C-q" . mark-word) ("C-x w" . downcase-word) ("C-," . shrink-window-horizontally) - ("C-." . enlarge-window-horizontally))) + ("C-." . enlarge-window-horizontally) + ("C-c M-c" . uncomment-region))) ;; example configuration for Consult (use-package consult @@ -274,13 +275,23 @@ orderless-style-dispatchers (list #'+orderless-consult-dispatch #'orderless-affix-dispatch))) +(use-package glsl-mode + :ensure t) + +(use-package company-glsl + :ensure t) + (use-package company :ensure t :init (global-company-mode) - :hook (c-mode . company-mode) + :hook + ((c-mode . company-mode) + (glsl-mode . company-mode) + (d-mode . company-mode)) :custom (company-idle-delay 0.01)) + (use-package flycheck :ensure t :init (global-flycheck-mode)) @@ -316,24 +327,28 @@ (use-package json-mode :custom (js-indent-line 4)) +(setq default-tab-width 4) + (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. + '(c-basic-offset 4) + '(custom-buffer-indent 4) '(custom-enabled-themes '(gruvbox-dark-medium)) '(custom-safe-themes '("046a2b81d13afddae309930ef85d458c4f5d278a69448e5a5261a5c78598e012" "d445c7b530713eac282ecdeea07a8fa59692c83045bf84dd112dd738c7bcad1d" "ba323a013c25b355eb9a0550541573d535831c557674c8d59b9ac6aa720c21d3" "871b064b53235facde040f6bdfa28d03d9f4b966d8ce28fb1725313731a2bcc8" "7b8f5bbdc7c316ee62f271acf6bcd0e0b8a272fdffe908f8c920b0ba34871d98" default)) '(display-line-numbers t) - '(flycheck-c/c++-gcc-executable "x86_64-w64-mingw32-gcc-14") - '(flycheck-gcc-args '("-Wall" "-mwindows" "-municode")) + '(global-flycheck-mode t) '(indent-tabs-mode nil) '(inhibit-startup-screen t) '(menu-bar-mode nil) '(package-selected-packages - '(multiple-cursors markdown-mode d-mode flycheck tree-sitter-langs tree-sitter company consult orderless vertico gruvbox-theme)) + '(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) '(tab-width 4) '(tool-bar-mode nil) '(xref-show-definitions-function 'consult-xref))