2 files changed, 17 insertions, 5 deletions

diff --git a/modules/nixfiles/emacs/default.nix b/modules/nixfiles/emacs/default.nix
index ff0238d..fa72549 100644
--- a/modules/nixfiles/emacs/default.nix
+++ b/modules/nixfiles/emacs/default.nix
@@ -30,13 +30,13 @@ in {
       programs.doom-emacs = {
         enable = true;
         doomPrivateDir = ./doom;
-        emacsPackage = pkgs.emacs28; # Package is pinned to avoid surprises.
+        emacsPackage = pkgs.emacs28; # The package is pinned to avoid surprises.
         extraPackages = with pkgs; [
           mu # :email mu4e
         ];
         extraConfig = let
-          # NOTE gopls will require a Go executable, which must be provided by
-          # the project's flake.
+          # NOTE gopls will require the "go" executable which must be provided
+          # by the project's flake/shell.
           extraBins = with pkgs; [
             (aspellWithDicts (p: with p; [en ru])) # :checkers (spell +aspell)
             (python3.withPackages (p:
@@ -59,8 +59,8 @@ in {
             gdb # :tools debugger
             gnuplot # :lang (org +gnuplot)
             gnutls # doom!
+            go-language-server # :lang (go +lsp)
             gomodifytags # :lang go
-            gopls # :lang (go +lsp)
             gore # :lang go
             gotests # :lang go
             graphviz # :lang (org +roam2) :lang plantuml
@@ -92,6 +92,7 @@ in {
             shellcheck # :lang sh
             shfmt # :lang sh :editor format
             sqlite # :lang (org +roam2) :tools lookup
+            texlab # lang (tex +lsp)
             texlive.combined.scheme-full # :lang org tex
             unzip # :tools debugger
             wordnet # :tools (lookup +dictionary +offline)
@@ -104,7 +105,7 @@ in {
             zstd # :emacs undo
           ];
         in ''
-          ;; This will integrate packages, which are required by various modules
+          ;; This will integrate packages which are required by various modules
           ;; without polluting the user's profile.
           (setq exec-path (append exec-path '(${
             concatMapStringsSep " " (x: ''"${x}/bin"'') extraBins
@@ -145,5 +146,10 @@ in {
         client.enable = true;
       };
     };
+
+    system.extraDependencies = with inputs; [
+      emacs-overlay
+      nix-doom-emacs
+    ];
   };
 }
diff --git a/modules/nixfiles/emacs/doom/config.el b/modules/nixfiles/emacs/doom/config.el
index fedd98d..4f2d835 100644
--- a/modules/nixfiles/emacs/doom/config.el
+++ b/modules/nixfiles/emacs/doom/config.el
@@ -170,6 +170,12 @@
     :user "azahi/oftc"
     :pass nixfiles/irc-bouncer-password-f))
 
+;; (set-irc-server! "hackint"
+;;   `(:host "shire.me"
+;;     :port 6667
+;;     :user "azahi/hackint"
+;;     :pass nixfiles/irc-bouncer-password-f))
+
 (set-irc-server! "rizon"
   `(:host "shire.me"
     :port 6667