From bbc78c11b28c565ea13f87edb1156b6967e898ee Mon Sep 17 00:00:00 2001
From: Andrew Guschin <guschin@altlinux.org>
Date: Wed, 4 Dec 2024 01:11:58 +0400
Subject: wip: macos configuration

---
 .gitignore |  1 +
 config.org | 61 +++++++++++++++++++++++++++++++------------------------------
 init.el    |  7 ++++++-
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab7bd05..15ccdb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,5 @@ tramp
 
 custom.el
 config.el
+projectile-bookmarks.eld
 
diff --git a/config.org b/config.org
index c417f0f..29d4a4b 100644
--- a/config.org
+++ b/config.org
@@ -54,8 +54,8 @@ several annoying things. Looks like pixel scrolling works only on macOS.
   (toggle-scroll-bar -1)
   (xterm-mouse-mode t)
   (buffer-face-mode t)
-  (pixel-scroll-precision-mode t)
-  (setq frame-resize-pixelwise t)
+  ;; (pixel-scroll-precision-mode t)
+  ;; (setq frame-resize-pixelwise t)
   (setq-default fill-column 100)
   (global-display-fill-column-indicator-mode t)
   (global-set-key (kbd "C-<wheel-up>") 'ignore)
@@ -335,34 +335,35 @@ servers (most of the time with multiple for single buffer, even).
 
 ** Tree-sitter
 #+BEGIN_SRC emacs-lisp
-    (use-package treesit
-      :ensure nil
-      :config
-      (setq-default
-       treesit-language-source-alist
-       '((tsx . ("https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src"))
-         (typescript . ("https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src"))
-         ))
-      (treesit-install-language-grammar 'tsx)
-      (treesit-install-language-grammar 'typescript)
-      )
-
-    ;; (use-package treesit-auto
-    ;;   :config
-    ;;   (add-to-list 'treesit-auto-recipe-list
-    ;;                (make-treesit-auto-recipe
-    ;;                 :lang 'tsx
-    ;;                 :ts-mode 'tsx-ts-mode
-    ;;                 :url "https://github.com/tree-sitter/tree-sitter-typescript"
-    ;;                 :source-dir "tsx/src"
-    ;;                 :ext "\\.tsx\\'"))
-    ;;   (setq treesit-auto-langs '(tsx))
-    ;;   )
-
-    ;; (use-package tree-sitter
-    ;;   :init
-    ;;   (use-package tree-sitter-langs)
-    ;;   :hook (tree-sitter-after-on . tree-sitter-hl-mode))
+  ;; (use-package treesit
+  ;;   :ensure nil
+  ;;   :config
+  ;;   (setq-default
+  ;;    treesit-language-source-alist
+  ;;    '((tsx . ("https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src"))
+  ;;      (typescript . ("https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src"))
+  ;;      ))
+  ;;   (treesit-install-language-grammar 'tsx)
+  ;;   (treesit-install-language-grammar 'typescript)
+  ;;   )
+
+  (use-package treesit-auto
+    :config
+    (add-to-list 'treesit-auto-recipe-list
+                 (make-treesit-auto-recipe
+                  :lang 'typescript
+                  :ts-mode 'tsx-ts-mode
+                  :url "https://github.com/tree-sitter/tree-sitter-typescript"
+                  :source-dir "tsx/src"
+                  :ext "\\.tsx\\'"))
+    :custom
+    (treesit-auto-langs '(tsx))
+    )
+
+  ;; (use-package tree-sitter
+  ;;   :init
+  ;;   (use-package tree-sitter-langs)
+  ;;   :hook (tree-sitter-after-on . tree-sitter-hl-mode))
 #+END_SRC
 
 ** Spelling
diff --git a/init.el b/init.el
index 0e00c6b..a9c5379 100644
--- a/init.el
+++ b/init.el
@@ -7,9 +7,14 @@
 (setq config-path (expand-file-name "config.org" user-emacs-directory))
 (setq config-untangled-path (expand-file-name "config.el" user-emacs-directory))
 
+(when (eq system-type 'gnu/linux)
+  (setq md5-cmd "md5sum --zero "))
+(when (eq system-type 'darwin)
+  (setq md5-cmd "md5 -q "))
+
 ;; Since config is residing inside one file, I can calculate its checksum and tangle config.org only
 ;; when it was changed. This way loading is significantly faster.
-(setq new-checksum (car (split-string (shell-command-to-string (concat "md5sum --zero " config-path)))))
+(setq new-checksum (car (split-string (shell-command-to-string (concat md5-cmd config-path)))))
 (setq saved-checksum "")
 (when (file-exists-p checksum-path)
   (setq saved-checksum (with-temp-buffer
-- 
cgit v1.2.3