From 99ee1a900854919d8cfb5536c8aae80e94e2bb4d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Thu, 30 May 2024 13:41:12 +0100
Subject: [PATCH] Remove gnumake (installed in NixOS), add rclone

Ensure fd and ripgrep installed for Emacs

Don't install language servers by default, nil already installed at
NixOS system level, and python needs to be installed per-environment
anyway. Don't need the other LSPs
---
 home/default.nix           |  2 +-
 programs/emacs/default.nix | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index e4f6098..6abb775 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -94,7 +94,7 @@
   home = {
     homeDirectory = "/home/${config.home.username}";
     packages = with pkgs; [
-      gnumake
+      rclone
       git-sync
       pinentry
       fd
diff --git a/programs/emacs/default.nix b/programs/emacs/default.nix
index 9207c3b..12a393d 100644
--- a/programs/emacs/default.nix
+++ b/programs/emacs/default.nix
@@ -146,6 +146,8 @@
     imagemagick
     languagetool
     wordnet
+    fd
+    ripgrep
     graphviz # For org-roam graph
     mp3info # For EMMS
 
@@ -156,19 +158,11 @@
     poppler_utils
 
     # Customised LaTeX install
-    (texlive.combine {
-      inherit (pkgs.texlive) scheme-medium dvisvgm dvipng wrapfig amsmath ulem hyperref capt-of;
-    })
+    (texlive.combine
+      {inherit (pkgs.texlive) scheme-medium dvisvgm dvipng wrapfig amsmath ulem hyperref capt-of;})
     python3Packages.pygments
 
     # Development tools
-    # Python is a special case, installed separately
-    ## Language servers
-    nil
-    fortls
-    lua-language-server
-    nodePackages.bash-language-server
-
     ## Linters
     shellcheck
     yamllint