From 841db5d0ca0fcdcdfd4a2d471ea161bd1ac1258c Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Fri, 6 Sep 2024 08:38:28 +0200
Subject: [PATCH] emacs: go back to local config

---
 modules/programs/editors/emacs/doom/init.el   |   5 +-
 .../programs/editors/emacs/doom/packages.el   |   1 +
 modules/programs/editors/emacs/module.nix     | 100 +++++++++---------
 3 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/modules/programs/editors/emacs/doom/init.el b/modules/programs/editors/emacs/doom/init.el
index 8bff3b5..513f2ff 100644
--- a/modules/programs/editors/emacs/doom/init.el
+++ b/modules/programs/editors/emacs/doom/init.el
@@ -21,7 +21,8 @@
        ;;layout            ; auie,ctsrnm is the superior home row
 
        :completion
-       (company +childframe )           ; the ultimate code completion backend
+       ;; (company +childframe )           ; the ultimate code completion backend
+       (corfu +orderless +dabbrev)
        (vertico +icons)           ; the search engine of the future
 
        :ui
@@ -33,7 +34,7 @@
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;indent-guides     ; highlighted indent columns
        (ligatures +iosevka +extra)         ; ligatures and symbols to make your code pretty again
-       modeline          ; snazzy, Atom-inspired modeline, plus API
+       (modeline +light)          ; snazzy, Atom-inspired modeline, plus API
        ophints           ; highlight the region an operation acts on
        (popup +all +defaults)   ; tame sudden yet inevitable temporary windows
        ;;tabs              ; a tab bar for Emacs
diff --git a/modules/programs/editors/emacs/doom/packages.el b/modules/programs/editors/emacs/doom/packages.el
index 13331d3..b6a1fd3 100644
--- a/modules/programs/editors/emacs/doom/packages.el
+++ b/modules/programs/editors/emacs/doom/packages.el
@@ -12,6 +12,7 @@
 (package! catppuccin-theme)
 (package! good-scroll)
 (package! wakatime-mode)
+(package! rmsbolt)
 ;; To install a package directly from a remote git repo, you must specify a
 ;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
 ;; https://github.com/radian-software/straight.el#the-recipe-format
diff --git a/modules/programs/editors/emacs/module.nix b/modules/programs/editors/emacs/module.nix
index ee3a75e..78b1c6d 100644
--- a/modules/programs/editors/emacs/module.nix
+++ b/modules/programs/editors/emacs/module.nix
@@ -10,70 +10,72 @@
   inherit (lib) mkIf;
 
   # Taken from outfoxxed since figuring this out is really annoying.
-  pkgswithemacs =
+  newpkgs =
     pkgs.appendOverlays
     (with inputs.emacs-overlay.overlays; [
       emacs
       package
     ]);
 
-  custom-emacs = with pkgswithemacs; ((emacsPackagesFor
-      (emacs29-pgtk.override {
-        withNativeCompilation = true;
-        withTreeSitter = true;
-      }))
+  custom-emacs = with newpkgs; ((emacsPackagesFor (emacs30-pgtk.override {
+      withNativeCompilation = true;
+      withTreeSitter = true;
+    }))
     .emacsWithPackages (epkgs:
       with epkgs; [
+        avy
+        better-jumper
+        catppuccin-theme
+        company
+        crux
+        cmake-font-lock
+        direnv
+        doom-modeline
+        editorconfig
+        face-explorer
+        flycheck
+        frames-only-mode
+        fussy
+        groovy-mode
+        just-mode
+        kotlin-mode
+        lsp-mode
+        lsp-treemacs
+        lsp-ui
+        lsp-java
+        magit
+        markdown-mode
+        meow
+        meow-tree-sitter
+        nasm-mode
+        nix-mode
+        reformatter # required by nix mode
+        projectile
+        peep-dired
+        rainbow-mode
+        no-littering
+        string-inflection
+        tldr
         treesit-grammars.with-all-grammars
+        treemacs
+        treemacs-evil
+        treemacs-projectile
+        treemacs-magit
+        undo-tree
+        use-package
+        vertico
         vterm
-        eshell-prompt-extras
-        esh-autosuggest
-        fish-completion
-        esh-help
-        eshell-syntax-highlighting
-        pinentry
+        which-key
+        ws-butler
       ]));
 in {
   config = mkIf cfg.enable {
     home-manager.users.${username} = {
-      imports = [inputs.nix-doom-emacs-unstraightened.hmModule];
-      programs.doom-emacs = {
+      home.packages = [custom-emacs];
+
+      services.emacs = {
         enable = true;
-        doomDir = ./doom;
-        emacs = custom-emacs;
-        extraBinPackages = with pkgs; [
-          python3
-          pinentry-tty
-          pinentry-emacs
-          # needed by native-comp
-          binutils
-
-          # Doom dependencies
-          git
-          ripgrep
-          gnutls
-
-          ## Optional dependencies
-          fd # faster projectile indexing
-          imagemagick # for image-dired
-          zstd # for undo-fu-session/undo-tree compression
-          nodePackages.prettier
-
-          # Module dependencies
-          # spell
-          (aspellWithDicts (ds: with ds; [de en en-computers en-science]))
-          # editorconfig
-          editorconfig-core-c # per-project style config
-          # lookup & org +roam
-          sqlite
-          # latex & org (latex previews)
-          texlive.combined.scheme-medium
-          # :lang beancount
-          # beancount
-          # fava
-          # :lang nix
-          age
-        ];
+        package = custom-emacs;
       };
     };
   };