From adfe87abe1a96a513e566f794878ecfb7d99ab29 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Wed, 1 Jun 2022 09:42:51 +0200
Subject: [PATCH] emacs upgrades from Alexei

---
 home-manager/emacs.nix | 10 ++--------
 home-manager/home.nix  |  1 +
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/home-manager/emacs.nix b/home-manager/emacs.nix
index 05bc841..dd235c9 100644
--- a/home-manager/emacs.nix
+++ b/home-manager/emacs.nix
@@ -1,14 +1,6 @@
 { lib, config, options, pkgs, ... }: let
   epkgs = pkgs.emacsPackagesFor pkgs.emacsPgtkNativeComp;
   engpkgs = pkgs.emacsPackagesNgFor pkgs.emacsPgtkNativeComp;
-  lsp-ui = epkgs.melpaPackages.lsp-ui.overrideAttrs (o: {
-    src = pkgs.fetchFromGitHub {
-      owner = "emacs-lsp";
-      repo = "lsp-ui";
-      rev = "240a7de26400cf8b13312c3f9acf7ce653bdaa8a";
-      sha256 = "1zscdjlnkx43i4kw2qmlvji23xfpw7n5y4v99ld33205dg905fsy";
-    };
-  });
 in {
   programs.emacs = {
     enable = true;
@@ -28,6 +20,7 @@ in {
         # evil-magit
         evil-surround
         flycheck
+        flycheck-inline
         forge
         ggtags
         git-gutter-fringe
@@ -74,6 +67,7 @@ in {
 
   fonts.fontconfig.enable = true;
   home.packages = [
+    pkgs.rnix-lsp
     (pkgs.runCommand "all-the-icons-fonts" {} ''
       mkdir -p $out/share/fonts/truetype
       cp ${epkgs.melpaPackages.all-the-icons.src}/fonts/*.ttf $_
diff --git a/home-manager/home.nix b/home-manager/home.nix
index e95d9de..ad2d30e 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -167,6 +167,7 @@ in {
     # catdoc
     expect
     fzf
+    fx
     gitAndTools.git-annex
     glxinfo
     gnupg1