From 168bc3b95a93f464356f85d486e0cb60a22492b6 Mon Sep 17 00:00:00 2001
From: DustVoice <info@dustvoice.de>
Date: Fri, 2 Dec 2022 16:39:34 +0100
Subject: [PATCH] Update config for better windows compat.

---
 .doom.d/config.el   | 19 +++++++++++++++++++
 .doom.d/init.el     |  8 +++-----
 .doom.d/packages.el | 14 ++++++++++++++
 .emacs.d            |  2 +-
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/.doom.d/config.el b/.doom.d/config.el
index c12714fb..affe7b32 100644
--- a/.doom.d/config.el
+++ b/.doom.d/config.el
@@ -104,3 +104,22 @@
                  ("\\section{%s}" . "\\section*{%s}")
                  ("\\subsection{%s}" . "\\subsection*{%s}")
                  ("\\subsubsection{%s}" . "\\subsubsection*{%s}"))))
+
+(use-package! paw64-mode
+  :init
+  :config
+
+  (define-derived-mode paw64-mode
+    prog-mode
+    "Paw64"
+    "Major mode for 6502/6510 assembly with 64tass and/or paw64"
+    (set-syntax-table (make-syntax-table paw64-mode-syntax-table))
+    (set (make-local-variable 'font-lock-defaults) '(paw64-font-lock-keywords))
+    (set (make-local-variable 'indent-line-function) 'paw64-indent)
+
+    (add-hook 'post-command-hook #'paw64-post-command-hook nil t)
+    (electric-indent-local-mode -1)))
+
+(use-package! company-64tass :init :config)
+(use-package! flycheck-64tass :init :config)
+(use-package! arm-mode :init :config)
diff --git a/.doom.d/init.el b/.doom.d/init.el
index f0e89e31..a312fa87 100644
--- a/.doom.d/init.el
+++ b/.doom.d/init.el
@@ -36,9 +36,7 @@
        hl-todo             ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;hydra
        ;;indent-guides     ; highlighted indent columns
-       (ligatures
-         +extra
-         +fira)            ; ligatures and symbols to make your code pretty again
+       ligatures           ; ligatures and symbols to make your code pretty again
        minimap             ; show a map of the code on the side
        modeline            ; snazzy, Atom-inspired modeline, plus API
        nav-flash           ; blink cursor line after big motions
@@ -89,7 +87,7 @@
        :tools
        ;;ansible
        ;;biblio            ; Writes a PhD for you (citation needed)
-       ;;debugger          ; FIXME stepping through code, to help you add bugs
+       debugger          ; FIXME stepping through code, to help you add bugs
        ;;direnv
        ;;docker
        ;;editorconfig      ; let someone else argue about tabs vs spaces
@@ -185,7 +183,7 @@
 
        :email
        ;;(mu4e +org +gmail)
-       notmuch
+       ;;notmuch
        ;;(wanderlust +gmail)
 
        :app
diff --git a/.doom.d/packages.el b/.doom.d/packages.el
index bb93609a..b6d427c6 100644
--- a/.doom.d/packages.el
+++ b/.doom.d/packages.el
@@ -49,6 +49,9 @@
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
 ;(unpin! t)
 
+;; Hotfix for issue with straight.el
+(package! straight :pin "3eca39d")
+
 (package! pinentry)
 (package! fish-mode)
 
@@ -61,4 +64,15 @@
 (package! git-modes
   :recipe (:host github :repo "magit/git-modes"))
 
+(package! paw64-mode
+  :recipe (:host github :repo "svjson/paw64-mode"))
+(package! company-64tass
+  :recipe (:host github :repo "svjson/company-64tass"))
+(package! flycheck-64tass
+  :recipe (:host github :repo "svjson/flycheck-64tass"))
+(package! arm-mode
+  :recipe (:host github :repo "charje/arm-mode"))
+(package! nasm-mode)
+
+
 (package! org-modern)
diff --git a/.emacs.d b/.emacs.d
index 9f22a0a2..d5ccac5d 160000
--- a/.emacs.d
+++ b/.emacs.d
@@ -1 +1 @@
-Subproject commit 9f22a0a2a5191cf57184846281164f478df4b7ac
+Subproject commit d5ccac5d71c819035fa251f01d023b3f94b4fba4