From 7fa717147187d28041521199ae5bf3660bca52fa Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Sun, 20 Jun 2021 07:54:18 -0600
Subject: [PATCH] various dev environment stuff

---
 emacs/init.el     | 31 ++++++++++++++++++++++++++++---
 fish/00-vars      |  9 +++++++++
 fish/chroot       |  2 ++
 fish/gdcc-install |  9 +++++++++
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 fish/00-vars
 create mode 100644 fish/gdcc-install

diff --git a/emacs/init.el b/emacs/init.el
index d4f527d..33416a6 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -109,6 +109,14 @@
 (use-package elisp-mode)
 (use-package eldoc)
 
+(use-package yaml-mode
+  :ensure t)
+
+(use-package cmake-mode
+  :ensure t
+  :init
+  (defvaralias 'cmake-tab-width 'tab-width))
+
 (use-package powershell
   :ensure t
   :init
@@ -133,6 +141,11 @@
   :init
   (defvaralias 'json-reformat:indent-width 'tab-width))
 
+(use-package nim-mode
+  :ensure t
+  :init
+  (defvaralias 'nim-indent-offset 'tab-width))
+
 (use-package mmm-mode
   :ensure t)
 
@@ -149,8 +162,9 @@
 (use-package cc-mode
   :hook ((  c-mode . agw-cc-mode)
          (c++-mode . agw-cc-mode))
-  :mode (("\\.zsc\\'" . c-mode)
-         ("\\.zc\\'"  . c-mode))
+  :mode (("\\.zsc\\'"   . c-mode)
+         ("\\.zc\\'"    . c-mode)
+         ("\\.build\\'" . c++-mode))
   :init
   (setq c-auto-align-backslashes nil
         c-basic-offset           tab-width
@@ -188,6 +202,9 @@
   :init
   (defvaralias 'rust-indent-offset 'tab-width))
 
+(use-package sgml-mode
+  :hook (html-mode . agw-fp-mode))
+
 ;; org-mode
 (use-package org
   :hook ((org-mode . agw-flyspell-mode)
@@ -431,6 +448,7 @@
   :ensure t
   :after (editorconfig
           eldoc
+          rainbow-mode
           simple
           subword
           undo-tree
@@ -443,7 +461,14 @@
      (isearch-mode      "Is")
      (subword-mode      "Sw")
      (undo-tree-mode    "Ut")
-     (whitespace-mode   "Ws"))))
+     (whitespace-mode   "Ws")
+     (flyspell-mode     "Fs")
+     (rainbow-mode      "Rb"))))
+
+(use-package rainbow-mode
+  :ensure t
+  :hook ((prog-mode . rainbow-mode)
+         (text-mode . rainbow-mode)))
 
 ;; end of init
 (setq gc-cons-threshold (* 1 1000 1000))
diff --git a/fish/00-vars b/fish/00-vars
new file mode 100644
index 0000000..522bf03
--- /dev/null
+++ b/fish/00-vars
@@ -0,0 +1,9 @@
+#!/usr/bin/env fish
+
+# if EDITOR isn't set then we're probably in a remote session
+# and need to set the stuff in our environment again
+if test ! $EDITOR
+	source $_agw_dir_rc/system/env/00-vars.sh
+end
+
+## EOF
diff --git a/fish/chroot b/fish/chroot
index b81aff5..ee6c784 100644
--- a/fish/chroot
+++ b/fish/chroot
@@ -25,6 +25,8 @@ function devrt
 		-b $_agw_dir_rc:/home/marrub/rc \
 		-b $_agw_dir_src:/home/marrub/src \
 		-b $_agw_dir_bin:/home/marrub/bin \
+		-b ~/vmshare:/home/marrub/vmshare \
+		-b ~/.gem:/home/marrub/.gem \
 		-- $_agw_dir_dev /usr/bin/env _agw_chroot=1 /usr/bin/fish -l -i -C cd
 end
 
diff --git a/fish/gdcc-install b/fish/gdcc-install
new file mode 100644
index 0000000..0fa9f20
--- /dev/null
+++ b/fish/gdcc-install
@@ -0,0 +1,9 @@
+#!/usr/bin/env fish
+
+function gdcc-install
+	for f in $_agw_dir_bin/other/gdcc/*/gdcc-*
+		ln -s $f $_agw_dir_bin/local/(basename $f)
+	end
+end
+
+## EOF