From e3b78a4ca98ab832a77fdf7f6aab4a26348c0476 Mon Sep 17 00:00:00 2001
From: Sameer Rahmani <lxsameer@gnu.org>
Date: Sun, 17 Oct 2021 11:03:55 +0100
Subject: [PATCH] Fix the libgcc issue and add diff-hl cube

---
 Makefile               |  6 +++---
 config/fg42.user.v3.el | 21 ++++++++++++++++++---
 core/cubes/git.el      | 28 +++++++++++++++++++++++++---
 3 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 1df5ebb..629456b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ install-ci:
 	@echo "Creating the link..."
 	@echo "#! /bin/sh" > ./fg42
 	@echo "export FG42_HOME=$(shell pwd)" >> ./fg42
-	@echo "# export LIBRARY_PATH=/path/to/libgccjit.so" >> ./fg42
+	@echo "export LIBRARY_PATH=$(gcc -print-search-dirs| sed -n '/^libraries:/{s:^[^/]*::;p}')" >> ./fg42
 	@echo 'emacs --name FG42 --no-site-file --no-site-lisp --no-splash --title FG42 -l $$FG42_HOME/fg42-config.el "$$@"' >> ./fg42
 	@chmod +x ./fg42
 
@@ -29,8 +29,8 @@ install:
 	@cp ./scripts/fg42-wm ./fg42-wm
 	@echo "export FG42_HOME=$(shell pwd)" >> ./fg42
 	@echo "export FG42_HOME=$(shell pwd)" >> ./fg42-wm
-	@echo "# export LIBRARY_PATH=/path/to/libgccjit.so" >> ./fg42
-	@echo "# export LIBRARY_PATH=/path/to/libgccjit.so" >> ./fg42-wm
+	@echo "export LIBRARY_PATH=$(gcc -print-search-dirs| sed -n '/^libraries:/{s:^[^/]*::;p}')" >> ./fg42
+	@echo "export LIBRARY_PATH=$(gcc -print-search-dirs| sed -n '/^libraries:/{s:^[^/]*::;p}')" >> ./fg42-wm
 	@echo 'FG42_WM=false emacs --name FG42 --no-site-file --no-site-lisp --no-splash --title FG42 -l $$FG42_HOME/fg42-config.el "$$@"' >> ./fg42
 	@echo 'FG42_WM=true emacs --name FG42 --no-site-file --no-site-lisp --no-splash --title FG42 -l $$FG42_HOME/fg42-config.el "$$@"' >> ./fg42-wm
 	@chmod +x ./fg42
diff --git a/config/fg42.user.v3.el b/config/fg42.user.v3.el
index f327f62..34a2746 100644
--- a/config/fg42.user.v3.el
+++ b/config/fg42.user.v3.el
@@ -50,7 +50,7 @@
     (t
      :background "#bd93f9" :height 0.1 :box nil))))
 
-(defvar global-font-size 10)
+(defvar global-font-size 12)
 
 
 (setq lsp-clients-clangd-executable "/home/lxsameer/usr/lib/llvm-13rc2/bin/clangd")
@@ -58,6 +58,7 @@
 (defconst llvm-config-dir (concat LLVM_DIR "/llvm/utils/emacs/"))
 (defconst mlir-config-dir (concat LLVM_DIR "/mlir/utils/emacs/"))
 
+
 (add-hook 'c++-mode-hook (lambda ()
                            (load (concat llvm-config-dir "emacs.el"))
                            (load (concat llvm-config-dir "llvm-mode.el"))
@@ -73,6 +74,16 @@
 (autoload 'tablegen-mode (concat llvm-config-dir "tablegen-mode") "Code highlighting for tablegen" t)
 (add-to-list 'auto-mode-alist '("\\.td\\'" . tablegen-mode))
 
+(autoload 'tablegen-mode (concat llvm-config-dir "tablegen-mode") "Code highlighting for tablegen" t)
+(add-to-list 'auto-mode-alist '("\\.td\\'" . tablegen-mode))
+
+(autoload 'tablegen-mode (concat llvm-config-dir "tablegen-mode") "Code highlighting for tablegen" t)
+(add-to-list 'auto-mode-alist '("\\.td\\'" . tablegen-mode))
+
+(load-file "/home/lxsameer/src/serene/serene/resources/emacs/serene-dev.el")
+
+
+
 ;; =========== FG42 stuff ===============================
 ;; (use-flags wm font-icons cursor-type
 ;;            exec-path-from-shell golang
@@ -163,5 +174,9 @@
 
 (set-face-attribute 'region nil :background "#888")
 
-(provide '.fg42)
-;;; .fg42.v3.el ends here
+
+;; ============== MY STUFF ==============================
+(serene/setup-dev-env)
+
+(provide 'fg42.user.v3)
+;;; fg42.user.v3.el ends here
diff --git a/core/cubes/git.el b/core/cubes/git.el
index 4a76269..fd726bb 100644
--- a/core/cubes/git.el
+++ b/core/cubes/git.el
@@ -29,9 +29,29 @@
 (require 'fg42/cube)
 
 
+(defcube fg42/diff-hl-cube
+  "This cube highlights changes to the current buffer in respect to the
+VC status of the file. For example if you're using *git* in your project
+and you've made some changes to the current buffer that are not commited
+yet it will highlihgt them for you.
+
+For more info check out [[https://github.com/dgutov/diff-hl][diff-hl]] 's page."
+  (:title "Diff Highlight Cube"
+         :flag diff-hl
+         :flag-default t)
+
+  (fpkg/use diff-hl
+    :init
+    (progn
+      (when-flag git
+        (add-hook 'magit-pre-refresh-hook 'diff-hl-magit-pre-refresh)
+        (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh))
+      (global-diff-hl-mode))))
+
+
 (defcube fg42/git-cube
-  "Git cube"
-  (:title "cubes/fg42/git-cube.org"
+  "This cube integrates *git* into *FG42*."
+  (:title "Git Cube"
          :flag git
          :flag-default t)
 
@@ -40,7 +60,9 @@
 
   (fpkg/use magit-todos
     :after magit
-    :init (require 'magit-todos)))
+    :init (require 'magit-todos))
+
+  (fg42/diff-hl-cube))
 
 
 (provide 'cubes/git)