From 149dbe2e33d38d994dab89cfb396220cc8782926 Mon Sep 17 00:00:00 2001
From: Amneesh Singh <natto@weirdnatto.in>
Date: Sat, 24 Jun 2023 15:46:42 +0530
Subject: [PATCH] home/natto: misc config changes

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
---
 home/natto/config/emacs/config.org  |  9 ++++++++-
 home/natto/config/neomutt/neomuttrc |  2 --
 home/natto/emacs.nix                | 16 +++++++++++++++-
 home/natto/pkgs.nix                 |  4 ++--
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/home/natto/config/emacs/config.org b/home/natto/config/emacs/config.org
index 93c30bc..e500451 100644
--- a/home/natto/config/emacs/config.org
+++ b/home/natto/config/emacs/config.org
@@ -12,7 +12,8 @@
 
 ** Some mode settings based on personal preferences
 #+begin_src emacs-lisp
-(global-hl-line-mode 1)
+(add-hook 'prog-mode-hook #'hl-line-mode)
+(add-hook 'text-mode-hook #'hl-line-mode)
 (scroll-bar-mode 0)
 (tool-bar-mode 0)
 (menu-bar-mode 0)
@@ -235,11 +236,17 @@ For autocomplete
  (direnv-mode))
 #+end_src
 
+** STM32
+#+begin_src emacs-lisp
+(use-package stm32-emacs)
+#+end_src
+
 ** Lang support
 #+begin_src emacs-lisp
 (use-package haskell-mode)
 (use-package lsp-latex)
 (use-package rustic)
+(use-package typescript-mode)
 (use-package yuck-mode)
 (use-package wgsl-mode)
 (use-package nix-mode
diff --git a/home/natto/config/neomutt/neomuttrc b/home/natto/config/neomutt/neomuttrc
index 134ee5e..efd7ed3 100644
--- a/home/natto/config/neomutt/neomuttrc
+++ b/home/natto/config/neomutt/neomuttrc
@@ -5,8 +5,6 @@ set sidebar_visible
 set mail_check_stats
 bind attach,index,pager \CU next-page
 bind attach,index,pager \CD previous-page
-bind attach,index,pager n next-entry
-bind attach,index,pager e previous-entry
 bind attach,index,pager 9 group-reply
 bind pager g top
 bind pager G bottom
diff --git a/home/natto/emacs.nix b/home/natto/emacs.nix
index 5730a3a..94a5c7d 100644
--- a/home/natto/emacs.nix
+++ b/home/natto/emacs.nix
@@ -3,13 +3,27 @@ let
   mymacs = config: # with inputs.emacs-overlay.packages.${pkgs.system}; already resolved with overlay
     with pkgs; emacsWithPackagesFromUsePackage {
       inherit config;
-      package = emacsPgtk;
+      package = emacs-pgtk;
       alwaysEnsure = true;
       alwaysTangle = true;
       extraEmacsPackages = epkgs: with epkgs; [
         use-package
         (epkgs.tree-sitter-langs.withPlugins (_: epkgs.tree-sitter-langs.plugins))
       ];
+     /* override = {
+        stm32-emacs = trivialBuild rec {
+          pname = "stm32-emacs";
+          version = haskellPackages.Agda.version;
+
+          dontUnpack = true;
+
+          # already byte-compiled by Agda builder
+          buildPhase = ''
+            agda=`${haskellPackages.Agda}/bin/agda-mode locate`
+            cp `dirname $agda`/*.el* .
+          '';
+        };
+      };*/
     };
 in
 {
diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix
index 1831c99..5ec4677 100644
--- a/home/natto/pkgs.nix
+++ b/home/natto/pkgs.nix
@@ -19,7 +19,6 @@
     unrar
     vim
     jmtpfs
-    (inputs.nbfc.packages.${pkgs.system}.nbfc-client-c)
     (flake.packages.${pkgs.system}.customscripts)
     translate-shell
     powertop
@@ -77,6 +76,7 @@
         pdfsync
         tocloft
         enumitem
+        multirow
         tcolorbox;
     })
     python3Packages.pygments
@@ -88,7 +88,7 @@
     openjdk
 
     # Misc
-    anki-bin
+    anki
     tor-browser-bundle-bin
     mailcap
     libsForQt5.qtstyleplugins