oibot/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Install treesit-auto and swift-ts-mode

Browse source
This commit is contained in:
Tobias Ostner 2024-05-18 16:18:16 +02:00
parent 06057261fb
commit 002d02dc65
3 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
nix/config/emacs/init.el
View file

@ -164,6 +164,7 @@
(setq eglot-autoshutdown t (setq eglot-autoshutdown t
eglot-send-idle-time 0.1) eglot-send-idle-time 0.1)
(add-to-list 'eglot-server-programs '(swift-mode . ("xcrun" "sourcekit-lsp"))) (add-to-list 'eglot-server-programs '(swift-mode . ("xcrun" "sourcekit-lsp")))
(add-to-list 'eglot-server-programs '(swift-ts-mode . ("xcrun" "sourcekit-lsp")))
(add-to-list 'eglot-server-programs '(nix-mode . ("rnix-lsp")))) (add-to-list 'eglot-server-programs '(nix-mode . ("rnix-lsp"))))
(use-package emacs (use-package emacs
@ -548,10 +549,10 @@
swift-mode:basic-offset 2 swift-mode:basic-offset 2
swift-mode:repl-executable "xcrun swift repl")) swift-mode:repl-executable "xcrun swift repl"))
;; (use-package swift-ts-mode (use-package swift-ts-mode
;; :hook (swift-mode . subword-mode) :config
;; :config (setq swift-ts-mode-indent-offset 2)
;; (setq swift-ts-mode 2)) (add-hook 'swift-ts-mode-hook #'subword-mode))
(use-package tab-bar (use-package tab-bar
:config :config
@ -566,19 +567,18 @@
(use-package terraform-mode) (use-package terraform-mode)
;; (use-package treesit-auto (use-package treesit-auto
;; :custom :custom
;; (treesit-auto-install 'prompt) (treesit-auto-install 'prompt)
;; :config :config
;; (add-to-list 'treesit-auto-recipe-list (add-to-list 'treesit-auto-recipe-list
;; (make-treesit-auto-recipe (make-treesit-auto-recipe
;; :lang 'swift :lang 'swift
;; :ts-mode 'swift-ts-mode :ts-mode 'swift-ts-mode
;; :remap '(swift-mode) :remap '(swift-mode)
;; :ext "\\.swift\\'")) :ext "\\.swift\\'"))
;; (setq treesit-auto-langs '(swift)) (setq treesit-auto-langs '(swift))
;; (treesit-auto-add-to-auto-mode-alist 'all) (global-treesit-auto-mode))
;; (global-treesit-auto-mode))
(use-package yaml-mode) (use-package yaml-mode)

BIN
nix/config/emacs/tree-sitter/libtree-sitter-swift.dylib Executable file
View file

Binary file not shown.

12
nix/module/home-manager.nix
View file

@ -1,5 +1,6 @@
{pkgs, ...}: { {pkgs, ...}: {
home.file.".emacs.d/early-init.el".source = ../config/emacs/early-init.el; home.file.".emacs.d/early-init.el".source = ../config/emacs/early-init.el;
home.file.".emacs.d/tree-sitter/libtree-sitter-swift.dylib".source = ../config/emacs/tree-sitter/libtree-sitter-swift.dylib;
home.packages = with pkgs; [ home.packages = with pkgs; [
bottom bottom
@ -92,8 +93,19 @@
smartparens smartparens
so-long so-long
swift-mode swift-mode
(trivialBuild {
pname = "swift-ts-mode";
version = "main-05-17-2024";
src = pkgs.fetchFromGitHub {
owner = "rechsteiner";
repo = "swift-ts-mode";
rev = "main";
hash = "sha256-OrJN33iaY/7IE7bRVw2i1xnnUfc3iznxeAFcxlibx5Q=";
};
})
super-save super-save
terraform-mode terraform-mode
treesit-auto
yaml-mode yaml-mode
vterm vterm
fontaine fontaine