diff --git a/config/.config/nvim/lua/config/set.lua b/config/.config/nvim/lua/config/set.lua index 19b55cd..b4390be 100644 --- a/config/.config/nvim/lua/config/set.lua +++ b/config/.config/nvim/lua/config/set.lua @@ -44,7 +44,7 @@ vim.g.mapleader = ' ' vim.g.neovide_scale_factor = 1.0 vim.g.neovide_theme = 'auto' -vim.g.neovide_transparency = 1.0 +vim.g.neovide_opacity = 1.0 function ChangeScaleFactor(delta) vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * delta end @@ -56,7 +56,7 @@ vim.keymap.set('n', '', function() ChangeScaleFactor(1 / 1.25) end) -vim.opt.guifont = { 'Iosevka Term SS12', ':h12' } +vim.opt.guifont = { 'Iosevka Term SS12', ':h14' } vim.opt.termguicolors = true vim.g.netrw_keepdir = 0 diff --git a/config/.emacs.d/plugins/lang.el b/config/.emacs.d/plugins/lang.el index b3b2d8f..4db17ce 100644 --- a/config/.emacs.d/plugins/lang.el +++ b/config/.emacs.d/plugins/lang.el @@ -45,6 +45,19 @@ :defer t :straight '(:type git :host codeberg :repo "meow_king/zig-ts-mode")) +(use-package haskell-ts-mode + :ensure t + :custom + (haskell-ts-font-lock-level 4) + (haskell-ts-use-indent t) + (haskell-ts-ghci "ghci") + (haskell-ts-use-indent t) + :config + (add-to-list 'treesit-language-source-alist + '(haskell . ("https://github.com/tree-sitter/tree-sitter-haskell" "v0.23.1")))) + ;; (unless (treesit-grammar-location 'haskell) + ;; (treesit-install-language-grammar 'haskell))) + (use-package eglot-x :ensure t :defer t @@ -69,7 +82,9 @@ (with-eval-after-load 'eglot (add-to-list 'eglot-server-programs - '(zig-ts-mode . ("zls")))) + '(zig-ts-mode . ("zls"))) + (add-to-list 'eglot-server-programs + '(haskell-ts-mode . ("haskell-language-server-wrapper" "--lsp")))) (add-to-list 'auto-mode-alist '("\\.odin\\'" . odin-ts-mode)) (add-to-list 'auto-mode-alist '("\\.zig\\(?:\\.zon\\)?\\'" . zig-ts-mode)) diff --git a/config/.emacs.d/plugins/themes.el b/config/.emacs.d/plugins/themes.el index 05d9da4..38ece98 100644 --- a/config/.emacs.d/plugins/themes.el +++ b/config/.emacs.d/plugins/themes.el @@ -49,7 +49,7 @@ :defer t :init ;; Configure themes - (setq auto-dark-themes '((doom-gruvbox) (doom-gruvbox-light))) + (setq auto-dark-themes '((kaolin-dark) (kaolin-light))) ;; Disable doom's theme loading mechanism (just to make sure) ;; (setq! doom-theme nil) ;; Declare that all themes are safe to load.