From f81fb6d3fe607a08eb3a8adcdb329f7dc0ddee79 Mon Sep 17 00:00:00 2001
From: Fabio Scotto di Santolo <fabio.scottodisantolo@gmail.com>
Date: Thu, 25 Dec 2025 09:54:19 +0100
Subject: [PATCH] Added YAML and Dockerfile treesitter grammar

---
 emacs/.emacs.d/init.el                  |  2 ++
 emacs/.emacs.d/lisp/core/keybindings.el |  1 +
 emacs/.emacs.d/lisp/lang/docker.el      |  8 ++++++++
 emacs/.emacs.d/lisp/lang/golang.el      | 19 +------------------
 emacs/.emacs.d/lisp/lang/yaml.el        |  8 ++++++++
 emacs/.emacs.d/lisp/tools/treesitter.el | 12 ++++++++----
 6 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 emacs/.emacs.d/lisp/lang/docker.el
 create mode 100644 emacs/.emacs.d/lisp/lang/yaml.el

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 70ec0dc..e27c5cf 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -43,8 +43,10 @@
 
  ;; Languages
  'lang/c
+ 'lang/docker
  'lang/golang
  'lang/shell
+ 'lang/yaml
 
  ;; Misc
  'misc/custom-functions
diff --git a/emacs/.emacs.d/lisp/core/keybindings.el b/emacs/.emacs.d/lisp/core/keybindings.el
index f8a4ac5..d4d7145 100644
--- a/emacs/.emacs.d/lisp/core/keybindings.el
+++ b/emacs/.emacs.d/lisp/core/keybindings.el
@@ -3,6 +3,7 @@
 ;;;; Global / Core
 
 (global-set-key (kbd "C-x C-b") #'ibuffer)
+(global-set-key (kbd "C-<return>") 'company-complete)
 
 (defvar fscotto/leader-map (make-sparse-keymap)
   "Keymap per comandi sotto C-c.")
diff --git a/emacs/.emacs.d/lisp/lang/docker.el b/emacs/.emacs.d/lisp/lang/docker.el
new file mode 100644
index 0000000..42b7c98
--- /dev/null
+++ b/emacs/.emacs.d/lisp/lang/docker.el
@@ -0,0 +1,8 @@
+;;; docker.el -*- lexical-binding: t; -*-
+
+(use-package dockerfile-mode
+  :ensure t)
+
+(provide 'docker)
+
+;;; docker.el ends here
diff --git a/emacs/.emacs.d/lisp/lang/golang.el b/emacs/.emacs.d/lisp/lang/golang.el
index 2e6c663..9fddffd 100644
--- a/emacs/.emacs.d/lisp/lang/golang.el
+++ b/emacs/.emacs.d/lisp/lang/golang.el
@@ -7,24 +7,7 @@
   :mode "\\.go\\'"
   :hook
   ((go-ts-mode . lsp-deferred)
-   (go-ts-mode . fscotto/go-format-on-save))
-  :config
-  ;; Go project commands
-  ;; Modules
-  (define-key go-ts-mode-map (kbd "C-c m t") #'fscotto/go-mod-tidy)
-  (define-key go-ts-mode-map (kbd "C-c m d") #'fscotto/go-mod-download)
-  ;; Test
-  (define-key go-ts-mode-map (kbd "C-c t p") #'fscotto/go-test-package)
-  (define-key go-ts-mode-map (kbd "C-c t a") #'fscotto/go-test-module)
-  (define-key go-ts-mode-map (kbd "C-c t t") #'fscotto/go-test-current-test)
-  ;; Debug tests
-  (define-key go-ts-mode-map (kbd "C-c d t") #'dap-debug)
-  (define-key go-ts-mode-map (kbd "C-c d T")
-              (lambda ()
-                (interactive)
-                (dap-debug
-                 (dap--debug-configuration
-                  "Go :: Debug test at point")))))
+   (go-ts-mode . fscotto/go-format-on-save)))
 
 (use-package go-mod-ts-mode
   :ensure nil
diff --git a/emacs/.emacs.d/lisp/lang/yaml.el b/emacs/.emacs.d/lisp/lang/yaml.el
new file mode 100644
index 0000000..35f3f5a
--- /dev/null
+++ b/emacs/.emacs.d/lisp/lang/yaml.el
@@ -0,0 +1,8 @@
+;;; yaml.el -*- lexical-binding: t; -*-
+
+(use-package yaml-mode
+  :ensure t)
+
+(provide 'yaml)
+
+;;; yaml.el ends here
diff --git a/emacs/.emacs.d/lisp/tools/treesitter.el b/emacs/.emacs.d/lisp/tools/treesitter.el
index 2da6872..837b2ee 100644
--- a/emacs/.emacs.d/lisp/tools/treesitter.el
+++ b/emacs/.emacs.d/lisp/tools/treesitter.el
@@ -13,12 +13,16 @@
           (python-mode . python-ts-mode)
           (sh-mode . bash-ts-mode)))
   (setq treesit-language-source-alist
-	'((c "https://github.com/tree-sitter/tree-sitter-c")
+	'((bash "https://github.com/tree-sitter/tree-sitter-bash")
+	  (c "https://github.com/tree-sitter/tree-sitter-c")
           (cpp "https://github.com/tree-sitter/tree-sitter-cpp")
-          (python "https://github.com/tree-sitter/tree-sitter-python")
-          (bash "https://github.com/tree-sitter/tree-sitter-bash")
+	  (dockerfile "https://github.com/camdencheek/tree-sitter-dockerfile")
           (go "https://github.com/tree-sitter/tree-sitter-go")
-	  (gomod "https://github.com/camdencheek/tree-sitter-go-mod"))))
+	  (gomod "https://github.com/camdencheek/tree-sitter-go-mod")
+	  (js "https://github.com/tree-sitter/tree-sitter-javascript")
+	  (json "https://github.com/tree-sitter/tree-sitter-json")
+	  (node "https://github.com/tree-sitter/node-tree-sitter")
+	  (python "https://github.com/tree-sitter/tree-sitter-python"))))
 
 (provide 'treesitter)