From d79f8e9e1ceb45a5f7435158810b06511a76c829 Mon Sep 17 00:00:00 2001
From: eriedaberrie <eriedaberrie@gmail.com>
Date: Thu, 9 Feb 2023 11:24:03 -0800
Subject: [PATCH] Fix yasnippet org src blocks

---
 init.el | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/init.el b/init.el
index fbd2e73..de902d7 100644
--- a/init.el
+++ b/init.el
@@ -246,8 +246,7 @@
          lisp-interaction-mode
          scheme-mode
          clojure-mode
-         nix-mode
-         org-mode)
+         nix-mode)
   :config
   (with-eval-after-load 'meow
     (add-to-list 'aggressive-indent-protected-commands #'my-meow-undo)
@@ -284,7 +283,13 @@
 
 (use-package yasnippet
   :config
-  (yas-global-mode))
+  (yas-global-mode)
+  (advice-add #'yas-expand-snippet
+              :around
+              (lambda (oldfun &rest r)
+                (let ((org-src-tab-acts-natively nil))
+                  (apply oldfun r)))
+              '((name . my--yas-expand-disable-org-tab-native))))
 
 (use-package yasnippet-snippets)
 
@@ -392,7 +397,6 @@
   (buffer-face-mode))
 
 (use-package org
-  :mode ("\\.org$" . org-mode)
   :hook ((org-mode . org-indent-mode)
          (org-mode . auto-fill-mode)
          (org-mode . set-text-modes-font))
@@ -404,7 +408,8 @@
   (org-latex-compiler "lualatex")
   (org-preview-latex-default-process 'dvisvgm)
   :config
-  (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.1)))
+  (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.1))
+  (add-to-list 'org-modules 'org-tempo))
 
 (use-package org-superstar
   :custom
@@ -420,16 +425,14 @@
   (editorconfig-mode)
   (setcar (cdr (assq 'editorconfig-mode minor-mode-alist)) " EdConf"))
 
-(use-package nix-mode
-  :mode "\\.nix'")
+(use-package nix-mode)
 
 (use-package markdown-mode
   :mode ("README\\.md\\'" . gfm-mode)
   :custom
   (markdown-command '("pandoc" "--from=markdown" "--to=html5")))
 
-(use-package meson-mode
-  :mode "/meson\\(\\.build\\|_options\\.txt\\)\\'")
+(use-package meson-mode)
 
 (use-package minimap
   :commands minimap-mode